summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev
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 /svx/source/xoutdev
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 'svx/source/xoutdev')
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/_xoutbmp.cxx80
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/_xpoly.cxx216
-rw-r--r--svx/source/xoutdev/makefile.mk59
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattr.cxx536
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattr2.cxx102
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattrbmp.cxx108
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xexch.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xpool.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabbtmp.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabcolr.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabdash.cxx46
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabgrdt.cxx46
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabhtch.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtable.cxx98
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtablend.cxx46
15 files changed, 724 insertions, 783 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index bbb09866d243..547a5334d124 100644..100755
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -39,7 +39,7 @@
#include <svl/solar.hrc>
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
#include <svtools/FilterConfigItem.hxx>
#include <svtools/filter.hxx>
@@ -130,7 +130,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
#ifdef UNX
const Size aBmpSize( aBmp.GetSizePixel() );
- BOOL bFullTrans = FALSE;
+ sal_Bool bFullTrans = sal_False;
if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
{
@@ -140,7 +140,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
if( pMAcc )
{
if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
- bFullTrans = TRUE;
+ bFullTrans = sal_True;
aTrans.ReleaseAccess( pMAcc );
}
@@ -208,7 +208,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
const long nBottom = aPixRect.Bottom();
const long nRight = aPixRect.Right();
const long nLeft = nXPos;
- const BOOL bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
+ const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
pOutDev->Push();
pOutDev->SetMapMode( MapMode() );
@@ -240,14 +240,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
{
Animation aNewAnim( rAnimation );
if( bHMirr || bVMirr )
{
const Size& rGlobalSize = aNewAnim.GetDisplaySizePixel();
- ULONG nMirrorFlags = 0L;
+ sal_uIntPtr nMirrorFlags = 0L;
if( bHMirr )
nMirrorFlags |= BMP_MIRROR_HORZ;
@@ -255,7 +255,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
if( bVMirr )
nMirrorFlags |= BMP_MIRROR_VERT;
- for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
+ for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
{
AnimationBitmap aAnimBmp( aNewAnim.Get( i ) );
@@ -281,7 +281,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
// ------------------------------------------------------------------------
-Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags )
+Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags )
{
Graphic aRetGraphic;
@@ -319,8 +319,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF
// ------------------------------------------------------------------------
-USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
- const String& rFilterName, const ULONG nFlags,
+sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
+ const String& rFilterName, const sal_uIntPtr nFlags,
const Size* pMtfSize_100TH_MM )
{
if( rGraphic.GetType() != GRAPHIC_NONE )
@@ -329,8 +329,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
Graphic aGraphic;
String aExt;
GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
- USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
- BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+ sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
+ sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
@@ -371,7 +371,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
aURL.setExtension( aExt );
rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -388,7 +388,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
if( GRFILTER_OK != nErr )
{
String aFilter( rFilterName );
- BOOL bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
+ sal_Bool bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
( aFilter.EqualsIgnoreCaseAscii( "gif" ) ) ||
( nFlags & XOUTBMP_USE_GIF_IF_POSSIBLE ) ||
( ( nFlags & XOUTBMP_USE_GIF_IF_SENSIBLE ) && ( bAnimated || bTransparent ) );
@@ -494,15 +494,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
#pragma optimize ( "", off )
#endif
-USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
- GraphicFilter& rFilter, const USHORT nFormat,
+sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+ GraphicFilter& rFilter, const sal_uInt16 nFormat,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
{
DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
- SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
- USHORT nRet = GRFILTER_IOERROR;
+ sal_uInt16 nRet = GRFILTER_IOERROR;
if( pOStm )
{
@@ -526,11 +526,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
// ------------------------------------------------------------------------
-Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
+Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
{
const Size aSize( rBmp.GetSizePixel() );
Bitmap aRetBmp;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
{
@@ -549,8 +549,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
const long nHeight = aSize.Height();
const long nHeight2 = nHeight - 2L;
const long lThres2 = (long) cThreshold * cThreshold;
- const BitmapColor aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
- const BitmapColor aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+ const BitmapColor aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
+ const BitmapColor aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
long nSum1;
long nSum2;
long lGray;
@@ -568,18 +568,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
{
nXTmp = nX;
- nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) );
- nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
+ nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) );
+ nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) );
nSum2 += lGray;
- nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
- nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
+ nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
+ nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
- nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) );
+ nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) );
nSum2 += lGray;
- nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
- nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) );
+ nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
+ nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) );
nSum2 -= lGray;
if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
@@ -589,7 +589,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
}
}
- bRet = TRUE;
+ bRet = sal_True;
}
aWorkBmp.ReleaseAccess( pReadAcc );
@@ -613,8 +613,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
// ------------------------------------------------------------------------
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
- const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+ const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
{
Bitmap aWorkBmp;
Polygon aRetPoly;
@@ -654,7 +654,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
Point* pPoints1 = NULL;
Point* pPoints2 = NULL;
long nX, nY;
- USHORT nPolyPos = 0;
+ sal_uInt16 nPolyPos = 0;
const BitmapColor aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
if( nFlags & XOUTBMP_CONTOUR_VERT )
@@ -675,7 +675,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nY = nStartY2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -712,7 +712,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nX = nStartX2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -732,13 +732,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
}
}
- const USHORT nNewSize1 = nPolyPos << 1;
+ const sal_uInt16 nNewSize1 = nPolyPos << 1;
aRetPoly = Polygon( nPolyPos, pPoints1 );
aRetPoly.SetSize( nNewSize1 + 1 );
aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
- for( USHORT j = nPolyPos; nPolyPos < nNewSize1; )
+ for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
@@ -756,14 +756,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
// - DitherBitmap -
// ----------------
-BOOL DitherBitmap( Bitmap& rBitmap )
+sal_Bool DitherBitmap( Bitmap& rBitmap )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
else
- bRet = FALSE;
+ bRet = sal_False;
return bRet;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index de00e220b049..e54afd052091 100644..100755
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -54,11 +54,11 @@ DBG_NAME(XPolyPolygon);
|*
*************************************************************************/
-ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize )
+ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
{
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
nResize = _nResize;
nPoints = 0;
@@ -79,7 +79,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
ImpXPolygon::nResize = rImpXPoly.nResize;
nPoints = 0;
@@ -126,7 +126,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
|* ImpXPolygon::Resize()
|*
-|* !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den
+|* !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den
|* Point-Array nicht loeschen, sondern in pOldPointAry sichern und
|* das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird
|* das Array dann geloescht.
@@ -136,13 +136,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
*************************************************************************/
-void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
{
if( nNewSize == nSize )
return;
- BYTE* pOldFlagAry = pFlagAry;
- USHORT nOldSize = nSize;
+ sal_uInt8* pOldFlagAry = pFlagAry;
+ sal_uInt16 nOldSize = nSize;
CheckPointDelete();
pOldPointAry = pPointAry;
@@ -160,7 +160,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
memset( pPointAry, 0, nSize*sizeof( Point ) );
// Flag Array erzeugen
- pFlagAry = new BYTE[ nSize ];
+ pFlagAry = new sal_uInt8[ nSize ];
memset( pFlagAry, 0, nSize );
// Eventuell umkopieren
@@ -181,7 +181,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
nPoints = nSize;
}
if ( bDeletePoints ) delete[] (char*) pOldPointAry;
- else bDeleteOldPoints = TRUE;
+ else bDeleteOldPoints = sal_True;
delete[] pOldFlagAry;
}
}
@@ -193,7 +193,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
|*
*************************************************************************/
-void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
+void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
@@ -208,7 +208,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
// den Rest nach hinten schieben
if( nPos < nPoints )
{
- USHORT nMove = nPoints - nPos;
+ sal_uInt16 nMove = nPoints - nPos;
memmove( &pPointAry[nPos+nCount], &pPointAry[nPos],
nMove * sizeof(Point) );
memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove );
@@ -226,13 +226,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
+void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
if( (nPos + nCount) <= nPoints )
{
- USHORT nMove = nPoints - nPos - nCount;
+ sal_uInt16 nMove = nPoints - nPos - nCount;
if( nMove )
{
@@ -253,7 +253,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-XPolygon::XPolygon( USHORT nSize, USHORT nResize )
+XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon( nSize, nResize );
@@ -284,14 +284,14 @@ XPolygon::XPolygon( const Polygon& rPoly )
{
DBG_CTOR(XPolygon,NULL);
- USHORT nSize = rPoly.GetSize();
+ sal_uInt16 nSize = rPoly.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = rPoly[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i );
}
}
@@ -319,13 +319,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if ( nRx && nRy )
{
Point aCenter;
- for (USHORT nQuad = 0; nQuad < 4; nQuad++)
+ for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++)
{
switch ( nQuad )
{
@@ -347,8 +347,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
break;
}
GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos);
- pImpXPolygon->pFlagAry[nPos ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH;
nPos += 4;
}
}
@@ -372,31 +372,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
*************************************************************************/
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
- USHORT nStartAngle, USHORT nEndAngle, BOOL bClose)
+ sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon(17);
nStartAngle %= 3600;
if ( nEndAngle > 3600 ) nEndAngle %= 3600;
- BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600);
+ sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600);
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
- BOOL bLoopEnd = FALSE;
+ sal_uInt16 nPos = 0;
+ sal_Bool bLoopEnd = sal_False;
do
{
- USHORT nA1, nA2;
- USHORT nQuad = nStartAngle / 900;
+ sal_uInt16 nA1, nA2;
+ sal_uInt16 nQuad = nStartAngle / 900;
if ( nQuad == 4 ) nQuad = 0;
bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2);
GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
nPos += 3;
if ( !bLoopEnd )
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
} while ( !bLoopEnd );
@@ -406,8 +406,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
if ( bFull )
{
- pImpXPolygon->pFlagAry[0 ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[0 ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
}
pImpXPolygon->nPoints = nPos + 1;
}
@@ -450,7 +450,7 @@ void XPolygon::CheckReference()
|*
*************************************************************************/
-void XPolygon::SetSize( USHORT nNewSize )
+void XPolygon::SetSize( sal_uInt16 nNewSize )
{
CheckReference();
pImpXPolygon->Resize( nNewSize );
@@ -462,7 +462,7 @@ void XPolygon::SetSize( USHORT nNewSize )
|*
*************************************************************************/
-USHORT XPolygon::GetSize() const
+sal_uInt16 XPolygon::GetSize() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nSize;
@@ -474,7 +474,7 @@ USHORT XPolygon::GetSize() const
|*
*************************************************************************/
-void XPolygon::SetPointCount( USHORT nPoints )
+void XPolygon::SetPointCount( sal_uInt16 nPoints )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -484,7 +484,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
if ( nPoints < pImpXPolygon->nPoints )
{
- USHORT nSize = pImpXPolygon->nPoints - nPoints;
+ sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) );
memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize );
}
@@ -497,7 +497,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
|*
*************************************************************************/
-USHORT XPolygon::GetPointCount() const
+sal_uInt16 XPolygon::GetPointCount() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nPoints;
@@ -509,13 +509,13 @@ USHORT XPolygon::GetPointCount() const
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
+void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
pImpXPolygon->InsertSpace( nPos, 1 );
pImpXPolygon->pPointAry[nPos] = rPt;
- pImpXPolygon->pFlagAry[nPos] = (BYTE)eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8)eFlags;
}
/*************************************************************************
@@ -524,12 +524,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rXPoly.GetPointCount();
+ sal_uInt16 nPoints = rXPoly.GetPointCount();
pImpXPolygon->InsertSpace( nPos, nPoints );
@@ -547,16 +547,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rPoly.GetSize();
+ sal_uInt16 nPoints = rPoly.GetSize();
pImpXPolygon->InsertSpace( nPos, nPoints );
- USHORT i;
+ sal_uInt16 i;
for( i=0; i < nPoints; i++ )
pImpXPolygon->pPointAry[i] = rPoly[i];
@@ -569,7 +569,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
|*
*************************************************************************/
-void XPolygon::Remove( USHORT nPos, USHORT nCount )
+void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckReference();
pImpXPolygon->Remove( nPos, nCount );
@@ -589,8 +589,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
CheckReference();
// Punkte verschieben
- USHORT nCount = pImpXPolygon->nPoints;
- for ( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = pImpXPolygon->nPoints;
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
Point* pPt = &(pImpXPolygon->pPointAry[i]);
pPt->X() += nHorzMove;
@@ -632,7 +632,7 @@ Rectangle XPolygon::GetBoundRect() const
|*
*************************************************************************/
-const Point& XPolygon::operator[]( USHORT nPos ) const
+const Point& XPolygon::operator[]( sal_uInt16 nPos ) const
{
DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon");
@@ -646,7 +646,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const
|*
*************************************************************************/
-Point& XPolygon::operator[]( USHORT nPos )
+Point& XPolygon::operator[]( sal_uInt16 nPos )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -654,7 +654,7 @@ Point& XPolygon::operator[]( USHORT nPos )
if( nPos >= pImpXPolygon->nSize )
{
DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
- pImpXPolygon->Resize(nPos + 1, FALSE);
+ pImpXPolygon->Resize(nPos + 1, sal_False);
}
if( nPos >= pImpXPolygon->nPoints )
pImpXPolygon->nPoints = nPos + 1;
@@ -693,10 +693,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
|*
*************************************************************************/
-BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
return *rXPoly.pImpXPolygon == *pImpXPolygon;
}
@@ -708,10 +708,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
return *rXPoly.pImpXPolygon != *pImpXPolygon;
}
@@ -723,7 +723,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
+XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
{
pImpXPolygon->CheckPointDelete();
return (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
@@ -737,11 +737,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
|*
*************************************************************************/
-void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
+void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
- pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags;
}
/*************************************************************************
@@ -752,7 +752,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
|*
*************************************************************************/
-BOOL XPolygon::IsControl(USHORT nPos) const
+sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
{
return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
}
@@ -765,7 +765,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const
|*
*************************************************************************/
-BOOL XPolygon::IsSmooth(USHORT nPos) const
+sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -779,7 +779,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const
|*
*************************************************************************/
-double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
+double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
{
const Point& rP1 = pImpXPolygon->pPointAry[nP1];
const Point& rP2 = pImpXPolygon->pPointAry[nP2];
@@ -796,7 +796,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
|*
*************************************************************************/
-void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
{
Point* pPoints = pImpXPolygon->pPointAry;
double fT2 = fT * fT;
@@ -804,7 +804,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
double fU = 1.0 - fT;
double fU2 = fU * fU;
double fU3 = fU * fU2;
- USHORT nIdx = nPos;
+ sal_uInt16 nIdx = nPos;
short nPosInc, nIdxInc;
if ( bCalcFirst )
@@ -845,8 +845,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
/************************************************************************/
void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
- long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
- USHORT nQuad, USHORT nFirst)
+ long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+ sal_uInt16 nQuad, sal_uInt16 nFirst)
{
Point* pPoints = pImpXPolygon->pPointAry;
pPoints[nFirst ] = rCenter;
@@ -881,29 +881,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
}
if ( nStart > 0 )
- SubdivideBezier(nFirst, FALSE, (double)nStart / 900);
+ SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
if ( nEnd < 900 )
- SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart));
+ SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
SetFlags(nFirst+1, XPOLY_CONTROL);
SetFlags(nFirst+2, XPOLY_CONTROL);
}
/************************************************************************/
-BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2)
+sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
{
if ( nStart == 3600 ) nStart = 0;
if ( nEnd == 0 ) nEnd = 3600;
- USHORT nStPrev = nStart;
- USHORT nMax = (nStart / 900 + 1) * 900;
- USHORT nMin = nMax - 900;
+ sal_uInt16 nStPrev = nStart;
+ sal_uInt16 nMax = (nStart / 900 + 1) * 900;
+ sal_uInt16 nMin = nMax - 900;
if ( nEnd >= nMax || nEnd <= nStart ) nA2 = 900;
else nA2 = nEnd - nMin;
nA1 = nStart - nMin;
nStart = nMax;
- // TRUE zurueck, falls letztes Segment berechnet wurde
+ // sal_True zurueck, falls letztes Segment berechnet wurde
return (nStPrev < nEnd && nStart >= nEnd);
}
@@ -922,11 +922,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2
|*
\************************************************************************/
-void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
+void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt)
{
CheckReference();
-// USHORT nMaxPnt = pImpXPolygon->nPoints - 1;
+// sal_uInt16 nMaxPnt = pImpXPolygon->nPoints - 1;
// if ( nCenter == nMaxPnt ) nPnt = 1;
// else if ( nCenter == 0 ) nPnt = nMaxPnt - 1;
@@ -935,7 +935,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
// statt dessen nDrag auf der Achse nCenter-nPnt verschieben
if ( !IsControl(nPnt) )
{
- USHORT nTmp = nDrag;
+ sal_uInt16 nTmp = nDrag;
nDrag = nPnt;
nPnt = nTmp;
}
@@ -967,7 +967,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
|*
\************************************************************************/
-void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
+void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext)
{
CheckReference();
@@ -1003,7 +1003,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
|*
\************************************************************************/
-void XPolygon::PointsToBezier(USHORT nFirst)
+void XPolygon::PointsToBezier(sal_uInt16 nFirst)
{
double nFullLength, nPart1Length, nPart2Length;
double fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3;
@@ -1084,9 +1084,9 @@ void XPolygon::Translate(const Point& rTrans)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
pImpXPolygon->pPointAry[i] += rTrans;
}
@@ -1111,9 +1111,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
long nCenterX = rCenter.X();
long nCenterY = rCenter.Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point *pPt = &(pImpXPolygon->pPointAry[i]);
nX = pPt->X()-nCenterX;
@@ -1125,9 +1125,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
/* und so stand das in einem anderen File auf T:
dass ich am 29-11-1995 gegettet habe. Joe M.
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point P = pImpXPolygon->pPointAry[i] - rCenter;
long X = P.X();
@@ -1148,7 +1148,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
|*
*************************************************************************/
-void XPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
@@ -1174,9 +1174,9 @@ void XPolygon::Scale(double fSx, double fSy)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
rPnt.X() = (long)(fSx * rPnt.X());
@@ -1198,9 +1198,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDy = rPnt.Y() - nYRef;
@@ -1223,9 +1223,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDx = rPnt.X() - nXRef;
@@ -1278,9 +1278,9 @@ void XPolygon::Distort(const Rectangle& rRefRect,
X4 = rDistortedRect[2].X();
Y4 = rDistortedRect[2].Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
double fTx, fTy, fUx, fUy;
Point& rPnt = pImpXPolygon->pPointAry[i];
@@ -1356,14 +1356,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
DBG_CTOR(XPolygon,NULL);
const Polygon aSource(rPolygon);
- USHORT nSize = aSource.GetSize();
+ sal_uInt16 nSize = aSource.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = aSource[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i );
}
}
@@ -1415,7 +1415,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
{
size_t nAnz = aXPolyList.size();
const XPolygonList& rCmpList = rImpXPolyPoly.aXPolyList;
- if ( nAnz != rCmpList.size() ) return FALSE;
+ if ( nAnz != rCmpList.size() ) return false;
bool bEq=true;
for ( size_t i = nAnz; i > 0 && bEq; )
{
@@ -1431,7 +1431,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
|*
*************************************************************************/
-XPolyPolygon::XPolyPolygon( USHORT /* nInitSize */, USHORT /* nResize */ )
+XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon();
@@ -1477,7 +1477,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly )
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon;
- for (USHORT i = 0; i < rPolyPoly.Count(); i++)
+ for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++)
pImpXPolyPolygon->aXPolyList.push_back(
new XPolygon(rPolyPoly.GetObject(i)) );
}
@@ -1520,7 +1520,7 @@ void XPolyPolygon::CheckReference()
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1542,7 +1542,7 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
{
CheckReference();
@@ -1568,7 +1568,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Remove( USHORT nPos )
+XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
{
CheckReference();
XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin();
@@ -1587,7 +1587,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
+XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1605,7 +1605,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const
+const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const
{
return *(pImpXPolyPolygon->aXPolyList[ nPos ]);
}
@@ -1639,9 +1639,9 @@ void XPolyPolygon::Clear()
|*
*************************************************************************/
-USHORT XPolyPolygon::Count() const
+sal_uInt16 XPolyPolygon::Count() const
{
- return (USHORT)( pImpXPolyPolygon->aXPolyList.size() );
+ return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.size());
}
@@ -1695,7 +1695,7 @@ Rectangle XPolyPolygon::GetBoundRect() const
|*
*************************************************************************/
-XPolygon& XPolyPolygon::operator[]( USHORT nPos )
+XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos )
{
CheckReference();
return *( pImpXPolyPolygon->aXPolyList[ nPos ] );
@@ -1727,9 +1727,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
|*
*************************************************************************/
-BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1740,9 +1740,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
|*
*************************************************************************/
-BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1803,7 +1803,7 @@ void XPolyPolygon::Rotate20()
|*
*************************************************************************/
-void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk
deleted file mode 100644
index 1ed48bc71f08..000000000000
--- a/svx/source/xoutdev/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-PROJECTPCH=xout
-PROJECTPCHSOURCE=xoutpch
-TARGET=xout
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/xattr.obj \
- $(SLO)$/xattr2.obj \
- $(SLO)$/xattrbmp.obj \
- $(SLO)$/xpool.obj \
- $(SLO)$/xtable.obj \
- $(SLO)$/xtabcolr.obj \
- $(SLO)$/xtablend.obj \
- $(SLO)$/xtabdash.obj \
- $(SLO)$/xtabhtch.obj \
- $(SLO)$/xtabgrdt.obj \
- $(SLO)$/xtabbtmp.obj \
- $(SLO)$/xexch.obj \
- $(SLO)$/_xpoly.obj \
- $(SLO)$/_xoutbmp.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 60336e15787e..99f832ebad5a 100644..100755
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -45,15 +45,15 @@
#include <editeng/memberids.hrc>
#include <tools/stream.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
#include <svl/style.hxx>
#include "unopolyhelper.hxx"
#include <tools/bigint.hxx>
#include <svl/itemset.hxx>
#include <svx/dialogs.hrc>
-#include "svdstr.hrc"
-#include "xattr.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/xattr.hxx"
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
#include <editeng/itemtype.hxx>
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
/************************************************************************/
-#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol))
+#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
/************************************************************************/
@@ -108,11 +108,11 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex)
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
SfxStringItem(_nWhich, aNameOrIndexEmptyString),
nPalIndex(nIndex)
{
@@ -120,11 +120,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName)
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) :
SfxStringItem(_nWhich, rName),
nPalIndex(-1)
{
@@ -132,11 +132,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn)
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) :
SfxStringItem(_nWhich, rIn)
{
rIn >> nPalIndex;
@@ -180,11 +180,11 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new NameOrIndex(Which(), rIn);
}
@@ -195,7 +195,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
SfxStringItem::Store( rOut, nItemVersion );
rOut << nPalIndex;
@@ -207,7 +207,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
Argument pPool2 can be null.
If returned string equals NameOrIndex->GetName(), the name was already unique.
*/
-String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults )
+String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults )
{
sal_Bool bForceNew = sal_False;
@@ -219,12 +219,12 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn
if( aUniqueName.Len() && pPool1 )
{
- const sal_uInt16 nCount = pPool1->GetItemCount( nWhich );
+ const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich );
const NameOrIndex *pItem;
- for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
+ for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate );
+ pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate );
if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) )
{
@@ -301,11 +301,11 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn
if( (aUniqueName.Len() == 0) && pPool1 )
{
- const sal_uInt16 nCount = pPool1->GetItemCount( nWhich );
+ const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich );
const NameOrIndex *pItem;
- for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
+ for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate );
+ pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate );
if( pItem && pItem->GetName().Len() )
{
@@ -337,11 +337,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
NameOrIndex(_nWhich, nIndex),
aColor(rTheColor)
{
@@ -349,11 +349,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) :
NameOrIndex(_nWhich, rName),
aColor(rTheColor)
{
@@ -373,11 +373,11 @@ XColorItem::XColorItem(const XColorItem& rItem) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, SvStream& rIn)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
NameOrIndex(_nWhich, rIn)
{
if (!IsIndex())
@@ -411,11 +411,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
\************************************************************************/
-SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XColorItem(Which(), rIn);
}
@@ -426,7 +426,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\************************************************************************/
-SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -453,13 +453,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
}
-bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return true;
}
-bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -485,7 +485,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
*************************************************************************/
XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) :
- SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle))
+ SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
{
}
@@ -513,11 +513,11 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStyleItem(rIn);
}
@@ -541,9 +541,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XLINE_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -562,14 +562,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
}
}
-bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
rVal <<= eLS;
return true;
}
-bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::LineStyle eLS;
if(!(rVal >>= eLS ))
@@ -581,13 +581,13 @@ bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
eLS = (::com::sun::star::drawing::LineStyle)nLS;
}
- SetValue( sal::static_int_cast< USHORT >( eLS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
return true;
}
//------------------------------------------------------------------------
-USHORT XLineStyleItem::GetValueCount() const
+sal_uInt16 XLineStyleItem::GetValueCount() const
{
return 3;
}
@@ -598,12 +598,12 @@ USHORT XLineStyleItem::GetValueCount() const
// ------------
/*************************************************************************
|*
-|* XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG)
+|* XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr)
|*
*************************************************************************/
-XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen,
- USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) :
+XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+ sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
eDash(eTheDash),
nDots(nTheDots),
nDotLen(nTheDotLen),
@@ -828,11 +828,11 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
+|* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
|*
*************************************************************************/
-XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, nIndex),
aDash(rTheDash)
{
@@ -873,9 +873,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nSTemp;
- UINT32 nLTemp;
- INT32 nITemp;
+ sal_uInt16 nSTemp;
+ sal_uInt32 nLTemp;
+ sal_Int32 nITemp;
rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp);
rIn >> nSTemp; aDash.SetDots(nSTemp);
@@ -926,11 +926,11 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineDashItem(rIn);
}
@@ -941,18 +941,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT32) aDash.GetDashStyle();
+ rOut << (sal_Int32) aDash.GetDashStyle();
rOut << aDash.GetDots();
- rOut << (UINT32) aDash.GetDotLen();
+ rOut << (sal_uInt32) aDash.GetDotLen();
rOut << aDash.GetDashes();
- rOut << (UINT32) aDash.GetDashLen();
- rOut << (UINT32) aDash.GetDistance();
+ rOut << (sal_uInt32) aDash.GetDashLen();
+ rOut << (sal_uInt32) aDash.GetDistance();
}
return rOut;
@@ -1013,7 +1013,7 @@ bool XLineDashItem::ScaleMetrics(long nMul, long nDiv)
return true;
}
-bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1027,7 +1027,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
::com::sun::star::drawing::LineDash aLineDash;
const XDash& rXD = GetDashValue();
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1058,7 +1058,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
::com::sun::star::drawing::LineDash aLineDash;
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1117,7 +1117,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
return true;
}
-bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1149,7 +1149,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
{
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1185,7 +1185,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1206,7 +1206,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
return false;
XDash aXDash = GetDashValue();
- aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
aXDash.SetDots(1);
@@ -1263,7 +1263,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
return true;
}
-BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
}
@@ -1330,11 +1330,11 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineWidthItem(rIn);
}
@@ -1365,7 +1365,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
}
}
-bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Int32 nValue = GetValue();
if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1375,7 +1375,7 @@ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
return true;
}
-bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -1393,11 +1393,11 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
/*************************************************************************
|*
-|* XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
+|* XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
*************************************************************************/
-XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
{
}
@@ -1437,11 +1437,11 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineColorItem(rIn);
}
@@ -1470,13 +1470,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
}
}
-bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return true;
}
-bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1592,11 +1592,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineStartItem::XLineStartItem(INT32 nIndex)
+|* XLineStartItem::XLineStartItem(sal_Int32 nIndex)
|*
*************************************************************************/
-XLineStartItem::XLineStartItem(INT32 nIndex)
+XLineStartItem::XLineStartItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINESTART, nIndex)
{
}
@@ -1680,11 +1680,11 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartItem(rIn);
}
@@ -1695,7 +1695,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -1750,7 +1750,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
}
}
-bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1770,7 +1770,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
return true;
}
-bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1840,16 +1840,16 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
// 2. if we have a name check if there is already an item with the
// same name in the documents pool with a different line end or start
- sal_uInt16 nCount, nSurrogate;
+ sal_uInt32 nCount, nSurrogate;
const SfxItemPool* pPool1 = &pModel->GetItemPool();
if( aUniqueName.Len() && pPool1 )
{
- nCount = pPool1->GetItemCount( XATTR_LINESTART );
+ nCount = pPool1->GetItemCount2( XATTR_LINESTART );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate );
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
@@ -1867,11 +1867,11 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( !bForceNew )
{
- nCount = pPool1->GetItemCount( XATTR_LINEEND );
+ nCount = pPool1->GetItemCount2( XATTR_LINEEND );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate );
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
@@ -1892,10 +1892,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
if( aUniqueName.Len() && pPool2)
{
- nCount = pPool2->GetItemCount( XATTR_LINESTART );
+ nCount = pPool2->GetItemCount2( XATTR_LINESTART );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate );
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
@@ -1913,10 +1913,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( !bForceNew )
{
- nCount = pPool2->GetItemCount( XATTR_LINEEND );
+ nCount = pPool2->GetItemCount2( XATTR_LINEEND );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate );
if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
{
@@ -1946,12 +1946,12 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
if( pPool1 )
{
- nCount = pPool1->GetItemCount( XATTR_LINESTART );
- sal_uInt16 nSurrogate2;
+ nCount = pPool1->GetItemCount2( XATTR_LINESTART );
+ sal_uInt32 nSurrogate2;
for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 );
if( pItem && pItem->GetName().Len() )
{
@@ -1971,10 +1971,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- nCount = pPool1->GetItemCount( XATTR_LINEEND );
+ nCount = pPool1->GetItemCount2( XATTR_LINEEND );
for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 );
if( pItem && pItem->GetName().Len() )
{
@@ -2028,11 +2028,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineEndItem::XLineEndItem(INT32 nIndex)
+|* XLineEndItem::XLineEndItem(sal_Int32 nIndex)
|*
*************************************************************************/
-XLineEndItem::XLineEndItem(INT32 nIndex)
+XLineEndItem::XLineEndItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINEEND, nIndex)
{
}
@@ -2116,11 +2116,11 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndItem(rIn);
}
@@ -2131,7 +2131,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -2207,11 +2207,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
const SfxItemPool* pPool1 = &pModel->GetItemPool();
if( aUniqueName.Len() && pPool1 )
{
- nCount = pPool1->GetItemCount( XATTR_LINESTART );
+ nCount = pPool1->GetItemCount2( XATTR_LINESTART );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate );
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
@@ -2229,11 +2229,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( !bForceNew )
{
- nCount = pPool1->GetItemCount( XATTR_LINEEND );
+ nCount = pPool1->GetItemCount2( XATTR_LINEEND );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate );
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
@@ -2254,10 +2254,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
if( aUniqueName.Len() && pPool2)
{
- nCount = pPool2->GetItemCount( XATTR_LINESTART );
+ nCount = pPool2->GetItemCount2( XATTR_LINESTART );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate );
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
@@ -2275,10 +2275,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( !bForceNew )
{
- nCount = pPool2->GetItemCount( XATTR_LINEEND );
+ nCount = pPool2->GetItemCount2( XATTR_LINEEND );
for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate );
if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
{
@@ -2308,12 +2308,12 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
if( pPool1 )
{
- nCount = pPool1->GetItemCount( XATTR_LINESTART );
- sal_uInt16 nSurrogate2;
+ nCount = pPool1->GetItemCount2( XATTR_LINESTART );
+ sal_uInt32 nSurrogate2;
for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
{
- const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 );
+ const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 );
if( pItem && pItem->GetName().Len() )
{
@@ -2333,10 +2333,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
}
}
- nCount = pPool1->GetItemCount( XATTR_LINEEND );
+ nCount = pPool1->GetItemCount2( XATTR_LINEEND );
for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
{
- const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 );
+ const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 );
if( pItem && pItem->GetName().Len() )
{
@@ -2408,7 +2408,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
}
}
-bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2427,7 +2427,7 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
return true;
}
-bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2464,7 +2464,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
/*************************************************************************
|*
-|* XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
+|* XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth)
|*
*************************************************************************/
@@ -2497,12 +2497,12 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartWidthItem(rIn);
}
@@ -2533,13 +2533,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
}
}
-bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
}
-bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2589,11 +2589,11 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndWidthItem(rIn);
}
@@ -2624,13 +2624,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
}
}
-bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
}
-bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2646,11 +2646,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter)
+|* XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter)
|*
*************************************************************************/
-XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
{
}
@@ -2679,12 +2679,12 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartCenterItem(rIn);
}
@@ -2714,14 +2714,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
}
}
-bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return true;
}
-bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return false;
@@ -2738,11 +2738,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter)
+|* XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter)
|*
*************************************************************************/
-XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
{
}
@@ -2771,12 +2771,12 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndCenterItem(rIn);
}
@@ -2806,14 +2806,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
}
}
-bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return true;
}
-bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return false;
@@ -2839,7 +2839,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
*************************************************************************/
XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
- SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle))
+ SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
{
}
@@ -2867,11 +2867,11 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillStyleItem(rIn);
}
@@ -2896,9 +2896,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XFILL_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -2928,13 +2928,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation
//------------------------------------------------------------------------
-USHORT XFillStyleItem::GetValueCount() const
+sal_uInt16 XFillStyleItem::GetValueCount() const
{
return 5;
}
// -----------------------------------------------------------------------
-bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
@@ -2944,7 +2944,7 @@ bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
}
// -----------------------------------------------------------------------
-bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::FillStyle eFS;
if(!(rVal >>= eFS))
@@ -2956,7 +2956,7 @@ bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
eFS = (::com::sun::star::drawing::FillStyle)nFS;
}
- SetValue( sal::static_int_cast< USHORT >( eFS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
return true;
}
@@ -2969,11 +2969,11 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
/*************************************************************************
|*
-|* XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
+|* XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
*************************************************************************/
-XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
{
}
@@ -3013,11 +3013,11 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillColorItem(rIn);
}
@@ -3048,7 +3048,7 @@ SfxItemPresentation XFillColorItem::GetPresentation
// -----------------------------------------------------------------------
-bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
@@ -3057,7 +3057,7 @@ bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
// -----------------------------------------------------------------------
-bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue ))
@@ -3072,7 +3072,7 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
-XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
{
}
@@ -3092,14 +3092,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const
return new XSecondaryFillColorItem(*this);
}
-SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
if ( nVer >= 2 )
return new XSecondaryFillColorItem( rIn );
else
return new XSecondaryFillColorItem( String(), Color(0,184,255) );
}
-USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
return 2;
}
@@ -3152,15 +3152,15 @@ XGradient::XGradient() :
/*************************************************************************
|*
|* XGradient::XGradient(XGradientStyle, const Color&, const Color&,
-|* long, USHORT, USHORT, USHORT)
+|* long, sal_uInt16, sal_uInt16, sal_uInt16)
|*
*************************************************************************/
XGradient::XGradient(const Color& rStart, const Color& rEnd,
- XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs,
- USHORT nYOfs, USHORT nTheBorder,
- USHORT nStartIntens, USHORT nEndIntens,
- USHORT nSteps) :
+ XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+ sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
+ sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
+ sal_uInt16 nSteps) :
eStyle(eTheStyle),
aStartColor(rStart),
aEndColor(rEnd),
@@ -3202,12 +3202,12 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillGradientItem::XFillGradientItem(INT32 nIndex,
+|* XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
|* const XGradient& rTheGradient)
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(INT32 nIndex,
+XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
const XGradient& rTheGradient) :
NameOrIndex(XATTR_FILLGRADIENT, nIndex),
aGradient(rTheGradient)
@@ -3246,31 +3246,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) :
+XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
NameOrIndex(XATTR_FILLGRADIENT, rIn),
aGradient(COL_BLACK, COL_WHITE)
{
if (!IsIndex())
{
- USHORT nUSTemp;
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nUSTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp);
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetStartColor( aCol );
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetEndColor(aCol);
rIn >> nLTemp; aGradient.SetAngle(nLTemp);
rIn >> nUSTemp; aGradient.SetBorder(nUSTemp);
@@ -3328,11 +3328,11 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillGradientItem(rIn, nVer);
}
@@ -3343,15 +3343,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aGradient.GetGradientStyle();
+ rOut << (sal_Int16)aGradient.GetGradientStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp;
@@ -3360,7 +3360,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aGradient.GetAngle();
+ rOut << (sal_Int32) aGradient.GetAngle();
rOut << aGradient.GetBorder();
rOut << aGradient.GetXOffset();
rOut << aGradient.GetYOffset();
@@ -3390,11 +3390,11 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
/*************************************************************************
|*
-|* USHORT XFillGradientItem::GetVersion() const
+|* sal_uInt16 XFillGradientItem::GetVersion() const
|*
*************************************************************************/
-USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// !!! this version number also represents the version number of superclasses
// !!! (e.g. XFillFloatTransparenceItem); if you make any changes here,
@@ -3427,7 +3427,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
}
// -----------------------------------------------------------------------
-bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
//sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3441,8 +3441,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
const XGradient& aXGradient = GetGradientValue();
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3467,8 +3467,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
::com::sun::star::awt::Gradient aGradient2;
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3507,7 +3507,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
}
// -----------------------------------------------------------------------
-bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3651,7 +3651,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
return true;
}
-BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
}
@@ -3687,14 +3687,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
// -----------------------------------------------------------------------------
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
- bEnabled( FALSE )
+ bEnabled( sal_False )
{
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( nIndex, rGradient ),
bEnabled ( bEnable )
{
@@ -3703,7 +3703,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -3721,7 +3721,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//------------------------------------------------------------------------
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) :
+//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
// XFillGradientItem ( rIn, nVer )
//{
// SetWhich( XATTR_FILLFLOATTRANSPARENCE );
@@ -3730,7 +3730,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//*************************************************************************
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -3762,14 +3762,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
//{
// return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) );
//}
//------------------------------------------------------------------------
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
//{
// XFillGradientItem::Store( rOut, nItemVersion );
// rOut << bEnabled;
@@ -3778,7 +3778,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
{
// !!! if version number of this object must be increased, please !!!
// !!! increase version number of base class XFillGradientItem !!!
@@ -3787,14 +3787,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
//------------------------------------------------------------------------
-bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
return XFillGradientItem::QueryValue( rVal, nMemberId );
}
//------------------------------------------------------------------------
-bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
return XFillGradientItem::PutValue( rVal, nMemberId );
}
@@ -3809,7 +3809,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPrese
return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
}
-BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -3833,7 +3833,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
{
- return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE );
+ return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
}
}
}
@@ -3842,7 +3842,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// #85953# if disabled, force name to empty string
if(GetName().Len())
{
- return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE);
+ return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
}
}
@@ -3890,12 +3890,12 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillHatchItem::XFillHatchItem(INT32 nIndex,
+|* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
|* const XHatch& rTheHatch)
|*
*************************************************************************/
-XFillHatchItem::XFillHatchItem(INT32 nIndex,
+XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
const XHatch& rTheHatch) :
NameOrIndex(XATTR_FILLHATCH, nIndex),
aHatch(rTheHatch)
@@ -3940,11 +3940,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp);
rIn >> nRed;
@@ -3952,7 +3952,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aHatch.SetColor(aCol);
rIn >> nLTemp; aHatch.SetDistance(nLTemp);
rIn >> nLTemp; aHatch.SetAngle(nLTemp);
@@ -3999,11 +3999,11 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillHatchItem(rIn);
}
@@ -4014,21 +4014,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aHatch.GetHatchStyle();
+ rOut << (sal_Int16)aHatch.GetHatchStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aHatch.GetDistance();
- rOut << (INT32) aHatch.GetAngle();
+ rOut << (sal_Int32) aHatch.GetDistance();
+ rOut << (sal_Int32) aHatch.GetAngle();
}
return rOut;
@@ -4088,7 +4088,7 @@ bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
}
// -----------------------------------------------------------------------
-bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4152,7 +4152,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
}
// -----------------------------------------------------------------------
-bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4248,7 +4248,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMem
return true;
}
-BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
}
@@ -4291,7 +4291,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
*************************************************************************/
XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
- SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle))
+ SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
{
}
@@ -4319,11 +4319,11 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStyleItem(rIn);
}
@@ -4334,7 +4334,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStyleItem::GetValueCount() const
+sal_uInt16 XFormTextStyleItem::GetValueCount() const
{
return 5;
}
@@ -4346,7 +4346,7 @@ USHORT XFormTextStyleItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
@@ -4359,11 +4359,11 @@ bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
\*************************************************************************/
// #FontWork#
-bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return true;
}
@@ -4380,7 +4380,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
*************************************************************************/
XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
- SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust))
+ SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
{
}
@@ -4408,11 +4408,11 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextAdjustItem(rIn);
}
@@ -4423,7 +4423,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextAdjustItem::GetValueCount() const
+sal_uInt16 XFormTextAdjustItem::GetValueCount() const
{
return 4;
}
@@ -4435,7 +4435,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
@@ -4448,11 +4448,11 @@ bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
\*************************************************************************/
// #FontWork#
-bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return true;
}
@@ -4497,11 +4497,11 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextDistanceItem(rIn);
}
@@ -4546,11 +4546,11 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStartItem(rIn);
}
@@ -4562,11 +4562,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror)
+|* XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror)
|*
*************************************************************************/
-XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
{
}
@@ -4595,12 +4595,12 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextMirrorItem(rIn);
}
@@ -4617,7 +4617,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
{
}
@@ -4646,12 +4646,12 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextOutlineItem(rIn);
}
@@ -4669,7 +4669,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
SfxEnumItem(
- XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow))
+ XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow))
{
}
@@ -4697,11 +4697,11 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowItem(rIn);
}
@@ -4713,7 +4713,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextShadowItem::GetValueCount() const
+sal_uInt16 XFormTextShadowItem::GetValueCount() const
{
return 3;
}
@@ -4725,7 +4725,7 @@ USHORT XFormTextShadowItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
@@ -4738,11 +4738,11 @@ bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
\*************************************************************************/
// #FontWork#
-bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return true;
}
@@ -4758,7 +4758,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
|*
*************************************************************************/
-XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
const Color& rTheColor) :
XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
{
@@ -4800,11 +4800,11 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowColorItem(rIn);
}
@@ -4849,11 +4849,11 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowXValItem(rIn);
}
@@ -4898,11 +4898,11 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowYValItem(rIn);
}
@@ -4920,7 +4920,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
SfxEnumItem(
- XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm))
+ XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
{
}
@@ -4948,11 +4948,11 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStdFormItem(rIn);
}
@@ -4964,7 +4964,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStdFormItem::GetValueCount() const
+sal_uInt16 XFormTextStdFormItem::GetValueCount() const
{
return 3;
}
@@ -4976,7 +4976,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
@@ -4989,11 +4989,11 @@ bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
\*************************************************************************/
// #FontWork#
-bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return true;
}
@@ -5009,7 +5009,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
{
}
@@ -5038,12 +5038,12 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
*************************************************************************/
-SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextHideFormItem(rIn);
}
@@ -5107,7 +5107,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_LINE_FIRST, XATTR_LINE_LAST);
@@ -5121,7 +5121,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
@@ -5180,7 +5180,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -5194,7 +5194,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index b23b61939477..521bf88d92d6 100644..100755
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
#include <editeng/itemtype.hxx>
@@ -53,11 +53,11 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XLineTransparenceItem::XLineTransparenceItem(USHORT)
+|* XLineTransparenceItem::XLineTransparenceItem(sal_uInt16)
|*
*************************************************************************/
-XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) :
+XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
{
}
@@ -86,11 +86,11 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineTransparenceItem(rIn);
}
@@ -115,7 +115,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) );
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
rText += sal_Unicode('%');
return ePres;
default:
@@ -132,7 +132,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
// -----------------------------------------------------------------------------
XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) :
- SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint))
+ SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
{
}
@@ -145,14 +145,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) :
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
return 1;
}
// -----------------------------------------------------------------------------
-SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
XLineJointItem* pRet = new XLineJointItem( rIn );
@@ -183,7 +183,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch( GetValue() )
{
@@ -223,7 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
// -----------------------------------------------------------------------------
-bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
@@ -253,7 +253,7 @@ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
// -----------------------------------------------------------------------------
-bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
XLineJoint eJoint = XLINEJOINT_NONE;
::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -285,14 +285,14 @@ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
break;
}
- SetValue( sal::static_int_cast< USHORT >( eJoint ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) );
return true;
}
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetValueCount() const
+sal_uInt16 XLineJointItem::GetValueCount() const
{
// don't forget to update the api interface also
return 5;
@@ -305,11 +305,11 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFillTransparenceItem::XFillTransparenceItem(USHORT)
+|* XFillTransparenceItem::XFillTransparenceItem(sal_uInt16)
|*
*************************************************************************/
-XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) :
+XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
{
}
@@ -338,11 +338,11 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillTransparenceItem(rIn);
}
@@ -367,7 +367,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
rText += sal_Unicode('%');
return ePres;
default:
@@ -382,11 +382,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT)
+|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16)
|*
*************************************************************************/
-XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) :
+XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
{
}
@@ -415,11 +415,11 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowTranspItem(rIn);
}
@@ -432,11 +432,11 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XGradientStepCountItem::XGradientStepCountItem( USHORT )
+|* XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 )
|*
*************************************************************************/
-XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) :
+XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
{
}
@@ -465,11 +465,11 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XGradientStepCountItem( rIn );
}
@@ -494,7 +494,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
// rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
// rText += ": ";
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -507,7 +507,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
-XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
{
}
@@ -522,7 +522,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpTileItem( *this );
}
-SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileItem( rIn );
}
@@ -556,7 +556,7 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation
TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
- SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) )
+ SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
{
}
@@ -570,7 +570,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpPosItem( *this );
}
-SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosItem( rIn );
}
@@ -597,7 +597,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
}
}
-USHORT XFillBmpPosItem::GetValueCount() const
+sal_uInt16 XFillBmpPosItem::GetValueCount() const
{
return 9;
}
@@ -623,7 +623,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpSizeXItem( *this );
}
-SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeXItem( rIn );
}
@@ -676,7 +676,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpSizeYItem( *this );
}
-SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeYItem( rIn );
}
@@ -719,7 +719,7 @@ bool XFillBmpSizeYItem::HasMetrics() const
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
{
}
@@ -734,7 +734,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpSizeLogItem( *this );
}
-SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeLogItem( rIn );
}
@@ -767,7 +767,7 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
-XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) :
+XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
{
}
@@ -782,7 +782,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpTileOffsetXItem( *this );
}
-SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetXItem( rIn );
}
@@ -815,7 +815,7 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
-XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) :
+XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
{
}
@@ -830,7 +830,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpTileOffsetYItem( *this );
}
-SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetYItem( rIn );
}
@@ -863,7 +863,7 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
-XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
{
}
@@ -878,7 +878,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpStretchItem( *this );
}
-SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpStretchItem( rIn );
}
@@ -911,7 +911,7 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
-XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) :
+XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
{
}
@@ -926,7 +926,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpPosOffsetXItem( *this );
}
-SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetXItem( rIn );
}
@@ -959,7 +959,7 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation
//------------------------------
TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
-XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) :
+XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
{
}
@@ -974,7 +974,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
return new XFillBmpPosOffsetYItem( *this );
}
-SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetYItem( rIn );
}
@@ -1008,11 +1008,11 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFillBackgroundItem::XFillBackgroundItem( BOOL )
+|* XFillBackgroundItem::XFillBackgroundItem( sal_Bool )
|*
*************************************************************************/
-XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
{
}
@@ -1041,11 +1041,11 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBackgroundItem( rIn );
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index bff7e065b3e6..af4a4034a00b 100644..100755
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -39,13 +39,13 @@
#include <editeng/memberids.hrc>
#include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xtable.hxx>
#include <svx/xdef.hxx>
#include <svx/unomid.hxx>
#include <editeng/unoprnms.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
#include <svx/svdmodel.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -67,7 +67,7 @@ XOBitmap::XOBitmap() :
eType ( XBITMAP_NONE ),
eStyle ( XBITMAP_STRETCH ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -82,7 +82,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
aGraphicObject ( rBmp ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -97,19 +97,19 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
eStyle ( eInStyle ),
aGraphicObject ( rGraphicObject ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
/*************************************************************************
|*
-|* XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor,
+|* XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor,
|* const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
|* XBitmapStyle eStyle = XBITMAP_TILE )
|*
*************************************************************************/
-XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
+XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor,
const Color& rBckgrColor, const Size& rSize,
XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
@@ -117,15 +117,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
aArraySize ( rSize ),
aPixelColor ( rPixelColor ),
aBckgrColor ( rBckgrColor ),
- bGraphicDirty ( TRUE )
+ bGraphicDirty ( sal_True )
{
if( aArraySize.Width() == 8 && aArraySize.Height() == 8 )
{
eType = XBITMAP_8X8;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
}
else
@@ -155,9 +155,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -195,9 +195,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -220,40 +220,40 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
aBckgrColor != rXOBitmap.aBckgrColor ||
bGraphicDirty != rXOBitmap.bGraphicDirty )
{
- return( FALSE );
+ return( sal_False );
}
if( pPixelArray && rXOBitmap.pPixelArray )
{
- USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() );
- for( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
- return( FALSE );
+ return( sal_False );
}
}
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
|*
-|* void SetPixelArray( const USHORT* pArray )
+|* void SetPixelArray( const sal_uInt16* pArray )
|*
*************************************************************************/
-void XOBitmap::SetPixelArray( const USHORT* pArray )
+void XOBitmap::SetPixelArray( const sal_uInt16* pArray )
{
if( eType == XBITMAP_8X8 )
{
if( pPixelArray )
delete []pPixelArray;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
- bGraphicDirty = TRUE;
+ bGraphicDirty = sal_True;
}
else
{
@@ -298,12 +298,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const
void XOBitmap::Bitmap2Array()
{
VirtualDevice aVD;
- BOOL bPixelColor = FALSE;
+ sal_Bool bPixelColor = sal_False;
const Bitmap aBitmap( GetBitmap() );
- const USHORT nLines = 8; // von Type abhaengig
+ const sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
- pPixelArray = new USHORT[ nLines * nLines ];
+ pPixelArray = new sal_uInt16[ nLines * nLines ];
aVD.SetOutputSizePixel( aBitmap.GetSizePixel() );
aVD.DrawBitmap( Point(), aBitmap );
@@ -311,9 +311,9 @@ void XOBitmap::Bitmap2Array()
// Aufbau des Arrays und Ermittlung der Vorder-, bzw.
// Hintergrundfarbe
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor )
*( pPixelArray + j + i * nLines ) = 0;
@@ -323,7 +323,7 @@ void XOBitmap::Bitmap2Array()
if( !bPixelColor )
{
aPixelColor = aVD.GetPixel( Point( j, i ) );
- bPixelColor = TRUE;
+ bPixelColor = sal_True;
}
}
}
@@ -342,7 +342,7 @@ void XOBitmap::Bitmap2Array()
void XOBitmap::Array2Bitmap()
{
VirtualDevice aVD;
- USHORT nLines = 8; // von Type abhaengig
+ sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
return;
@@ -350,9 +350,9 @@ void XOBitmap::Array2Bitmap()
aVD.SetOutputSizePixel( Size( nLines, nLines ) );
// Aufbau der Bitmap
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if( *( pPixelArray + j + i * nLines ) == 0 )
aVD.DrawPixel( Point( j, i ), aBckgrColor );
@@ -362,7 +362,7 @@ void XOBitmap::Array2Bitmap()
}
aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
- bGraphicDirty = FALSE;
+ bGraphicDirty = sal_False;
}
// -----------------------
@@ -416,7 +416,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) :
|*
*************************************************************************/
-XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
+XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) :
NameOrIndex( XATTR_FILLBITMAP, rIn )
{
if( nVer == 0 )
@@ -445,7 +445,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
{
if (!IsIndex())
{
- INT16 iTmp;
+ sal_Int16 iTmp;
rIn >> iTmp;
aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp );
rIn >> iTmp;
@@ -459,10 +459,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = new USHORT[ 64 ];
+ sal_uInt16* pArray = new sal_uInt16[ 64 ];
Color aColor;
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
rIn >> *( pArray + i );
aXOBitmap.SetPixelArray( pArray );
@@ -520,11 +520,11 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
-SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillBitmapItem( rIn, nVer );
}
@@ -535,22 +535,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16) aXOBitmap.GetBitmapStyle();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapStyle();
if( !aXOBitmap.GetBitmap() )
- rOut << (INT16) XBITMAP_NONE;
+ rOut << (sal_Int16) XBITMAP_NONE;
else
{
- rOut << (INT16) aXOBitmap.GetBitmapType();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapType();
if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT )
{
- const USHORT nOldComprMode = rOut.GetCompressMode();
- USHORT nNewComprMode = nOldComprMode;
+ const sal_uInt16 nOldComprMode = rOut.GetCompressMode();
+ sal_uInt16 nNewComprMode = nOldComprMode;
if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 )
nNewComprMode |= COMPRESSMODE_ZBITMAP;
@@ -563,9 +563,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = aXOBitmap.GetPixelArray();
- for( USHORT i = 0; i < 64; i++ )
- rOut << (USHORT) *( pArray + i );
+ sal_uInt16* pArray = aXOBitmap.GetPixelArray();
+ for( sal_uInt16 i = 0; i < 64; i++ )
+ rOut << (sal_uInt16) *( pArray + i );
rOut << aXOBitmap.GetPixelColor();
rOut << aXOBitmap.GetBackgroundColor();
@@ -593,11 +593,11 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
/*************************************************************************
|*
-|* USHORT XFillBitmapItem::GetVersion() const
+|* sal_uInt16 XFillBitmapItem::GetVersion() const
|*
*************************************************************************/
-USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// 2. Version
return( 1 );
@@ -629,7 +629,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
//------------------------------------------------------------------------
-bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -695,7 +695,7 @@ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMember
//------------------------------------------------------------------------
-bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -778,7 +778,7 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMe
return (bSetName || bSetURL || bSetBitmap);
}
-BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() ==
((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 174a529033e8..e1b2d75bf27c 100644..100755
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -40,7 +40,7 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svx/xdef.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream );
@@ -85,7 +85,7 @@ XFillExchangeData::~XFillExchangeData()
|*
|*
*************************************************************************/
-ULONG XFillExchangeData::RegisterClipboardFormatName()
+sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName()
{
return( SOT_FORMATSTR_ID_XFA );
}
@@ -101,7 +101,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
if( rData.pXFillAttrSetItem )
{
SfxWhichIter aIter( rData.pXFillAttrSetItem->GetItemSet() );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
const SfxPoolItem* pItem;
sal_uInt32 nItemCount = 0;
sal_Size nFirstPos = rOStm.Tell();
@@ -110,10 +110,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
while( nWhich )
{
- if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
{
VersionCompat aCompat( rOStm, STREAM_WRITE );
- const USHORT nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() );
+ const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
rOStm << nWhich << nItemVersion2;
pItem->Store( rOStm, nItemVersion2 );
@@ -124,7 +124,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
nWhich = aIter.NextWhich();
}
- const ULONG nLastPos = rOStm.Tell();
+ const sal_uIntPtr nLastPos = rOStm.Tell();
rOStm.Seek( nFirstPos );
rOStm << nItemCount;
rOStm.Seek( nLastPos );
@@ -147,7 +147,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
SfxItemSet* pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST );
SfxPoolItem* pNewItem;
sal_uInt32 nItemCount = 0;
- USHORT nWhich, nItemVersion;
+ sal_uInt16 nWhich, nItemVersion;
rIStm >> nItemCount;
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 8c24f2e2c221..6f239ec93229 100644..100755
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -30,7 +30,7 @@
#include "precompiled_svx.hxx"
#include <svx/xtable.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/svdattr.hxx>
#include <svx/svxids.hrc>
@@ -53,8 +53,8 @@ XOutdevItemPool::XOutdevItemPool(
const XubString aNullStr;
const Bitmap aNullBmp;
const basegfx::B2DPolyPolygon aNullPol;
- const Color aNullLineCol(RGB_Color(COL_BLACK));
- const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); // "Blue 8"
+ const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
+ const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING));
const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
const XDash aNullDash;
const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE));
@@ -109,7 +109,7 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH -XATTR_START] = new XFillBmpStretchItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX -XATTR_START] = new XFillBmpPosOffsetXItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY -XATTR_START] = new XFillBmpPosOffsetYItem;
- mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, FALSE );
+ mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False );
mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
mppLocalPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem;
mppLocalPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem;
@@ -179,12 +179,12 @@ XOutdevItemPool::XOutdevItemPool(
/*************************************************************************
|*
|* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|* (Parameter 2 = TRUE)
+|* (Parameter 2 = sal_True)
|*
\************************************************************************/
XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool)
-: SfxItemPool(rPool, TRUE),
+: SfxItemPool(rPool, sal_True),
mppLocalPoolDefaults(0L),
mpLocalItemInfos(0L)
{
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 1d6da54de628..505ee6377a6e 100644..100755
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -32,7 +32,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtexp.hxx"
@@ -74,7 +74,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
XBitmapTable::XBitmapTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -109,35 +109,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapTable::Load()
+sal_Bool XBitmapTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Save()
+sal_Bool XBitmapTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Create()
+sal_Bool XBitmapTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::CreateBitmapsForUI()
+sal_Bool XBitmapTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -154,7 +154,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XBitmapList::XBitmapList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -189,18 +189,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapList::Load()
+sal_Bool XBitmapList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -211,19 +211,19 @@ BOOL XBitmapList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapList::Save()
+sal_Bool XBitmapList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -238,7 +238,7 @@ BOOL XBitmapList::Save()
/************************************************************************/
// Umgestellt am 27.07.95 auf XBitmap
-BOOL XBitmapList::Create()
+sal_Bool XBitmapList::Create()
{
// Array der Bitmap
//-----------------------
@@ -254,7 +254,7 @@ BOOL XBitmapList::Create()
String aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
Color aColWhite( RGB_Color( COL_WHITE ) );
xub_StrLen nLen;
- USHORT aArray[64];
+ sal_uInt16 aArray[64];
memset( aArray, 0, sizeof( aArray ) );
aStr.AppendAscii(" 1");
@@ -276,19 +276,19 @@ BOOL XBitmapList::Create()
aStr.SetChar(nLen, sal_Unicode('4'));
Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) );
- return( TRUE );
+ return( sal_True );
}
/************************************************************************/
-BOOL XBitmapList::CreateBitmapsForUI()
+sal_Bool XBitmapList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 2129dd0e00f3..f57e4a2798fc 100644..100755
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -32,7 +32,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/pathoptions.hxx>
@@ -75,7 +75,7 @@ static XColorTable* pTable=0;
XColorTable::XColorTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
// ColorTable braucht keine eigene BmpTable
@@ -118,18 +118,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorTable::Load()
+sal_Bool XColorTable::Load()
{
if( bTableDirty )
{
- bTableDirty = FALSE;
+ bTableDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -140,19 +140,19 @@ BOOL XColorTable::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorTable::Save()
+sal_Bool XColorTable::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -166,13 +166,13 @@ BOOL XColorTable::Save()
/************************************************************************/
-BOOL XColorTable::Create()
+sal_Bool XColorTable::Create()
{
XubString aStr;
xub_StrLen nLen;
ResMgr& rRes = DIALOG_MGR();
- static USHORT const aResId[] =
+ static sal_uInt16 aResId[] =
{
RID_SVXSTR_BLACK,
RID_SVXSTR_BLUE,
@@ -221,7 +221,7 @@ BOOL XColorTable::Create()
COL_WHITE
};
- for( USHORT n = 0; n < 16; ++n )
+ for( sal_uInt16 n = 0; n < 16; ++n )
{
Insert( n, new XColorEntry( Color( aColTab[n] ),
String( ResId( aResId[ n ], rRes )) ) );
@@ -455,14 +455,14 @@ BOOL XColorTable::Create()
/************************************************************************/
-BOOL XColorTable::CreateBitmapsForUI()
+sal_Bool XColorTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -479,7 +479,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XColorList::XColorList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -514,35 +514,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorList::Load()
+sal_Bool XColorList::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Save()
+sal_Bool XColorList::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Create()
+sal_Bool XColorList::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 1a7d8241a83c..5e338592318f 100644..100755
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -34,7 +34,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtexp.hxx"
@@ -88,7 +88,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XDashTable::XDashTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -123,35 +123,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const
/************************************************************************/
-BOOL XDashTable::Load()
+sal_Bool XDashTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Save()
+sal_Bool XDashTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Create()
+sal_Bool XDashTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::CreateBitmapsForUI()
+sal_Bool XDashTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -270,18 +270,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const
return (XDashEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XDashList::Load()
+sal_Bool XDashList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -292,17 +292,17 @@ BOOL XDashList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XDashList::Save()
+sal_Bool XDashList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -314,7 +314,7 @@ BOOL XDashList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XDashList::Create()
+sal_Bool XDashList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
xub_StrLen nLen;
@@ -327,16 +327,16 @@ BOOL XDashList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XDashList::CreateBitmapsForUI()
+sal_Bool XDashList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -345,10 +345,10 @@ BOOL XDashList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 2c7dba4b2b85..b115154d3091 100644..100755
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -34,7 +34,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtexp.hxx"
@@ -85,7 +85,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XGradientTable::XGradientTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -120,35 +120,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
/************************************************************************/
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -257,18 +257,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
}
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -280,17 +280,17 @@ BOOL XGradientList::Load()
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -302,7 +302,7 @@ BOOL XGradientList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
xub_StrLen nLen;
@@ -321,16 +321,16 @@ BOOL XGradientList::Create()
aStr.SetChar(nLen, sal_Unicode('6'));
Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -339,10 +339,10 @@ BOOL XGradientList::CreateBitmapsForUI()
impDestroy();
- return( FALSE );
+ return( sal_False );
}
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index ada5f93667f5..2b1d4d260c24 100644..100755
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -34,7 +34,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/svapp.hxx>
@@ -51,7 +51,7 @@
#include <svx/dialmgr.hxx>
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
#include <svx/xflhtit.hxx>
#include <svx/xflclit.hxx>
#include <svx/xfillit0.hxx>
@@ -83,7 +83,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XHatchTable::XHatchTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -118,35 +118,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const
/************************************************************************/
-BOOL XHatchTable::Load()
+sal_Bool XHatchTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Save()
+sal_Bool XHatchTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Create()
+sal_Bool XHatchTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::CreateBitmapsForUI()
+sal_Bool XHatchTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -265,18 +265,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const
return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XHatchList::Load()
+sal_Bool XHatchList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -287,17 +287,17 @@ BOOL XHatchList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XHatchList::Save()
+sal_Bool XHatchList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -309,7 +309,7 @@ BOOL XHatchList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XHatchList::Create()
+sal_Bool XHatchList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
xub_StrLen nLen;
@@ -322,16 +322,16 @@ BOOL XHatchList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XHatchList::CreateBitmapsForUI()
+sal_Bool XHatchList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -340,10 +340,10 @@ BOOL XHatchList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 279624e84530..42fe9043accc 100644..100755
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -58,19 +58,19 @@ Color RGB_Color( ColorData nColorName )
XPropertyTable::XPropertyTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aTable ( nInitSize, nReSize ),
pBmpTable ( NULL ),
- bTableDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bTableDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -97,7 +97,7 @@ XPropertyTable::~XPropertyTable()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
Bitmap* pBitmap = NULL;
- for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
+ for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
{
delete pEntry;
pEntry = (XPropertyEntry*)aTable.Next();
@@ -107,7 +107,7 @@ XPropertyTable::~XPropertyTable()
{
pBitmap = (Bitmap*) pBmpTable->First();
- for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpTable->Next();
@@ -141,7 +141,7 @@ long XPropertyTable::Count() const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
@@ -154,15 +154,15 @@ long XPropertyTable::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
- return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -175,7 +175,7 @@ long XPropertyTable::Get(const XubString& rName)
{
if( bTableDirty )
{
- // bTableDirty = FALSE;
+ // bTableDirty = sal_False;
if( !Load() )
Create();
}
@@ -202,12 +202,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyTable*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
( (XPropertyTable*) this )->CreateBitmapsForUI();
}
- if( pBmpTable->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex );
+ if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -218,14 +218,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
|*
*************************************************************************/
-BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
+sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
{
- BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
+ sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- pBmpTable->Insert( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
}
return bReturn;
}
@@ -238,12 +238,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
if( pOldBmp )
delete pOldBmp;
}
@@ -256,15 +256,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
+ return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
}
/************************************************************************/
@@ -290,19 +290,19 @@ void XPropertyTable::SetName( const String& rString )
XPropertyList::XPropertyList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aList ( nInitSize, nReSize ),
pBmpList ( NULL ),
- bListDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bListDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -329,7 +329,7 @@ XPropertyList::~XPropertyList()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
Bitmap* pBitmap = NULL;
- for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
{
delete pEntry;
pEntry = (XPropertyEntry*)aList.Next();
@@ -339,7 +339,7 @@ XPropertyList::~XPropertyList()
{
pBitmap = (Bitmap*) pBmpList->First();
- for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpList->Next();
@@ -373,7 +373,7 @@ long XPropertyList::Count() const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
@@ -386,15 +386,15 @@ long XPropertyList::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
- return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -407,7 +407,7 @@ long XPropertyList::Get(const XubString& rName)
{
if( bListDirty )
{
- //bListDirty = FALSE;
+ //bListDirty = sal_False;
if( !Load() )
Create();
}
@@ -434,11 +434,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyList*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
( (XPropertyList*) this )->CreateBitmapsForUI();
}
- if( pBmpList->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex );
+ if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -451,13 +451,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
{
- aList.Insert( pEntry, (ULONG) nIndex );
+ aList.Insert( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
Bitmap* pBmp = CreateBitmapForUI(
- (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
- pBmpList->Insert( pBmp, (ULONG) nIndex );
+ (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
+ pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
}
}
@@ -469,12 +469,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
@@ -487,15 +487,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aList.Remove( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
}
/************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index c1d44d53db63..7b37209b6e24 100644..100755
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -34,7 +34,7 @@
#ifndef SVX_LIGHT
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtexp.hxx"
@@ -95,7 +95,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XLineEndTable::XLineEndTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -130,37 +130,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
/************************************************************************/
-BOOL XLineEndTable::Load()
+sal_Bool XLineEndTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Save()
+sal_Bool XLineEndTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Create()
+sal_Bool XLineEndTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
/************************************************************************/
-BOOL XLineEndTable::CreateBitmapsForUI()
+sal_Bool XLineEndTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
// --------------------
@@ -277,18 +277,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XLineEndList::Load()
+sal_Bool XLineEndList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -299,17 +299,17 @@ BOOL XLineEndList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XLineEndList::Save()
+sal_Bool XLineEndList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -321,7 +321,7 @@ BOOL XLineEndList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XLineEndList::Create()
+sal_Bool XLineEndList::Create()
{
basegfx::B2DPolygon aTriangle;
aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -341,16 +341,16 @@ BOOL XLineEndList::Create()
basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
- return( TRUE );
+ return( sal_True );
}
-BOOL XLineEndList::CreateBitmapsForUI()
+sal_Bool XLineEndList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
if( pBmp )
@@ -359,10 +359,10 @@ BOOL XLineEndList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 16:55:39 +0000