diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-12 02:42:58 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-12 02:42:58 +0100 |
commit | e65c0fe553a9d1b85dcacfff7af9df8231427876 (patch) | |
tree | 250636f82248275ef5c1d491e58e4e3cf136cdff /sfx2/inc | |
parent | 35fbb45086c389f91c0d6ff410d814f7567c1ceb (diff) | |
parent | 4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (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 'sfx2/inc')
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/about.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/arrdecl.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/bitset.hxx | 92 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/brokenpackageint.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/configmgr.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/docvor.hxx | 46 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/filedlghelper.hrc | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/frmload.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/fwkhelper.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/guisaveas.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/idpool.hxx | 24 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/inettbc.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/macro.hxx | 20 | ||||
-rw-r--r-- | sfx2/inc/makefile.mk | 48 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/msgnodei.hxx | 56 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/orgmgr.hxx | 36 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/pch/precompiled_sfx2.cxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/pch/precompiled_sfx2.hxx | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/progind.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/resmgr.hxx | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/DocumentMetadataAccess.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/Metadatable.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/QuerySaveDocument.hxx (renamed from sfx2/inc/QuerySaveDocument.hxx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/XmlIdRegistry.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/app.hxx | 59 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/appuno.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/basedlgs.hxx | 19 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/basmgr.hxx (renamed from sfx2/inc/basmgr.hxx) | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/bindings.hxx | 10 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/brokenpackageint.hxx | 55 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/chalign.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/childwin.hxx | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/cntids.hrc | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/controlwrapper.hxx | 62 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/ctrlitem.hxx | 24 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dialogs.hrc | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dinfdlg.hxx | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dinfedt.hxx (renamed from sfx2/inc/dinfedt.hxx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dispatch.hxx | 153 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dllapi.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docfac.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docfile.hxx | 12 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docfilt.hxx | 57 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docinf.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docinsert.hxx (renamed from sfx2/inc/docinsert.hxx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/dockwin.hxx | 26 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docmacromode.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/docstoragemodifylistener.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/doctdlg.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/doctempl.hxx | 74 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/event.hxx | 31 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/evntconf.hxx | 20 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/fcontnr.hxx | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/filedlghelper.hxx | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/frame.hxx | 22 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/frmdescr.hxx | 90 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/frmhtml.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/frmhtmlw.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/genlink.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/hintpost.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/htmlmode.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/imagemgr.hxx (renamed from sfx2/inc/imagemgr.hxx) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/imgdef.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/imgmgr.hxx (renamed from sfx2/inc/imgmgr.hxx) | 14 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/ipclient.hxx | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/itemconnect.hxx | 30 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/itemwrapper.hxx | 30 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/layout-post.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/layout-pre.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/layout-tabdlg.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/layout.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/linkmgr.hxx | 32 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/linksrc.hxx | 22 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/lnkbase.hxx | 44 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/macrconf.hxx | 0 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/macropg.hxx | 150 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/mailmodelapi.hxx (renamed from sfx2/inc/mailmodelapi.hxx) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/mgetempl.hxx | 13 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/mieclip.hxx (renamed from sfx2/inc/mieclip.hxx) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/minarray.hxx | 226 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/minfitem.hxx (renamed from sfx2/inc/minfitem.hxx) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/minstack.hxx | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/mnuitem.hxx | 50 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/mnumgr.hxx | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/module.hxx | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/msg.hxx | 59 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/msgpool.hxx | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/navigat.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/new.hxx | 12 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/newstyle.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/objface.hxx | 54 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/objitem.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/objsh.hxx | 83 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/objuno.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/opengrf.hxx | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/passwd.hxx | 37 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/printer.hxx | 66 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/printopt.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/prnmon.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/progress.hxx | 20 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/querystatus.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/request.hxx | 44 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/securitypage.hxx | 2 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/sfx.hrc | 48 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxbasecontroller.hxx | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxbasemodel.hxx | 135 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/sfxcommands.h | 342 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxdefs.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxdlg.hxx | 22 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxhelp.hxx (renamed from sfx2/inc/sfxhelp.hxx) | 14 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxhtml.hxx | 38 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxmodelfactory.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxresid.hxx (renamed from sfx2/inc/sfxresid.hxx) | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxsids.hrc | 77 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxstatuslistener.hxx | 12 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/sfxuno.hxx | 50 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/shell.hxx | 59 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/signaturestate.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/stbitem.hxx (renamed from sfx2/inc/stbitem.hxx) | 36 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/styfitem.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/styledlg.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/tabdlg.hxx | 108 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/taskpane.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/tbxctrl.hxx | 84 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/templdlg.hxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/titledockwin.hxx | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/tplpitem.hxx (renamed from sfx2/inc/tplpitem.hxx) | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/unoctitm.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/userinputinterception.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/viewfac.hxx (renamed from sfx2/inc/viewfac.hxx) | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/viewfrm.hxx | 100 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfx2/viewsh.hxx | 72 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sfxbasic.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/sorgitm.hxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/inc/srchdlg.hxx | 10 |
135 files changed, 1936 insertions, 1588 deletions
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx index 2e5c4326f7b0..2e5c4326f7b0 100644..100755 --- a/sfx2/inc/about.hxx +++ b/sfx2/inc/about.hxx diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index c7d181eb1110..c7d181eb1110 100644..100755 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx index aa25362c93e2..f61e95984fe8 100644..100755 --- a/sfx2/inc/bitset.hxx +++ b/sfx2/inc/bitset.hxx @@ -36,54 +36,54 @@ class BitSet { private: void CopyFrom( const BitSet& rSet ); - USHORT nBlocks; - USHORT nCount; - ULONG* pBitmap; + sal_uInt16 nBlocks; + sal_uInt16 nCount; + sal_uIntPtr* pBitmap; public: - BitSet operator<<( USHORT nOffset ) const; - BitSet operator>>( USHORT nOffset ) const; - static USHORT CountBits( ULONG nBits ); - BOOL operator!() const; + BitSet operator<<( sal_uInt16 nOffset ) const; + BitSet operator>>( sal_uInt16 nOffset ) const; + static sal_uInt16 CountBits( sal_uIntPtr nBits ); + sal_Bool operator!() const; BitSet(); BitSet( const BitSet& rOrig ); - BitSet( USHORT* pArray, USHORT nSize ); + BitSet( sal_uInt16* pArray, sal_uInt16 nSize ); ~BitSet(); BitSet( const Range& rRange ); - USHORT Count() const; + sal_uInt16 Count() const; BitSet& operator=( const BitSet& rOrig ); - BitSet& operator=( USHORT nBit ); + BitSet& operator=( sal_uInt16 nBit ); BitSet operator|( const BitSet& rSet ) const; - BitSet operator|( USHORT nBit ) const; + BitSet operator|( sal_uInt16 nBit ) const; BitSet& operator|=( const BitSet& rSet ); - BitSet& operator|=( USHORT nBit ); + BitSet& operator|=( sal_uInt16 nBit ); BitSet operator-( const BitSet& rSet ) const; - BitSet operator-( USHORT nId ) const; + BitSet operator-( sal_uInt16 nId ) const; BitSet& operator-=( const BitSet& rSet ); - BitSet& operator-=( USHORT nBit ); + BitSet& operator-=( sal_uInt16 nBit ); BitSet operator&( const BitSet& rSet ) const; BitSet& operator&=( const BitSet& rSet ); BitSet operator^( const BitSet& rSet ) const; - BitSet operator^( USHORT nBit ) const; + BitSet operator^( sal_uInt16 nBit ) const; BitSet& operator^=( const BitSet& rSet ); - BitSet& operator^=( USHORT nBit ); - BOOL IsRealSubSet( const BitSet& rSet ) const; - BOOL IsSubSet( const BitSet& rSet ) const; - BOOL IsRealSuperSet( const BitSet& rSet ) const; - BOOL Contains( USHORT nBit ) const; - BOOL IsSuperSet( const BitSet& rSet ) const; - BOOL operator==( const BitSet& rSet ) const; - BOOL operator==( USHORT nBit ) const; - BOOL operator!=( const BitSet& rSet ) const; - BOOL operator!=( USHORT nBit ) const; + BitSet& operator^=( sal_uInt16 nBit ); + sal_Bool IsRealSubSet( const BitSet& rSet ) const; + sal_Bool IsSubSet( const BitSet& rSet ) const; + sal_Bool IsRealSuperSet( const BitSet& rSet ) const; + sal_Bool Contains( sal_uInt16 nBit ) const; + sal_Bool IsSuperSet( const BitSet& rSet ) const; + sal_Bool operator==( const BitSet& rSet ) const; + sal_Bool operator==( sal_uInt16 nBit ) const; + sal_Bool operator!=( const BitSet& rSet ) const; + sal_Bool operator!=( sal_uInt16 nBit ) const; }; //-------------------------------------------------------------------- -// returns TRUE if the set is empty +// returns sal_True if the set is empty -inline BOOL BitSet::operator!() const +inline sal_Bool BitSet::operator!() const { return nCount == 0; } @@ -91,7 +91,7 @@ inline BOOL BitSet::operator!() const // returns the number of bits in the bitset -inline USHORT BitSet::Count() const +inline sal_uInt16 BitSet::Count() const { return nCount; } @@ -107,7 +107,7 @@ inline BitSet BitSet::operator|( const BitSet& rSet ) const // creates the union of a bitset with a single bit -inline BitSet BitSet::operator|( USHORT nBit ) const +inline BitSet BitSet::operator|( sal_uInt16 nBit ) const { return BitSet(*this) |= nBit; } @@ -124,7 +124,7 @@ inline BitSet BitSet::operator-( const BitSet& ) const // creates the asymetric difference with a single bit -inline BitSet BitSet::operator-( USHORT ) const +inline BitSet BitSet::operator-( sal_uInt16 ) const { return BitSet(); } @@ -165,7 +165,7 @@ inline BitSet BitSet::operator^( const BitSet& ) const // creates the symetric difference with a single bit -inline BitSet BitSet::operator^( USHORT ) const +inline BitSet BitSet::operator^( sal_uInt16 ) const { return BitSet(); } @@ -181,7 +181,7 @@ inline BitSet& BitSet::operator^=( const BitSet& ) #ifdef BITSET_READY // builds the symetric difference with a single bit -inline BitSet& BitSet::operator^=( USHORT ) +inline BitSet& BitSet::operator^=( sal_uInt16 ) { // crash!!! return BitSet(); @@ -191,48 +191,48 @@ inline BitSet& BitSet::operator^=( USHORT ) // determines if the other bitset is a real superset -inline BOOL BitSet::IsRealSubSet( const BitSet& ) const +inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // detsermines if the other bitset is a superset or equal -inline BOOL BitSet::IsSubSet( const BitSet& ) const +inline sal_Bool BitSet::IsSubSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the other bitset is a real subset -inline BOOL BitSet::IsRealSuperSet( const BitSet& ) const +inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the other bitset is a subset or equal -inline BOOL BitSet::IsSuperSet( const BitSet& ) const +inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the bit is the only one in the bitset -inline BOOL BitSet::operator==( USHORT ) const +inline sal_Bool BitSet::operator==( sal_uInt16 ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the bitsets aren't equal -inline BOOL BitSet::operator!=( const BitSet& rSet ) const +inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const { return !( *this == rSet ); } @@ -240,7 +240,7 @@ inline BOOL BitSet::operator!=( const BitSet& rSet ) const // determines if the bitset doesn't contain only this bit -inline BOOL BitSet::operator!=( USHORT nBit ) const +inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const { return !( *this == nBit ); } @@ -249,8 +249,8 @@ inline BOOL BitSet::operator!=( USHORT nBit ) const class IndexBitSet : BitSet { public: - USHORT GetFreeIndex(); - void ReleaseIndex(USHORT i){*this-=i;} + sal_uInt16 GetFreeIndex(); + void ReleaseIndex(sal_uInt16 i){*this-=i;} }; diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx index daa47dcd9d51..daa47dcd9d51 100644..100755 --- a/sfx2/inc/brokenpackageint.hxx +++ b/sfx2/inc/brokenpackageint.hxx diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx index 5146fd662101..5146fd662101 100644..100755 --- a/sfx2/inc/configmgr.hxx +++ b/sfx2/inc/configmgr.hxx diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx index fb4d4e753501..c800d445f6af 100644..100755 --- a/sfx2/inc/docvor.hxx +++ b/sfx2/inc/docvor.hxx @@ -60,27 +60,27 @@ friend class SfxOrganizeDlg_Impl; SfxOrganizeMgr* pMgr; SfxOrganizeDlg_Impl* pDlg; - static BOOL bDropMoveOk; + static sal_Bool bDropMoveOk; DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* ); protected: - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection & ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); - virtual BOOL NotifyMoving(SvLBoxEntry *pSource, + virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); + virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource, SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, ULONG &); - virtual BOOL NotifyCopying(SvLBoxEntry *pSource, + SvLBoxEntry *&pNewParent, sal_uIntPtr &); + virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource, SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, ULONG &); + SvLBoxEntry *&pNewParent, sal_uIntPtr &); virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual long ExpandingHdl(); - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); + virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); using SvLBox::ExecuteDrop; // new d&d virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -99,34 +99,34 @@ public: inline void SetBitmaps( const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp ); - const Image &GetClosedBmp(USHORT nLevel) const; - const Image &GetOpenedBmp(USHORT nLevel) const; + const Image &GetClosedBmp(sal_uInt16 nLevel) const; + const Image &GetOpenedBmp(sal_uInt16 nLevel) const; virtual PopupMenu* CreateContextMenu(); private: - BOOL IsStandard_Impl( SvLBoxEntry *) const; - BOOL MoveOrCopyTemplates(SvLBox *pSourceBox, + sal_Bool IsStandard_Impl( SvLBoxEntry *) const; + sal_Bool MoveOrCopyTemplates(SvLBox *pSourceBox, SvLBoxEntry *pSource, SvLBoxEntry* pTarget, SvLBoxEntry *&pNewParent, - ULONG &rIdx, - BOOL bCopy); - BOOL MoveOrCopyContents(SvLBox *pSourceBox, + sal_uIntPtr &rIdx, + sal_Bool bCopy); + sal_Bool MoveOrCopyContents(SvLBox *pSourceBox, SvLBoxEntry *pSource, SvLBoxEntry* pTarget, SvLBoxEntry *&pNewParent, - ULONG &rIdx, - BOOL bCopy); - inline USHORT GetDocLevel() const; + sal_uIntPtr &rIdx, + sal_Bool bCopy); + inline sal_uInt16 GetDocLevel() const; SfxObjectShellRef GetObjectShell( const Path& ); - BOOL IsUniqName_Impl( const String &rText, + sal_Bool IsUniqName_Impl( const String &rText, SvLBoxEntry* pParent, SvLBoxEntry* pEntry = 0 ) const; - USHORT GetLevelCount_Impl( SvLBoxEntry* pParent ) const; + sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const; SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, - SvLBoxEntry* pParent = NULL, BOOL bChildsOnDemand = FALSE, - ULONG nPos = LIST_APPEND, void* pUserData = NULL ); + SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False, + sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL ); }; #endif // _SFX_HXX diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc index a5db7b4fdb30..a5db7b4fdb30 100644..100755 --- a/sfx2/inc/filedlghelper.hrc +++ b/sfx2/inc/filedlghelper.hrc diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx index b23ae7a5e67b..a35ce9d5a263 100644..100755 --- a/sfx2/inc/frmload.hxx +++ b/sfx2/inc/frmload.hxx @@ -97,7 +97,7 @@ private: ) const; sal_Bool impl_createNewDocWithSlotParam( - const USHORT _nSlotID, + const sal_uInt16 _nSlotID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rxFrame, const bool i_bHidden ); @@ -110,11 +110,11 @@ private: ::comphelper::NamedValueCollection& io_rDescriptor ) const; - USHORT impl_findSlotParam( + sal_uInt16 impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const; - SfxObjectShellLock impl_findObjectShell( + SfxObjectShellRef impl_findObjectShell( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rxDocument ) const; diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx index 1b23e4c2bae6..1b23e4c2bae6 100644..100755 --- a/sfx2/inc/fwkhelper.hxx +++ b/sfx2/inc/fwkhelper.hxx diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 078816cc431f..28f8379c6f1f 100644..100755 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -80,12 +80,6 @@ public: ::rtl::OUString aUserSelectedName, sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES ); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest, - sal_Int32 nMustFlags, - sal_Int32 nDontFlags ); - static sal_Bool CheckFilterOptionsAppearence( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, const ::rtl::OUString& aFilterName ); diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx index 4585dc560fc4..d5fc4adb0ed7 100644..100755 --- a/sfx2/inc/idpool.hxx +++ b/sfx2/inc/idpool.hxx @@ -36,25 +36,25 @@ class IdPool: private BitSet { private: - USHORT nNextFree; - USHORT nRange; - USHORT nOffset; + sal_uInt16 nNextFree; + sal_uInt16 nRange; + sal_uInt16 nOffset; public: - BOOL Lock( const BitSet& rLockSet ); - BOOL IsLocked( USHORT nId ) const; - IdPool( USHORT nMin = 1, USHORT nMax = USHRT_MAX ); - USHORT Get(); - BOOL Put( USHORT nId ); - BOOL Lock( const Range& rRange ); - BOOL Lock( USHORT nId ); + sal_Bool Lock( const BitSet& rLockSet ); + sal_Bool IsLocked( sal_uInt16 nId ) const; + IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX ); + sal_uInt16 Get(); + sal_Bool Put( sal_uInt16 nId ); + sal_Bool Lock( const Range& rRange ); + sal_Bool Lock( sal_uInt16 nId ); }; //------------------------------------------------------------------------ -// returns TRUE if the id is locked +// returns sal_True if the id is locked -inline BOOL IdPool::IsLocked( USHORT nId ) const +inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const { return ( this->Contains(nId-nOffset) ); } diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 51a6d90e01eb..f0a73404320c 100644..100755 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -47,7 +47,7 @@ private: ::svt::AcceleratorExecute* pAccExec; SvtURLBox* GetURLBox() const; - void OpenURL( const String& rName, BOOL bNew ) const; + void OpenURL( const String& rName, sal_Bool bNew ) const; DECL_LINK( OpenHdl, void* ); DECL_LINK( SelectHdl, void* ); @@ -66,11 +66,11 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxURLToolBoxControl_Impl(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; #endif diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx index d72ebd2e44e9..13c451836313 100644..100755 --- a/sfx2/inc/macro.hxx +++ b/sfx2/inc/macro.hxx @@ -17,17 +17,17 @@ class SfxMacro; class SfxMacroStatement { - USHORT nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell + sal_uInt16 nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // aktuelle Parameter, falls nSlotId != 0 String aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF) - BOOL bDone; // auskommentieren wenn kein Done() gerufen + sal_Bool bDone; // auskommentieren wenn kein Done() gerufen void* pDummy; // f"ur alle F"alle zum kompatibel bleiben #ifdef _SFXMACRO_HXX private: void GenerateNameAndArgs_Impl( SfxMacro *pMacro, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); #endif @@ -36,28 +36,28 @@ public: SfxMacroStatement( const String &rTarget, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const SfxShell &rShell, const String &rTarget, - BOOL bAbsolute, + sal_Bool bAbsolute, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const String &rStatment ); ~SfxMacroStatement(); - USHORT GetSlotId() const; + sal_uInt16 GetSlotId() const; const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const; - BOOL IsDone() const; + sal_Bool IsDone() const; const String& GetStatement() const; }; //-------------------------------------------------------------------- -inline USHORT SfxMacroStatement::GetSlotId() const +inline sal_uInt16 SfxMacroStatement::GetSlotId() const /* [Beschreibung] @@ -90,7 +90,7 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property //-------------------------------------------------------------------- -inline BOOL SfxMacroStatement::IsDone() const +inline sal_Bool SfxMacroStatement::IsDone() const /* [Beschreibung] diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk deleted file mode 100644 index b7aa547e2c79..000000000000 --- a/sfx2/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=sfx2 -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx index f73416fde9c7..53c15fc02d24 100644..100755 --- a/sfx2/inc/msgnodei.hxx +++ b/sfx2/inc/msgnodei.hxx @@ -40,8 +40,8 @@ struct SfxMsgAttachFile { int operator==( const SfxMsgAttachFile& rRec ) const { if( aName == rRec.aName && aFile == rRec.aFile ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } SfxMsgAttachFile( const String& rFile, const String& rName) @@ -66,8 +66,8 @@ struct SfxMsgReceiver { int operator==( const SfxMsgReceiver& rRec ) const { if( aName == rRec.aName && eRole == rRec.eRole ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } SfxMsgReceiver( const String& rName, SfxMsgReceiverRole _eRole ) @@ -81,7 +81,7 @@ struct SfxMsgReceiver { class SfxMsgReceiverList_Impl : public List { - ULONG nRef; + sal_uIntPtr nRef; ~SfxMsgReceiverList_Impl(); SfxMsgReceiverList_Impl& operator=( const SfxMsgReceiverList_Impl&); //n.i. public: @@ -92,7 +92,7 @@ public: void Store( SvStream& ) const; void IncRef() { nRef++; } void DecRef() { nRef--; if( !nRef ) delete this; } - ULONG GetRefCount() const { return nRef; } + sal_uIntPtr GetRefCount() const { return nRef; } int operator==( const SfxMsgReceiverList_Impl& ) const; }; @@ -105,8 +105,8 @@ public: TYPEINFO(); SfxMsgReceiverListItem(); - SfxMsgReceiverListItem( USHORT nWhich ); - SfxMsgReceiverListItem( USHORT nWhich, SvStream& rStream ); + SfxMsgReceiverListItem( sal_uInt16 nWhich ); + SfxMsgReceiverListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxMsgReceiverListItem( const SfxMsgReceiverListItem& rItem ); ~SfxMsgReceiverListItem(); @@ -117,14 +117,14 @@ public: SfxMapUnit ePresMetric, XubString &rText ) const; - USHORT Count() const; - SfxMsgReceiver* GetObject( USHORT nPos ); - void Remove( USHORT nPos ); + sal_uInt16 Count() const; + SfxMsgReceiver* GetObject( sal_uInt16 nPos ); + void Remove( sal_uInt16 nPos ); void Add( const SfxMsgReceiver& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; }; @@ -132,7 +132,7 @@ public: class SfxMsgAttachFileList_Impl : public List { - ULONG nRef; + sal_uIntPtr nRef; ~SfxMsgAttachFileList_Impl(); SfxMsgAttachFileList_Impl& operator=( const SfxMsgAttachFileList_Impl&); //n.i. @@ -141,12 +141,12 @@ public: SfxMsgAttachFileList_Impl(const SfxMsgAttachFileList_Impl&); int operator==( const SfxMsgAttachFileList_Impl& rRec ) const; - SfxMsgAttachFile* GetReceiver(ULONG nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); } + SfxMsgAttachFile* GetReceiver(sal_uIntPtr nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); } void Load( SvStream& ); void Store( SvStream& ) const; void IncRef() { nRef++; } void DecRef() { nRef--; if( !nRef ) delete this; } - ULONG GetRefCount() const { return nRef; } + sal_uIntPtr GetRefCount() const { return nRef; } }; class SfxMsgAttachFileListItem : public SfxPoolItem @@ -158,8 +158,8 @@ public: TYPEINFO(); SfxMsgAttachFileListItem(); - SfxMsgAttachFileListItem( USHORT nWhich ); - SfxMsgAttachFileListItem( USHORT nWhich, SvStream& rStream ); + SfxMsgAttachFileListItem( sal_uInt16 nWhich ); + SfxMsgAttachFileListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxMsgAttachFileListItem( const SfxMsgAttachFileListItem& rItem ); ~SfxMsgAttachFileListItem(); @@ -170,14 +170,14 @@ public: SfxMapUnit ePresMetric, XubString &rText ) const; - USHORT Count() const; - SfxMsgAttachFile* GetObject( USHORT nPos ); - void Remove( USHORT nPos ); + sal_uInt16 Count() const; + SfxMsgAttachFile* GetObject( sal_uInt16 nPos ); + void Remove( sal_uInt16 nPos ); void Add( const SfxMsgAttachFile& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; }; @@ -196,17 +196,17 @@ class SfxMsgPriorityItem : public SfxEnumItem public: TYPEINFO(); - SfxMsgPriorityItem( USHORT nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL); + SfxMsgPriorityItem( sal_uInt16 nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL); virtual SfxPoolItem* Clone( SfxItemPool* pPool=0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream&, USHORT ) const; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText ) const; - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueTextByPos( sal_uInt16 nPos ) const; inline SfxMsgPriorityItem& operator=(const SfxMsgPriorityItem& rPrio) { diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index 25d598df4a14..da26a55f0921 100644..100755 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -45,8 +45,8 @@ public: SfxObjectList(); ~SfxObjectList(); - const String& GetBaseName( USHORT nId ) const; - const String& GetFileName( USHORT nId ) const; + const String& GetBaseName( sal_uInt16 nId ) const; + const String& GetFileName( sal_uInt16 nId ) const; }; class IntlWrapper; @@ -67,8 +67,8 @@ private: SfxDocumentTemplates* pTemplates; SfxOrganizeListBox_Impl* pLeftBox; SfxOrganizeListBox_Impl* pRightBox; - BOOL bDeleteTemplates :1; - BOOL bModified :1; + sal_Bool bDeleteTemplates :1; + sal_Bool bModified :1; SfxOrganizeListBox_Impl* GetOther( SfxOrganizeListBox_Impl* ); @@ -78,27 +78,27 @@ public: SfxDocumentTemplates* pTempl = NULL ); ~SfxOrganizeMgr(); - BOOL Copy( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx ); - BOOL Move( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx ); - BOOL Delete( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx ); - BOOL InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, USHORT nRegion ); - BOOL SetName( const String& rName, USHORT nRegion, USHORT nIdx = USHRT_MAX ); - BOOL CopyTo( USHORT nRegion, USHORT nIdx, const String& rName ) const; - BOOL CopyFrom( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx, String& rName ); + sal_Bool Copy( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx ); + sal_Bool Move( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx ); + sal_Bool Delete( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx ); + sal_Bool InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, sal_uInt16 nRegion ); + sal_Bool SetName( const String& rName, sal_uInt16 nRegion, sal_uInt16 nIdx = USHRT_MAX ); + sal_Bool CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String& rName ) const; + sal_Bool CopyFrom( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx, String& rName ); - BOOL Rescan(); - BOOL InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName ); + sal_Bool Rescan(); + sal_Bool InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName ); - BOOL IsModified() const { return bModified ? TRUE : FALSE; } + sal_Bool IsModified() const { return bModified ? sal_True : sal_False; } const SfxDocumentTemplates* GetTemplates() const { return pTemplates; } SfxObjectList& GetObjectList() { return *pImpl->pDocList; } const SfxObjectList& GetObjectList() const { return *pImpl->pDocList; } - SfxObjectShellRef CreateObjectShell( USHORT nIdx ); - SfxObjectShellRef CreateObjectShell( USHORT nRegion, USHORT nIdx ); - BOOL DeleteObjectShell( USHORT ); - BOOL DeleteObjectShell( USHORT, USHORT ); + SfxObjectShellRef CreateObjectShell( sal_uInt16 nIdx ); + SfxObjectShellRef CreateObjectShell( sal_uInt16 nRegion, sal_uInt16 nIdx ); + sal_Bool DeleteObjectShell( sal_uInt16 ); + sal_Bool DeleteObjectShell( sal_uInt16, sal_uInt16 ); void SaveAll( Window* pParent ); }; diff --git a/sfx2/inc/pch/precompiled_sfx2.cxx b/sfx2/inc/pch/precompiled_sfx2.cxx index 7f5f9dd3a307..7f5f9dd3a307 100644..100755 --- a/sfx2/inc/pch/precompiled_sfx2.cxx +++ b/sfx2/inc/pch/precompiled_sfx2.cxx diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 5bd28af4724a..5c4a41e7d6f2 100644..100755 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -545,7 +545,6 @@ #include "svl/ownlist.hxx" #include "svtools/parhtml.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "svtools/printoptions.hxx" #include "unotools/printwarningoptions.hxx" @@ -656,7 +655,7 @@ #include "vcl/stdtext.hxx" #include "vcl/timer.hxx" #include "vcl/unohelp.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "osl/diagnose.h" #include "osl/module.hxx" #include "osl/mutex.hxx" diff --git a/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx index e06665e41779..e06665e41779 100644..100755 --- a/sfx2/inc/progind.hxx +++ b/sfx2/inc/progind.hxx diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx index 2802a812b009..3e0fc3cfc1c5 100644..100755 --- a/sfx2/inc/resmgr.hxx +++ b/sfx2/inc/resmgr.hxx @@ -43,30 +43,30 @@ class SfxResourceManager { SfxResMgrArr aResMgrArr; SfxResMgrArr aResMgrBmpArr; - USHORT nEnterCount; + sal_uInt16 nEnterCount; SfxMessageTable* pMessageTable; private: void ClearMsgTable_Impl(); - SfxMessageDescription* MakeDesc_Impl(USHORT); + SfxMessageDescription* MakeDesc_Impl(sal_uInt16); public: SfxResourceManager(); ~SfxResourceManager(); - USHORT RegisterResource( const char *pFileName); - void ReleaseResource( USHORT nRegisterId ); + sal_uInt16 RegisterResource( const char *pFileName); + void ReleaseResource( sal_uInt16 nRegisterId ); - USHORT RegisterBitmap(const char *pMono, const char *pColor); + sal_uInt16 RegisterBitmap(const char *pMono, const char *pColor); - USHORT RegisterBitmap( const char *pSingleFile ); - void ReleaseBitmap( USHORT nRegisterId ); + sal_uInt16 RegisterBitmap( const char *pSingleFile ); + void ReleaseBitmap( sal_uInt16 nRegisterId ); - Bitmap GetAllBitmap( USHORT nBmpsPerRow ); + Bitmap GetAllBitmap( sal_uInt16 nBmpsPerRow ); void Enter(); void Leave(); - SfxMessageDescription* CreateDescription( USHORT nId ); + SfxMessageDescription* CreateDescription( sal_uInt16 nId ); }; diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx index d22f37304445..d22f37304445 100644..100755 --- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx +++ b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx index 143f0ec52efb..143f0ec52efb 100644..100755 --- a/sfx2/inc/sfx2/Metadatable.hxx +++ b/sfx2/inc/sfx2/Metadatable.hxx diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx index 753f6a4b2607..753f6a4b2607 100644..100755 --- a/sfx2/inc/QuerySaveDocument.hxx +++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx index 00c5ae88063a..00c5ae88063a 100644..100755 --- a/sfx2/inc/sfx2/XmlIdRegistry.hxx +++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 745d650da12a..226aa2d5b051 100644..100755 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -32,6 +32,7 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include <tools/solar.h> +#include <tools/errcode.hxx> #include <svl/smplhint.hxx> #include <svl/poolitem.hxx> #include <vcl/image.hxx> @@ -99,6 +100,8 @@ struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SimpleResMgr; class ModalDialog; +class SbxArray; +class SbxValue; typedef ::std::vector< SfxMedium* > SfxMediumList; @@ -117,7 +120,7 @@ public: { return new SfxLinkItem( *this ); } virtual int operator==( const SfxPoolItem& rL) const { return ((SfxLinkItem&)rL).aLink == aLink; } - SfxLinkItem( USHORT nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) + SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } const Link& GetValue() const { return aLink; } }; @@ -139,7 +142,7 @@ public: SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const; const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const; SfxPoolItem* Create( - const SvGlobalName& rName, USHORT nId, SvStream* pStrm = 0) const; + const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const; void RegisterItemFactory( const SvGlobalName& rName, SfxItemCreateFunc ); }; @@ -163,14 +166,13 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell SfxAppData_Impl* pAppData_Impl; DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* ); - SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE); - SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE); - SAL_DLLPRIVATE void InitializeDisplayName_Impl(); + SAL_DLLPRIVATE sal_Bool SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False); + SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False); static SfxApplication* Create(); void Init(); void Exit(); - void SettingsChange( USHORT, const AppSettings & ); + void SettingsChange( sal_uInt16, const AppSettings & ); void Main( ); void PreInit( ); void Quit(); @@ -185,11 +187,9 @@ public: static SfxApplication* GetOrCreate(); // Resource Manager - bool InitLabelResMgr( const char* _pLabelPrefix, bool _bException = false ); SfxResourceManager& GetResourceManager() const; ResMgr* GetSfxResManager(); SimpleResMgr* GetSimpleResManager(); - ResMgr* GetLabelResManager() const; static ResMgr* CreateResManager( const char *pPrefix ); SimpleResMgr* CreateSimpleResManager(); @@ -202,14 +202,14 @@ public: const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem ); - BOOL InitializeDde(); + sal_Bool InitializeDde(); const DdeService* GetDdeService() const; DdeService* GetDdeService(); void AddDdeTopic( SfxObjectShell* ); void RemoveDdeTopic( SfxObjectShell* ); // "static" methods - ULONG LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, BOOL bCopy=TRUE, SfxItemSet* pArgs = 0 ); + sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 ); ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; SfxTemplateDialog* GetTemplateDialog(); Window* GetTopWindow() const; @@ -219,40 +219,38 @@ public: // members SfxFilterMatcher& GetFilterMatcher(); - SfxMacroConfig* GetMacroConfig() const; SfxProgress* GetProgress() const; const String& GetLastSaveDirectory() const; - USHORT GetFreeIndex(); - void ReleaseIndex(USHORT i); - SfxEventConfiguration* GetEventConfig() const; + sal_uInt16 GetFreeIndex(); + void ReleaseIndex(sal_uInt16 i); // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); static ::rtl::OUString ChooseScript(); - static void MacroOrganizer( INT16 nTabId ); + static void MacroOrganizer( sal_Int16 nTabId ); + static ErrCode CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); + static ErrCode CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) + { return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); } BasicManager* GetBasicManager(); com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetDialogContainer(); com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); StarBASIC* GetBasic(); - USHORT SaveBasicManager() const; - USHORT SaveBasicAndDialogContainer() const; - void EnterBasicCall(); - bool IsInBasicCall() const; - void LeaveBasicCall(); + sal_uInt16 SaveBasicManager() const; + sal_uInt16 SaveBasicAndDialogContainer() const; // misc. - BOOL GetOptions(SfxItemSet &); + sal_Bool GetOptions(SfxItemSet &); void SetOptions(const SfxItemSet &); - virtual void Invalidate(USHORT nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0); void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); - BOOL IsDowning() const; - BOOL IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; + sal_Bool IsDowning() const; + sal_Bool IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; static SfxObjectShellRef DocAlreadyLoaded( const String &rName, - BOOL bSilent, - BOOL bActivate, - BOOL bForbidVisible = FALSE, + sal_Bool bSilent, + sal_Bool bActivate, + sal_Bool bForbidVisible = sal_False, const String* pPostStr = 0); void ResetLastDir(); @@ -260,7 +258,7 @@ public: SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl(); SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl(); - SAL_DLLPRIVATE BOOL QueryExit_Impl(); + SAL_DLLPRIVATE sal_Bool QueryExit_Impl(); SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &); SAL_DLLPRIVATE bool Initialize_Impl(); @@ -268,7 +266,7 @@ public: // Object-Factories/global arrays SAL_DLLPRIVATE void RegisterChildWindow_Impl(SfxModule*, SfxChildWinFactory*); - SAL_DLLPRIVATE void RegisterChildWindowContext_Impl(SfxModule*, USHORT, SfxChildWinContextFactory*); + SAL_DLLPRIVATE void RegisterChildWindowContext_Impl(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); SAL_DLLPRIVATE void RegisterStatusBarControl_Impl(SfxModule*, SfxStbCtrlFactory*); SAL_DLLPRIVATE void RegisterMenuControl_Impl(SfxModule*, SfxMenuCtrlFactory*); SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*); @@ -290,8 +288,6 @@ public: SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); SAL_DLLPRIVATE void PropExec_Impl(SfxRequest &); SAL_DLLPRIVATE void PropState_Impl(SfxItemSet &); - SAL_DLLPRIVATE void MacroExec_Impl(SfxRequest &); - SAL_DLLPRIVATE void MacroState_Impl(SfxItemSet &); SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); SAL_DLLPRIVATE void OfaExec_Impl(SfxRequest &); @@ -300,7 +296,6 @@ public: SAL_DLLPRIVATE void SetProgress_Impl(SfxProgress *); SAL_DLLPRIVATE const String& GetLastDir_Impl() const; SAL_DLLPRIVATE void SetLastDir_Impl( const String & ); - SAL_DLLPRIVATE void PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas ); SAL_DLLPRIVATE void EnterAsynchronCall_Impl(); SAL_DLLPRIVATE bool IsInAsynchronCall_Impl() const; diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index 9c5727e62f1a..9c5727e62f1a 100644..100755 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 66f3b67be9a6..3327c2afeb49 100644..100755 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -66,7 +66,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog { sal_uInt32 nUniqId; String aExtraData; - Timer aTimer; const SfxItemSet* pInputSet; SfxItemSet* pOutputSet; @@ -74,8 +73,6 @@ private: SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined - DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* ); - SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); SAL_DLLPRIVATE void init(); @@ -115,7 +112,7 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, WinBits nWinStyle = WB_STDMODELESS ); ~SfxModelessDialog(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); @@ -154,7 +151,7 @@ protected: ~SfxFloatingWindow(); virtual void StateChanged( StateChangedType nStateChange ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Move(); virtual long Notify( NotifyEvent& rNEvt ); @@ -186,14 +183,14 @@ struct SingleTabDlgImpl m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ), m_pInfoImage( NULL ) {} }; -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte +typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog { public: - SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId ); - SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const SfxItemSet* pInSet = 0 ); - SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const String& rInfoURL ); + SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId ); + SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 ); + SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL ); virtual ~SfxSingleTabDialog(); @@ -201,7 +198,7 @@ public: void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 ); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } - const USHORT* GetInputRanges( const SfxItemPool& rPool ); + const sal_uInt16* GetInputRanges( const SfxItemPool& rPool ); // void SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; } // const SfxItemSet* GetOutputItemSet() const { return pOutSet; } OKButton* GetOKButton() const { return pOKBtn; } @@ -210,7 +207,7 @@ public: private: GetTabPageRanges fnGetRanges; - USHORT* pRanges; + sal_uInt16* pRanges; OKButton* pOKBtn; CancelButton* pCancelBtn; diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx index d173efec5d50..37096a6637ab 100644..100755 --- a/sfx2/inc/basmgr.hxx +++ b/sfx2/inc/sfx2/basmgr.hxx @@ -30,6 +30,7 @@ #define _SFX_BASMGR_HXX #include <basic/basmgr.hxx> +#include <svtools/svtools.hrc> #endif //_SFX_BASMGR_HXX diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index 4d64cd5e3b39..c6a9e8870b3d 100644..100755 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -120,7 +120,7 @@ friend class SfxBindings_Impl; private: SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi, - SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE); + SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False); SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* ); SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache, @@ -200,18 +200,18 @@ public: SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId ); SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); } SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding ); - SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, BOOL ); + SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, sal_Bool ); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* ); SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( sal_Bool bTop = sal_False ) const; SAL_DLLPRIVATE void InvalidateUnoControllers_Impl(); SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* ); SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* ); - SAL_DLLPRIVATE BOOL ExecuteCommand_Impl( const String& rCommand ); + SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand ); SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& ); - SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId ); + SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId ); SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl(); - SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId ); + SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId ); }; #ifdef DBG_UTIL diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx new file mode 100755 index 000000000000..5186e875a6ea --- /dev/null +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -0,0 +1,55 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "sal/config.h" +#include "sfx2/dllapi.h" +#include <com/sun/star/document/BrokenPackageRequest.hpp> +#include <com/sun/star/task/XInteractionApprove.hpp> +#include <com/sun/star/task/XInteractionDisapprove.hpp> + +class RequestPackageReparation_Impl; +class SFX2_DLLPUBLIC RequestPackageReparation +{ + RequestPackageReparation_Impl* pImp; +public: + RequestPackageReparation( ::rtl::OUString aName ); + ~RequestPackageReparation(); + sal_Bool isApproved(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; + +class NotifyBrokenPackage_Impl; +class SFX2_DLLPUBLIC NotifyBrokenPackage +{ + NotifyBrokenPackage_Impl* pImp; +public: + NotifyBrokenPackage( ::rtl::OUString aName ); + ~NotifyBrokenPackage(); + sal_Bool isAborted(); + com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); +}; + diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx index 4cacc5e63147..0b2967bdbd70 100644..100755 --- a/sfx2/inc/sfx2/chalign.hxx +++ b/sfx2/inc/sfx2/chalign.hxx @@ -56,7 +56,7 @@ enum SfxChildAlignment }; // "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird -inline BOOL SfxChildAlignValid( SfxChildAlignment eAlign ) +inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign ) { return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT ); } diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index e96163de4b3b..3760c1d30be9 100644..100755 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -153,7 +153,7 @@ public: virtual void Resizing( Size& rSize ); virtual sal_Bool Close(); - static void RegisterChildWindowContext(SfxModule*, USHORT, SfxChildWinContextFactory*); + static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; class SFX2_DLLPUBLIC SfxChildWindow @@ -192,7 +192,7 @@ public: Point GetPosPixel() { return pWindow->GetPosPixel(); } virtual void Hide(); - virtual void Show( USHORT nFlags ); + virtual void Show( sal_uInt16 nFlags ); sal_uInt16 GetFlags() const { return GetInfo().nFlags; } sal_Bool CanGetFocus() const; @@ -220,7 +220,7 @@ public: void SetHideAtToggle( sal_Bool bOn ); sal_Bool IsHideAtToggle() const; sal_Bool IsVisible() const; - void SetWantsFocus( BOOL ); + void SetWantsFocus( sal_Bool ); sal_Bool WantsFocus() const; virtual sal_Bool QueryClose(); @@ -259,7 +259,7 @@ public: SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent, \ - /* cast is safe here! */static_cast< USHORT >(ShellClass::GetInterfaceId()), \ + /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()), \ pBindings,pInfo); \ return pContext; \ } \ diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index ef652981f76d..ef652981f76d 100644..100755 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx index ac772d3940ca..5959e5eed2ea 100644..100755 --- a/sfx2/inc/sfx2/controlwrapper.hxx +++ b/sfx2/inc/sfx2/controlwrapper.hxx @@ -49,9 +49,9 @@ namespace sfx { // ============================================================================ /** List position type of VCL ListBox. */ -typedef USHORT ListBoxPosType; +typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ -typedef USHORT ValueSetPosType; +typedef sal_uInt16 ValueSetPosType; // ============================================================================ // Helpers @@ -246,7 +246,7 @@ public: /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: - public SingleControlWrapper< CheckBox, BOOL > + public SingleControlWrapper< CheckBox, sal_Bool > { public: explicit CheckBoxWrapper( CheckBox& rCheckBox ); @@ -254,8 +254,8 @@ public: virtual bool IsControlDontKnow() const; virtual void SetControlDontKnow( bool bSet ); - virtual BOOL GetControlValue() const; - virtual void SetControlValue( BOOL bValue ); + virtual sal_Bool GetControlValue() const; + virtual void SetControlValue( sal_Bool bValue ); }; // ---------------------------------------------------------------------------- @@ -316,13 +316,13 @@ public: // ---------------------------------------------------------------------------- -typedef NumericFieldWrapper< INT16 > Int16NumericFieldWrapper; -typedef NumericFieldWrapper< UINT16 > UInt16NumericFieldWrapper; -typedef NumericFieldWrapper< INT32 > Int32NumericFieldWrapper; -typedef NumericFieldWrapper< UINT32 > UInt32NumericFieldWrapper; +typedef NumericFieldWrapper< sal_Int16 > Int16NumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper; +typedef NumericFieldWrapper< sal_Int32 > Int32NumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper; -typedef NumericFieldWrapper< USHORT > UShortNumericFieldWrapper; -typedef NumericFieldWrapper< ULONG > ULongNumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper; +typedef NumericFieldWrapper< sal_uIntPtr > ULongNumericFieldWrapper; // ============================================================================ @@ -351,13 +351,13 @@ private: // ---------------------------------------------------------------------------- -typedef MetricFieldWrapper< INT16 > Int16MetricFieldWrapper; -typedef MetricFieldWrapper< UINT16 > UInt16MetricFieldWrapper; -typedef MetricFieldWrapper< INT32 > Int32MetricFieldWrapper; -typedef MetricFieldWrapper< UINT32 > UInt32MetricFieldWrapper; +typedef MetricFieldWrapper< sal_Int16 > Int16MetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper; +typedef MetricFieldWrapper< sal_Int32 > Int32MetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper; -typedef MetricFieldWrapper< USHORT > UShortMetricFieldWrapper; -typedef MetricFieldWrapper< ULONG > ULongMetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper; +typedef MetricFieldWrapper< sal_uIntPtr > ULongMetricFieldWrapper; // ============================================================================ @@ -393,13 +393,13 @@ public: // ---------------------------------------------------------------------------- -typedef ListBoxWrapper< INT16 > Int16ListBoxWrapper; -typedef ListBoxWrapper< UINT16 > UInt16ListBoxWrapper; -typedef ListBoxWrapper< INT32 > Int32ListBoxWrapper; -typedef ListBoxWrapper< UINT32 > UInt32ListBoxWrapper; +typedef ListBoxWrapper< sal_Int16 > Int16ListBoxWrapper; +typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper; +typedef ListBoxWrapper< sal_Int32 > Int32ListBoxWrapper; +typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper; -typedef ListBoxWrapper< USHORT > UShortListBoxWrapper; -typedef ListBoxWrapper< ULONG > ULongListBoxWrapper; +typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper; +typedef ListBoxWrapper< sal_uIntPtr > ULongListBoxWrapper; // ============================================================================ @@ -435,13 +435,13 @@ public: // ---------------------------------------------------------------------------- -typedef ValueSetWrapper< INT16 > Int16ValueSetWrapper; -typedef ValueSetWrapper< UINT16 > UInt16ValueSetWrapper; -typedef ValueSetWrapper< INT32 > Int32ValueSetWrapper; -typedef ValueSetWrapper< UINT32 > UInt32ValueSetWrapper; +typedef ValueSetWrapper< sal_Int16 > Int16ValueSetWrapper; +typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper; +typedef ValueSetWrapper< sal_Int32 > Int32ValueSetWrapper; +typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper; -typedef ValueSetWrapper< USHORT > UShortValueSetWrapper; -typedef ValueSetWrapper< ULONG > ULongValueSetWrapper; +typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper; +typedef ValueSetWrapper< sal_uIntPtr > ULongValueSetWrapper; // ============================================================================ // Multi control wrappers @@ -640,7 +640,7 @@ ValueT ListBoxWrapper< ValueT >::GetControlValue() const template< typename ValueT > void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) { - USHORT nPos = GetPosFromValue( nValue ); + sal_uInt16 nPos = GetPosFromValue( nValue ); if( nPos != this->GetNotFoundPos() ) this->GetControl().SelectEntryPos( nPos ); } @@ -656,7 +656,7 @@ ValueT ValueSetWrapper< ValueT >::GetControlValue() const template< typename ValueT > void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) { - USHORT nPos = GetPosFromValue( nValue ); + sal_uInt16 nPos = GetPosFromValue( nValue ); if( nPos != this->GetNotFoundPos() ) this->GetControl().SelectItem( nPos ); } diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx index 2d138ba64827..f5ee81b977a1 100644..100755 --- a/sfx2/inc/sfx2/ctrlitem.hxx +++ b/sfx2/inc/sfx2/ctrlitem.hxx @@ -40,14 +40,14 @@ class SvStream; class SFX2_DLLPUBLIC SfxControllerItem { private: - USHORT nId; + sal_uInt16 nId; SfxControllerItem* pNext; // zu benachrichtigendes weiteres ControllerItem SfxBindings* pBindings; protected: //#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE ) #if defined( DBG_UTIL ) - SAL_DLLPRIVATE void CheckConfigure_Impl( ULONG nType ); + SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType ); #endif public: @@ -61,13 +61,13 @@ public: } SfxControllerItem(); // fuer arrays - SfxControllerItem( USHORT nId, SfxBindings & ); + SfxControllerItem( sal_uInt16 nId, SfxBindings & ); virtual ~SfxControllerItem(); - void Bind( USHORT nNewId, SfxBindings * = 0); // in SfxBindings registrieren + void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // in SfxBindings registrieren void UnBind(); void ReBind(); - BOOL IsBound() const; + sal_Bool IsBound() const; void UpdateSlot(); void ClearCache(); void SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; } @@ -75,10 +75,10 @@ public: SfxControllerItem* GetItemLink(); SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink ); - void SetId( USHORT nItemId ); - USHORT GetId() const { return nId; } + void SetId( sal_uInt16 nItemId ); + sal_uInt16 GetId() const { return nId; } - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void DeleteFloatingWindow(); @@ -86,9 +86,9 @@ public: static SfxItemState GetItemState( const SfxPoolItem* pState ); - SAL_DLLPRIVATE BOOL IsBindable_Impl() const + SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const { return pBindings != NULL; } - SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* ); + SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* ); }; //==================================================================== @@ -98,11 +98,11 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem SfxControllerItem* pMaster; protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SfxStatusForwarder( USHORT nSlotId, + SfxStatusForwarder( sal_uInt16 nSlotId, SfxControllerItem&rMaster ); }; diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc index 97e9dd725c9a..97e9dd725c9a 100644..100755 --- a/sfx2/inc/sfx2/dialogs.hrc +++ b/sfx2/inc/sfx2/dialogs.hrc diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 2ee0e6ab67a4..b6cc70f41156 100644..100755 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -163,8 +163,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; // class SfxDocumentPage ------------------------------------------------- @@ -208,7 +208,7 @@ private: String aUnknownSize; String aMultiSignedStr; - BOOL bEnableUseUserData : 1, + sal_Bool bEnableUseUserData : 1, bHandleDelete : 1; DECL_LINK( DeleteHdl, PushButton * ); @@ -218,7 +218,7 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -245,7 +245,7 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -290,9 +290,9 @@ private: void ChangeState( STATE eNewState ); // S_Init is not a valid value here // also checks corresponding radiobutton - void EnableNoUpdate( BOOL bEnable ); - void EnableReload( BOOL bEnable ); - void EnableForward( BOOL bEnable ); + void EnableNoUpdate( sal_Bool bEnable ); + void EnableReload( sal_Bool bEnable ); + void EnableForward( sal_Bool bEnable ); DECL_LINK( ClickHdlNoUpdate, Control* ); DECL_LINK( ClickHdlReload, Control* ); @@ -306,7 +306,7 @@ protected: SfxInternetPage( Window* pParent, const SfxItemSet& ); ~SfxInternetPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -319,7 +319,7 @@ public: class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog { protected: - virtual void PageCreated( USHORT nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); public: SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); @@ -430,7 +430,7 @@ public: inline void CheckYes() { m_aYesButton.Check(); } inline void CheckNo() { m_aNoButton.Check(); } - inline bool IsYesChecked() const { return m_aYesButton.IsChecked() != FALSE; } + inline bool IsYesChecked() const { return m_aYesButton.IsChecked() != sal_False; } }; // struct CustomPropertyLine --------------------------------------------- @@ -502,7 +502,7 @@ public: ~CustomPropertiesWindow(); void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); - USHORT GetVisibleLineCount() const; + sal_uInt16 GetVisibleLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; @@ -552,9 +552,9 @@ public: class SfxCustomPropertiesPage : public SfxTabPage { private: - FixedText m_aPropertiesFT; CustomPropertiesControl m_aPropertiesCtrl; PushButton m_aAddBtn; + FixedText m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin DECL_LINK( AddHdl, PushButton* ); @@ -563,7 +563,7 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx index 1560ae450da8..1560ae450da8 100644..100755 --- a/sfx2/inc/dinfedt.hxx +++ b/sfx2/inc/sfx2/dinfedt.hxx diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index ece26ef891d8..2e9c39e8b027 100644..100755 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -83,23 +83,23 @@ typedef SfxItemPtrArray SfxItemArray_Impl; class SfxExecuteItem : public SfxItemPtrArray, public SfxPoolItem { - USHORT nSlot; + sal_uInt16 nSlot; SfxCallMode eCall; - USHORT nModifier; + sal_uInt16 nModifier; public: - USHORT GetSlot() const { return nSlot; } - USHORT GetModifier() const { return nModifier; } - void SetModifier( USHORT nModifierP ) { nModifier = nModifierP; } + sal_uInt16 GetSlot() const { return nSlot; } + sal_uInt16 GetModifier() const { return nModifier; } + void SetModifier( sal_uInt16 nModifierP ) { nModifier = nModifierP; } SfxCallMode GetCallMode() const { return eCall; } void SetCallMode( SfxCallMode eMode ) { eCall = eMode; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; SfxExecuteItem( - USHORT nWhich, USHORT nSlot, SfxCallMode eMode, + sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode, const SfxPoolItem *pArg1, ... ); SfxExecuteItem( - USHORT nWhich, USHORT nSlot, SfxCallMode eMode ); + sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode ); SfxExecuteItem( const SfxExecuteItem& ); }; @@ -108,11 +108,11 @@ public: class SFX2_DLLPUBLIC SfxDispatcher { SfxDispatcher_Impl* pImp; - BOOL bFlushed; + sal_Bool bFlushed; private: // auf temporaer ausgewerteten Todos suchen - SAL_DLLPRIVATE BOOL CheckVirtualStack( const SfxShell& rShell, BOOL bDeep ); + SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep ); #ifndef _SFX_HXX @@ -122,8 +122,8 @@ friend class SfxViewFrame; DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * ); DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * ); - SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord ); - SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); + SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord ); + SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*); SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: @@ -133,15 +133,15 @@ friend class SfxPopupMenuManager; friend class SfxHelp; // Fuer die Bindings: Finden einer Message; Level fuer // erneuten Zugriff - SAL_DLLPRIVATE BOOL _TryIntercept_Impl( USHORT nId, SfxSlotServer &rServer, BOOL bModal ); - BOOL _FindServer( USHORT nId, SfxSlotServer &rServer, BOOL bModal ); - BOOL _FillState( const SfxSlotServer &rServer, + SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); + sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); + sal_Bool _FillState( const SfxSlotServer &rServer, SfxItemSet &rState, const SfxSlot *pRealSlot ); const SfxPoolItem* _Execute( const SfxSlotServer &rServer ); void _Execute( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, SfxCallMode eCall = SFX_CALLMODE_STANDARD); - const SfxPoolItem* _Execute( USHORT nSlot, SfxCallMode eCall, + const SfxPoolItem* _Execute( sal_uInt16 nSlot, SfxCallMode eCall, va_list pArgs, const SfxPoolItem *pArg1 ); #endif @@ -157,48 +157,48 @@ public: virtual ~SfxDispatcher(); const SfxPoolItem* Execute( const SfxExecuteItem& rItem ); - virtual USHORT ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs=0, USHORT nMode=0 ); - USHORT ExecuteFunction( USHORT nSID, const SfxItemSet& rArgs , USHORT nMode=0 ); + virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs=0, sal_uInt16 nMode=0 ); + sal_uInt16 ExecuteFunction( sal_uInt16 nSID, const SfxItemSet& rArgs , sal_uInt16 nMode=0 ); - virtual void SetExecuteMode( USHORT ); + virtual void SetExecuteMode( sal_uInt16 ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SLOT, const SfxPoolItem **pArgs = 0, - USHORT nModi = 0, + sal_uInt16 nModi = 0, const SfxPoolItem **pInternalArgs = 0); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, SfxItemSet* pArgs, SfxItemSet* pInternalArgs, - USHORT nModi = 0); + sal_uInt16 nModi = 0); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, const SfxPoolItem *pArg1, ... ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, const SfxItemSet &rArgs ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, - USHORT nModi, + sal_uInt16 nModi, const SfxItemSet &rArgs ); - USHORT GetSlotId( const String& rCommand ); + sal_uInt16 GetSlotId( const String& rCommand ); const SfxSlot* GetSlot( const String& rCommand ); - BOOL IsActive( const SfxShell& rShell ); - BOOL IsOnTop( const SfxShell& rShell ); - USHORT GetShellLevel( const SfxShell &rShell ); + sal_Bool IsActive( const SfxShell& rShell ); + sal_Bool IsOnTop( const SfxShell& rShell ); + sal_uInt16 GetShellLevel( const SfxShell &rShell ); SfxBindings* GetBindings() const; void Push( SfxShell& rShell ); - void Pop( SfxShell& rShell, USHORT nMode = 0 ); + void Pop( SfxShell& rShell, sal_uInt16 nMode = 0 ); - SfxShell* GetShell(USHORT nIdx) const; + SfxShell* GetShell(sal_uInt16 nIdx) const; SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; // caller has to clean up the Manager on his own @@ -206,63 +206,60 @@ public: void ExecutePopup( const ResId &rId, Window *pWin = 0, const Point *pPosPixel = 0 ); - static void ExecutePopup( USHORT nConfigId = 0, + static void ExecutePopup( sal_uInt16 nConfigId = 0, Window *pWin = 0, const Point *pPosPixel = 0 ); - static void ExecutePopup( USHORT nConfigId, + static void ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPosPixel, const SfxPoolItem *pArg1, ... ); - void EnterAction( const String& rName ); - void LeaveAction(); - - BOOL IsAppDispatcher() const; - BOOL IsFlushed() const; + sal_Bool IsAppDispatcher() const; + sal_Bool IsFlushed() const; void Flush(); - void Lock( BOOL bLock ); - BOOL IsLocked( USHORT nSID = 0 ) const; - void SetSlotFilter( BOOL bEnable = FALSE, - USHORT nCount = 0, const USHORT *pSIDs = 0 ); + void Lock( sal_Bool bLock ); + sal_Bool IsLocked( sal_uInt16 nSID = 0 ) const; + void SetSlotFilter( sal_Bool bEnable = sal_False, + sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 ); - void HideUI( BOOL bHide = TRUE ); - void ShowObjectBar(USHORT nId, SfxShell *pShell=0) const; - sal_uInt32 GetObjectBarId( USHORT nPos ) const; + void HideUI( sal_Bool bHide = sal_True ); + void ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const; + sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const; - SfxItemState QueryState( USHORT nSID, const SfxPoolItem* &rpState ); - SfxItemState QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny ); + SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState ); + SfxItemState QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny ); - BOOL IsAllowed( USHORT nSlot ) const; + sal_Bool IsAllowed( sal_uInt16 nSlot ) const; ::com::sun::star::frame::XDispatch* GetDispatchInterface( const String& ); void SetDisableFlags( sal_uInt32 nFlags ); sal_uInt32 GetDisableFlags() const; - SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT ); + SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 ); SAL_DLLPRIVATE void SetMenu_Impl(); - SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. - SAL_DLLPRIVATE BOOL IsUpdated_Impl() const; + SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc. + SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const; SAL_DLLPRIVATE void DebugOutput_Impl() const; SAL_DLLPRIVATE void ResetObjectBars_Impl(); - SAL_DLLPRIVATE int GetShellAndSlot_Impl( USHORT nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, - BOOL bOwnShellsOnly, BOOL bModal, BOOL bRealSlot=TRUE ); - SAL_DLLPRIVATE void LockUI_Impl( BOOL bLock = TRUE ); - SAL_DLLPRIVATE void SetReadOnly_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL GetReadOnly_Impl() const; - SAL_DLLPRIVATE BOOL IsSlotEnabledByFilter_Impl( USHORT nSID ) const; - SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL bOn ); - SAL_DLLPRIVATE void SetModalMode_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL IsReadOnlyShell_Impl( USHORT nShell ) const; + SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, + sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True ); + SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True ); + SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const; + SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const; + SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); - SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, USHORT nPos ); + SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos ); SAL_DLLPRIVATE void DoParentActivate_Impl(); SAL_DLLPRIVATE void DoParentDeactivate_Impl(); - SAL_DLLPRIVATE void DoActivate_Impl( BOOL bMDI, SfxViewFrame* pOld ); - SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew ); - SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL); - SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr ); + SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld ); + SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ); + SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool); + SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, String *pStr ); }; //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsFlushed() const +inline sal_Bool SfxDispatcher::IsFlushed() const /* [Beschreibung] @@ -283,9 +280,9 @@ inline void SfxDispatcher::Flush() Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus. F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird - <SfxShell::Activate(BOOL)> mit bMDI == TRUE aufgerufen, f"ur - SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(BOOL)> - mit bMDI == TRUE aufgerufen. + <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur + SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)> + mit bMDI == sal_True aufgerufen. */ { @@ -312,7 +309,7 @@ inline void SfxDispatcher::Push( SfxShell& rShell ) //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell ) +inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell ) /* [Beschreibung] @@ -321,22 +318,22 @@ inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell ) [R"uckgabewert] - BOOL TRUE + sal_Bool sal_True Die SfxShell-Instanz befindet sich auf dem SfxDispatcher. - FALSE + sal_False Die SfxShell-Instanz befindet sich nicht auf dem SfxDispatcher. */ { - return CheckVirtualStack( rShell, TRUE ); + return CheckVirtualStack( rShell, sal_True ); } //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell ) +inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell ) /* [Beschreibung] @@ -345,18 +342,18 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell ) [R"uckgabewert] - BOOL TRUE + sal_Bool sal_True Die SfxShell-Instanz befindet sich als oberste SfxShell auf dem SfxDispatcher. - FALSE + sal_False Die SfxShell-Instanz befindet sich nicht als oberste SfxShell auf dem SfxDispatcher. */ { - return CheckVirtualStack( rShell, FALSE ); + return CheckVirtualStack( rShell, sal_False ); } //-------------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/dllapi.h b/sfx2/inc/sfx2/dllapi.h index 82018b6480e5..82018b6480e5 100644..100755 --- a/sfx2/inc/sfx2/dllapi.h +++ b/sfx2/inc/sfx2/dllapi.h diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index 9e6eae704730..9be57c9bb528 100644..100755 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -88,12 +88,12 @@ public: String GetModuleName() const; void SetDocumentTypeNameResource( const ResId& rId ); String GetDocumentTypeName() const; - SfxFilterContainer *GetFilterContainer( BOOL bForceLoad = TRUE) const; + SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; // Views void RegisterViewFactory(SfxViewFactory &rFactory); - USHORT GetViewFactoryCount() const; - SfxViewFactory& GetViewFactory(USHORT i = 0) const; + sal_uInt16 GetViewFactoryCount() const; + SfxViewFactory& GetViewFactory(sal_uInt16 i = 0) const; /// returns the view factory whose GetAPIViewName or GetLegacyViewName delivers the requested logical name SfxViewFactory* GetViewFactoryByViewName( const String& i_rViewName ) const; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index db9591265f28..e987d3df19a0 100644..100755 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -64,7 +64,6 @@ class Timer; class SfxItemSet; class DateTime; class SvStringsDtor; -class SvEaMgr; #define S2BS(s) ByteString( s, RTL_TEXTENCODING_MS_1252 ) @@ -78,7 +77,6 @@ class SvEaMgr; #define OWEAKOBJECT ::cppu::OWeakObject #define REFERENCE ::com::sun::star::uno::Reference #define XINTERFACE ::com::sun::star::uno::XInterface -#define SEQUENCE ::com::sun::star::uno::Sequence #define EXCEPTION ::com::sun::star::uno::Exception #define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException #define ANY ::com::sun::star::uno::Any @@ -114,7 +112,7 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase SAL_DLLPRIVATE void CloseStreams_Impl(); DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * ); - SAL_DLLPRIVATE void SetPasswordToStorage_Impl(); + SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl(); #endif public: @@ -124,7 +122,7 @@ public: SfxMedium(); SfxMedium( const String &rName, StreamMode nOpenMode, - sal_Bool bDirect=FALSE, + sal_Bool bDirect=sal_False, const SfxFilter *pFilter = 0, SfxItemSet *pSet = 0 ); @@ -138,7 +136,7 @@ public: ~SfxMedium(); - void UseInteractionHandler( BOOL ); + void UseInteractionHandler( sal_Bool ); ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > GetInteractionHandler(); @@ -204,8 +202,6 @@ public: SvStream* GetInStream(); SvStream* GetOutStream(); - SvEaMgr* GetEaMgr(); - sal_Bool Commit(); sal_Bool IsStorage(); @@ -239,7 +235,7 @@ public: ::rtl::OUString GetBaseURL( bool bForSaving=false ); #if _SOLAR__PRIVATE - SAL_DLLPRIVATE BOOL HasStorage_Impl() const; + SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const; SAL_DLLPRIVATE void StorageBackup_Impl(); SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl(); diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index f9c8eea2fb15..a951239d4a25 100644..100755 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -38,44 +38,9 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <tools/wldcrd.hxx> -// TODO/LATER: The flags should be part of the UNO specification -#define SFX_FILTER_IMPORT 0x00000001L -#define SFX_FILTER_EXPORT 0x00000002L -#define SFX_FILTER_TEMPLATE 0x00000004L -#define SFX_FILTER_INTERNAL 0x00000008L -#define SFX_FILTER_TEMPLATEPATH 0x00000010L -#define SFX_FILTER_OWN 0x00000020L -#define SFX_FILTER_ALIEN 0x00000040L -#define SFX_FILTER_USESOPTIONS 0x00000080L - -#define SFX_FILTER_DEFAULT 0x00000100L -#define SFX_FILTER_EXECUTABLE 0x00000200L -#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L -#define SFX_FILTER_MAPTOAPPPLUG 0x00000800L -#define SFX_FILTER_NOTINFILEDLG 0x00001000L -#define SFX_FILTER_NOTINCHOOSER 0x00002000L -#define SFX_FILTER_ASYNC 0x00004000L -// Legt Objekt nur an, kein Laden -#define SFX_FILTER_CREATOR 0x00008000L -#define SFX_FILTER_OPENREADONLY 0x00010000L -#define SFX_FILTER_MUSTINSTALL 0x00020000L -#define SFX_FILTER_CONSULTSERVICE 0x00040000L - -#define SFX_FILTER_STARONEFILTER 0x00080000L -#define SFX_FILTER_PACKED 0x00100000L -#define SFX_FILTER_SILENTEXPORT 0x00200000L - -#define SFX_FILTER_BROWSERPREFERED 0x00400000L - -#define SFX_FILTER_ENCRYPTION 0x01000000L -#define SFX_FILTER_PASSWORDTOMODIFY 0x02000000L - -#define SFX_FILTER_PREFERED 0x10000000L +#include <comphelper/documentconstants.hxx> #define SFX_FILTER_STARTPRESENTATION 0x20000000L -#define SFX_FILTER_VERSION_NONE 0 -#define SFX_FILTER_NOTINSTALLED SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE - #include <sfx2/sfxdefs.hxx> //======================================================================== @@ -86,16 +51,16 @@ class SFX2_DLLPUBLIC SfxFilter friend class SfxFilterContainer; WildCard aWildCard; - ULONG lFormat; + sal_uIntPtr lFormat; String aTypeName; String aUserData; SfxFilterFlags nFormatType; - USHORT nDocIcon; + sal_uInt16 nDocIcon; String aServiceName; String aMimeType; String aFilterName; String aPattern; - ULONG nVersion; + sal_uIntPtr nVersion; String aUIName; String aDefaultTemplate; @@ -105,7 +70,7 @@ public: SfxFilterFlags nFormatType, sal_uInt32 lFormat, const String &rTypeName, - USHORT nDocIcon, + sal_uInt16 nDocIcon, const String &rMimeType, const String &rUserData, const String& rServiceName ); @@ -124,19 +89,19 @@ public: const String& GetName() const { return aFilterName; } const WildCard& GetWildcard() const { return aWildCard; } const String& GetRealTypeName() const { return aTypeName; } - ULONG GetFormat() const { return lFormat; } + sal_uIntPtr GetFormat() const { return lFormat; } const String& GetTypeName() const { return aTypeName; } const String& GetUIName() const { return aUIName; } - USHORT GetDocIconId() const { return nDocIcon; } + sal_uInt16 GetDocIconId() const { return nDocIcon; } const String& GetUserData() const { return aUserData; } const String& GetDefaultTemplate() const { return aDefaultTemplate; } void SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; } - BOOL UsesStorage() const { return GetFormat() != 0; } + sal_Bool UsesStorage() const { return GetFormat() != 0; } void SetURLPattern( const String& rStr ) { aPattern = rStr; aPattern.ToLowerAscii(); } String GetURLPattern() const { return aPattern; } void SetUIName( const String& rName ) { aUIName = rName; } - void SetVersion( ULONG nVersionP ) { nVersion = nVersionP; } - ULONG GetVersion() const { return nVersion; } + void SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; } + sal_uIntPtr GetVersion() const { return nVersion; } String GetSuffixes() const; String GetDefaultExtension() const; const String& GetServiceName() const { return aServiceName; } @@ -147,7 +112,7 @@ public: static String GetTypeFromStorage( const SotStorage& rStg ); static String GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, - BOOL bTemplate = FALSE, + sal_Bool bTemplate = sal_False, String* pName=0 ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, diff --git a/sfx2/inc/sfx2/docinf.hxx b/sfx2/inc/sfx2/docinf.hxx index 22b13be1d56d..22b13be1d56d 100644..100755 --- a/sfx2/inc/sfx2/docinf.hxx +++ b/sfx2/inc/sfx2/docinf.hxx diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index 40969a76dbe1..40969a76dbe1 100644..100755 --- a/sfx2/inc/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx index 3c64fb0fa913..021b9fdefe44 100644..100755 --- a/sfx2/inc/sfx2/dockwin.hxx +++ b/sfx2/inc/sfx2/dockwin.hxx @@ -67,14 +67,14 @@ protected: CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void Resize(); - virtual BOOL PrepareToggleFloatingMode(); + virtual sal_Bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void StartDocking(); - virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); virtual void Resizing( Size& rSize ); virtual void Paint( const Rectangle& rRect ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Move(); SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; } @@ -99,7 +99,7 @@ public: const Rectangle& GetInnerRect() const { return aInnerRect; } const Rectangle& GetOuterRect() const { return aOuterRect; } SfxBindings& GetBindings() const { return *pBindings; } - USHORT GetType() const { return pMgr->GetType(); } + sal_uInt16 GetType() const { return pMgr->GetType(); } SfxChildAlignment GetAlignment() const { return pMgr->GetAlignment(); } void SetAlignment(SfxChildAlignment eAlign) { pMgr->SetAlignment(eAlign); } Size GetFloatingSize() const { return aFloatSize; } @@ -108,19 +108,19 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual long Notify( NotifyEvent& rNEvt ); - virtual void FadeIn( BOOL ); - void AutoShow( BOOL bShow = TRUE ); + virtual void FadeIn( sal_Bool ); + void AutoShow( sal_Bool bShow = sal_True ); DECL_LINK( TimerHdl, Timer* ); SAL_DLLPRIVATE void Initialize_Impl(); - SAL_DLLPRIVATE USHORT GetWinBits_Impl() const; + SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const; SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize ); SAL_DLLPRIVATE void Disappear_Impl(); SAL_DLLPRIVATE void Reappear_Impl(); - SAL_DLLPRIVATE BOOL IsAutoHide_Impl() const; - SAL_DLLPRIVATE BOOL IsPinned_Impl() const; - SAL_DLLPRIVATE void AutoShow_Impl( BOOL bShow = TRUE ); - SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned ); + SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const; + SAL_DLLPRIVATE sal_Bool IsPinned_Impl() const; + SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True ); + SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned ); SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const; SAL_DLLPRIVATE void ReleaseChildWindow_Impl(); }; @@ -129,7 +129,7 @@ class SfxDockingWrapper : public SfxChildWindow { public: SfxDockingWrapper( Window* pParent , - USHORT nId , + sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx index 48b58b4ecd9b..48b58b4ecd9b 100644..100755 --- a/sfx2/inc/sfx2/docmacromode.hxx +++ b/sfx2/inc/sfx2/docmacromode.hxx diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx index b6ac0da8becb..b6ac0da8becb 100644..100755 --- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx +++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx index 9dad5b9ae6d4..8d8e7dfdd546 100644..100755 --- a/sfx2/inc/sfx2/doctdlg.hxx +++ b/sfx2/inc/sfx2/doctdlg.hxx @@ -77,7 +77,7 @@ public: { return aNameEd.GetText().EraseLeadingChars(); } String GetTemplatePath(); void NewTemplate(const String &rPath); - USHORT GetRegion() const { return aRegionLb.GetSelectEntryPos(); } + sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); } String GetRegionName() const { return aRegionLb.GetSelectEntry(); } }; diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx index d6e3a0826efb..ee3db35cebf4 100644..100755 --- a/sfx2/inc/sfx2/doctempl.hxx +++ b/sfx2/inc/sfx2/doctempl.hxx @@ -57,70 +57,70 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates private: SfxDocTemplate_ImplRef pImp; - SAL_DLLPRIVATE BOOL CopyOrMove( USHORT nTargetRegion, USHORT nTargetIdx, - USHORT nSourceRegion, USHORT nSourceIdx, BOOL bMove ); + SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove ); public: SfxDocumentTemplates(); SfxDocumentTemplates(const SfxDocumentTemplates &); ~SfxDocumentTemplates(); - BOOL IsConstructed() { return pImp != NULL; } + sal_Bool IsConstructed() { return pImp != NULL; } void Construct(); - static BOOL SaveDir( /*SfxTemplateDir &rEntry */ ) ; + static sal_Bool SaveDir( /*SfxTemplateDir &rEntry */ ) ; const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &); - BOOL Rescan( ); // Aktualisieren + sal_Bool Rescan( ); // Aktualisieren void ReInitFromComponent(); - BOOL IsRegionLoaded( USHORT nIdx ) const; - USHORT GetRegionCount() const; - const String& GetRegionName(USHORT nIdx) const; //dv! - String GetFullRegionName(USHORT nIdx) const; - USHORT GetRegionNo( const String &rRegionName ) const; + sal_Bool IsRegionLoaded( sal_uInt16 nIdx ) const; + sal_uInt16 GetRegionCount() const; + const String& GetRegionName(sal_uInt16 nIdx) const; //dv! + String GetFullRegionName(sal_uInt16 nIdx) const; + sal_uInt16 GetRegionNo( const String &rRegionName ) const; - USHORT GetCount(USHORT nRegion) const; - USHORT GetCount( const String &rName) const; - const String& GetName(USHORT nRegion, USHORT nIdx) const; //dv! - String GetFileName(USHORT nRegion, USHORT nIdx) const; - String GetPath(USHORT nRegion, USHORT nIdx) const; + sal_uInt16 GetCount(sal_uInt16 nRegion) const; + sal_uInt16 GetCount( const String &rName) const; + const String& GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const; //dv! + String GetFileName(sal_uInt16 nRegion, sal_uInt16 nIdx) const; + String GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const; String GetDefaultTemplatePath(const String &rLongName); // Pfad zur Vorlage geben lassen; logischer Name muss angegeben // werden, damit beim Ueberschreiben einer Vorlage der // richtige Dateiname gefunden werden kann - String GetTemplatePath(USHORT nRegion, const String &rLongName) const; + String GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const; // Allows to retrieve the target template URL from the UCB ::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, const ::rtl::OUString& aTitle ); // Speichern als Vorlage hat geklappt -> Aktualisieren - void NewTemplate(USHORT nRegion, + void NewTemplate(sal_uInt16 nRegion, const String &rLongName, const String &rFileName); - BOOL Copy(USHORT nTargetRegion, - USHORT nTargetIdx, - USHORT nSourceRegion, - USHORT nSourceIdx); - BOOL Move(USHORT nTargetRegion, - USHORT nTargetIdx, - USHORT nSourceRegion, - USHORT nSourceIdx); - BOOL Delete(USHORT nRegion, USHORT nIdx); - BOOL InsertDir(const String &rText, USHORT nRegion); - BOOL SetName(const String &rName, USHORT nRegion, USHORT nIdx); - - BOOL CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const; - BOOL CopyFrom(USHORT nRegion, USHORT nIdx, String &rName); - - SfxObjectShellRef CreateObjectShell(USHORT nRegion, USHORT nIdx); - BOOL DeleteObjectShell(USHORT, USHORT); - - BOOL GetFull( const String& rRegion, const String& rName, String& rPath ); - BOOL GetLogicNames( const String& rPath, String& rRegion, String& rName ) const; + sal_Bool Copy(sal_uInt16 nTargetRegion, + sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, + sal_uInt16 nSourceIdx); + sal_Bool Move(sal_uInt16 nTargetRegion, + sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, + sal_uInt16 nSourceIdx); + sal_Bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool InsertDir(const String &rText, sal_uInt16 nRegion); + sal_Bool SetName(const String &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); + + sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const; + sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName); + + SfxObjectShellRef CreateObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool DeleteObjectShell(sal_uInt16, sal_uInt16); + + sal_Bool GetFull( const String& rRegion, const String& rName, String& rPath ); + sal_Bool GetLogicNames( const String& rPath, String& rRegion, String& rName ) const; /** updates the configuration where the document templates structure is stored. diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index 433353b8341f..6e28386b4f19 100644..100755 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/frame/XController2.hpp> class SfxObjectShell; @@ -46,17 +47,17 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; ::rtl::OUString aEventName; - USHORT nEventId; + sal_uInt16 nEventId; public: TYPEINFO(); - SfxEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 ) + SfxEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 ) : pObjShell(pObj), aEventName(aName), nEventId(nId) {} - USHORT GetEventId() const + sal_uInt16 GetEventId() const { return nEventId; } ::rtl::OUString GetEventName() const @@ -68,6 +69,29 @@ public: //------------------------------------------------------------------- +class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint +{ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > xViewController; + +public: + TYPEINFO(); + + SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) + : SfxEventHint( nId, aName, pObj ) + , xViewController( xController, ::com::sun::star::uno::UNO_QUERY ) + {} + + SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController ) + : SfxEventHint( nId, aName, pObj ) + , xViewController( xController ) + {} + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > GetController() const + { return xViewController; } +}; + +//------------------------------------------------------------------- + class SfxNamedHint : public SfxHint { String _aEventName; @@ -96,7 +120,6 @@ public: SfxObjectShell* GetObjShell() const { return _pObjShell; } }; -class PrintDialog; class Printer; class SfxPrintingHint : public SfxHint { diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 66c8b345422d..89fef8d61687 100644..100755 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -47,10 +47,6 @@ #include <svl/macitem.hxx> #include <vector> -class SfxMacroInfo; -class SfxMacroInfoArr_Impl; -class SfxEventConfigItem_Impl; -class SfxEventInfoArr_Impl; class SfxObjectShell; class SvxMacroTableDtor; @@ -58,11 +54,11 @@ class SvxMacroTableDtor; struct SFX2_DLLPUBLIC SfxEventName { - USHORT mnId; + sal_uInt16 mnId; String maEventName; String maUIName; - SfxEventName( USHORT nId, + SfxEventName( sal_uInt16 nId, const String& rEventName, const String& rUIName ) : mnId( nId ) @@ -99,7 +95,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem public: TYPEINFO(); - SfxEventNamesItem ( const USHORT nId ) : SfxPoolItem( nId ) {} + SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -108,13 +104,13 @@ public: XubString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxEventNamesList& GetEvents() const { return aEventsList;} void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; } - void AddEvent( const String&, const String&, USHORT ); + void AddEvent( const String&, const String&, sal_uInt16 ); }; // ----------------------------------------------------------------------- @@ -129,7 +125,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration { public: static void ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); - static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp ); + static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ); }; #endif diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index 271f2e03d369..21c6c27609d8 100644..100755 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -50,7 +50,7 @@ class SfxFilterContainer_Impl; class SfxFrame; //#define SFX_FILTER_CONTAINER_FACTORY 1 -typedef USHORT SfxFilterContainerFlags; +typedef sal_uInt16 SfxFilterContainerFlags; class SfxRefItem : public SfxPoolItem { @@ -60,7 +60,7 @@ public: { return new SfxRefItem( *this ); } virtual int operator==( const SfxPoolItem& rL) const { return ((SfxRefItem&)rL).aRef == aRef; } - SfxRefItem( USHORT nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) + SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) { aRef = rValue; } const SvRefBaseRef& GetValue() const { return aRef; } @@ -93,7 +93,7 @@ public: FactoryFunc GetFactory() { return pFunc; } }; -typedef ULONG (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); +typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); class SFX2_DLLPUBLIC SfxFilterContainer { @@ -116,11 +116,11 @@ public: const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; - SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE ); + SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False ); SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, - BOOL bUpdate ); + sal_Bool bUpdate ); SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& ); }; @@ -135,13 +135,13 @@ public: SfxFilterMatcher(); ~SfxFilterMatcher(); - SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter ); + SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter ); DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* ); sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const; - sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, BOOL bPlugIn, BOOL bAPI = FALSE ) const; + sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const; const SfxFilter* GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; @@ -158,7 +158,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter { SfxFilterFlags nOrMask; SfxFilterFlags nAndMask; - USHORT nCurrent; + sal_uInt16 nCurrent; const SfxFilterMatcher_Impl *pMatch; SAL_DLLPRIVATE const SfxFilter* Find_Impl(); diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index b811929d3e31..f31f6d24e5d1 100644..100755 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -277,8 +277,7 @@ public: Pointer to an array of help ids. For each element in _pControlId, there must be a corresponding element herein. */ - void SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ); - void SetDialogHelpId( const sal_Int32 _nHelpId ); + void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); void CreateMatcher( const String& rName ); /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index 40c72c697ddc..54b3d0330308 100644..100755 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -139,7 +139,7 @@ public: static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > CreateBlankFrame(); - static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden ); + static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); SvCompatWeakHdl* GetHdl(); Window& GetWindow() const; @@ -150,7 +150,7 @@ public: SfxFrame* GetParentFrame() const { return pParentFrame; } - void SetPresentationMode( BOOL bSet ); + void SetPresentationMode( sal_Bool bSet ); SystemWindow* GetSystemWindow() const; static SfxFrame* GetFirst(); @@ -219,9 +219,9 @@ public: SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool ); SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc ); - SAL_DLLPRIVATE void LockResize_Impl( BOOL bLock ); - SAL_DLLPRIVATE void SetMenuBarOn_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL IsMenuBarOn_Impl() const; + SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock ); + SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const; SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const; SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const; SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const; @@ -264,8 +264,8 @@ public: virtual String GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); sal_Bool FrameKilled() const { return &wFrame != pFrame; } @@ -283,8 +283,8 @@ public: { return aValue; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem @@ -301,8 +301,8 @@ public: { return m_xFrame; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; typedef SfxUsrAnyItem SfxUnoAnyItem; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 2a29cd00d885..51305f9a2766 100644..100755 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -91,12 +91,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor long nWidth; ScrollingMode eScroll; SizeSelector eSizeSelector; - USHORT nHasBorder; - USHORT nItemId; - BOOL bResizeHorizontal; - BOOL bResizeVertical; - BOOL bHasUI; - BOOL bReadOnly; + sal_uInt16 nHasBorder; + sal_uInt16 nItemId; + sal_Bool bResizeHorizontal; + sal_Bool bResizeVertical; + sal_Bool bHasUI; + sal_Bool bReadOnly; SfxFrameDescriptor_Impl* pImp; SvStrings* pScripts; SvStrings* pComments; @@ -118,13 +118,13 @@ public: { return aActualURL; } void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const String& rURL ); - BOOL CheckContent() const; - BOOL CompareOriginal( SfxFrameDescriptor& rSet ) const; - void UnifyContent( BOOL ); - void SetReadOnly( BOOL bSet ) { bReadOnly = bSet;} - BOOL IsReadOnly( ) const { return bReadOnly;} - void SetEditable( BOOL bSet ); - BOOL IsEditable() const; + sal_Bool CheckContent() const; + sal_Bool CompareOriginal( SfxFrameDescriptor& rSet ) const; + void UnifyContent( sal_Bool ); + void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;} + sal_Bool IsReadOnly( ) const { return bReadOnly;} + void SetEditable( sal_Bool bSet ); + sal_Bool IsEditable() const; // Size void SetWidth( long n ) @@ -139,9 +139,9 @@ public: { return nWidth; } SizeSelector GetSizeSelector() const { return eSizeSelector; } - BOOL IsResizable() const + sal_Bool IsResizable() const { return bResizeHorizontal && bResizeVertical; } - void SetResizable( BOOL bRes ) + void SetResizable( sal_Bool bRes ) { bResizeHorizontal = bResizeVertical = bRes; } // FrameName @@ -163,38 +163,38 @@ public: // FrameBorder void SetWallpaper( const Wallpaper& rWallpaper ); const Wallpaper* GetWallpaper() const; - BOOL HasFrameBorder() const; + sal_Bool HasFrameBorder() const; - BOOL IsFrameBorderOn() const + sal_Bool IsFrameBorderOn() const { return ( nHasBorder & BORDER_YES ) != 0; } - void SetFrameBorder( BOOL bBorder ) + void SetFrameBorder( sal_Bool bBorder ) { nHasBorder = bBorder ? BORDER_YES | BORDER_SET : BORDER_NO | BORDER_SET; } - BOOL IsFrameBorderSet() const + sal_Bool IsFrameBorderSet() const { return (nHasBorder & BORDER_SET) != 0; } void ResetBorder() { nHasBorder = 0; } - BOOL HasUI() const + sal_Bool HasUI() const { return bHasUI; } - void SetHasUI( BOOL bOn ) + void SetHasUI( sal_Bool bOn ) { bHasUI = bOn; } // Attribute f"ur das Splitwindow - USHORT GetItemId() const + sal_uInt16 GetItemId() const { return nItemId; } - void SetItemId( USHORT nId ) + void SetItemId( sal_uInt16 nId ) { nItemId = nId; } - USHORT GetWinBits() const; + sal_uInt16 GetWinBits() const; long GetSize() const; - USHORT GetItemPos() const; + sal_uInt16 GetItemPos() const; // Kopie z.B. f"ur die Views - SfxFrameDescriptor* Clone( BOOL bWithIds = TRUE ) const; + SfxFrameDescriptor* Clone( sal_Bool bWithIds = sal_True ) const; }; // Kein Bock, einen operator= zu implementieren... @@ -211,13 +211,13 @@ struct SfxFrameProperties ScrollingMode eScroll; SizeSelector eSizeSelector; SizeSelector eSetSizeSelector; - BOOL bHasBorder; - BOOL bBorderSet; - BOOL bResizable; - BOOL bSetResizable; - BOOL bIsRootSet; - BOOL bIsInColSet; - BOOL bHasBorderInherited; + sal_Bool bHasBorder; + sal_Bool bBorderSet; + sal_Bool bResizable; + sal_Bool bSetResizable; + sal_Bool bIsRootSet; + sal_Bool bIsInColSet; + sal_Bool bHasBorderInherited; SfxFrameDescriptor* pFrame; private: @@ -233,13 +233,13 @@ public: eScroll( ScrollingAuto ), eSizeSelector( SIZE_REL ), eSetSizeSelector( SIZE_REL ), - bHasBorder( TRUE ), - bBorderSet( TRUE ), - bResizable( TRUE ), - bSetResizable( TRUE ), - bIsRootSet( FALSE ), - bIsInColSet( FALSE ), - bHasBorderInherited( TRUE ), + bHasBorder( sal_True ), + bBorderSet( sal_True ), + bResizable( sal_True ), + bSetResizable( sal_True ), + bIsRootSet( sal_False ), + bIsInColSet( sal_False ), + bHasBorderInherited( sal_True ), pFrame( 0 ) {} SfxFrameProperties( const SfxFrameDescriptor *pD ); @@ -255,12 +255,12 @@ class SfxFrameDescriptorItem : public SfxPoolItem public: TYPEINFO(); - SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const USHORT nId = SID_FRAMEDESCRIPTOR ) + SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) , aProperties( pD ) {} - SfxFrameDescriptorItem ( const USHORT nId = SID_FRAMEDESCRIPTOR ) + SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) {} @@ -281,9 +281,9 @@ public: UniString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - //virtual SfxPoolItem* Create(SvStream &, USHORT) const; - //virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - //virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + //virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + //virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + //virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxFrameProperties& GetProperties() const { return aProperties; } diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index cb6a049b35aa..ac3f2303df7b 100644..100755 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -47,7 +47,7 @@ class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser friend class _SfxFrameHTMLContext; protected: - SfxFrameHTMLParser( SvStream& rStream, BOOL bIsNewDoc=TRUE, SfxMedium *pMediumPtr=0 ): + SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ): SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {}; public: diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index abc1748c898d..9521d6982fb6 100644..100755 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -54,12 +54,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter SAL_DLLPRIVATE static const sal_Char sNewLine[]; SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const String& rName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars = 0 ); SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const sal_Char *pName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars = 0 ); @@ -82,7 +82,7 @@ public: inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, const sal_Char *pIndent, const sal_Char *pName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx index 3aa5debb947b..81479a0af846 100644..100755 --- a/sfx2/inc/sfx2/genlink.hxx +++ b/sfx2/inc/sfx2/genlink.hxx @@ -47,8 +47,8 @@ public: GenLink& operator = ( const GenLink& rOrig ) { pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; } - BOOL operator!() const { return !aLink && !pFunc; } - BOOL IsSet() const { return aLink.IsSet() || pFunc; } + sal_Bool operator!() const { return !aLink && !pFunc; } + sal_Bool IsSet() const { return aLink.IsSet() || pFunc; } long Call( void* pCaller ) { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); } diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx index c911e8ee4c5a..0a3fbe1672c6 100644..100755 --- a/sfx2/inc/sfx2/hintpost.hxx +++ b/sfx2/inc/sfx2/hintpost.hxx @@ -53,7 +53,7 @@ class SfxHintPoster: public SvRefBase */ { - ULONG nId; + sal_uIntPtr nId; GenLink aLink; private: diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx index b6f5982b455f..b6f5982b455f 100644..100755 --- a/sfx2/inc/sfx2/htmlmode.hxx +++ b/sfx2/inc/sfx2/htmlmode.hxx diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 8bdb07d68185..0bbde7a0b47b 100644..100755 --- a/sfx2/inc/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx @@ -37,7 +37,7 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, - BOOL bBig + bool bBig ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx index a729eb6cda84..a729eb6cda84 100644..100755 --- a/sfx2/inc/sfx2/imgdef.hxx +++ b/sfx2/inc/sfx2/imgdef.hxx diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index 506f29d3ad58..de3c9b55ecfc 100644..100755 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx @@ -49,18 +49,18 @@ public: SfxImageManager( SfxModule* pModule = 0 ); ~SfxImageManager(); - void RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF); + void RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF); void ReleaseToolBox( ToolBox *pBox ); // get images from resources void SetImages( ToolBox& rToolBox ); - void SetImages( ToolBox& rToolBox, BOOL bLarge ); - void SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge ); + void SetImages( ToolBox& rToolBox, bool bLarge ); + void SetImagesForceSize( ToolBox& rToolBox, bool bLarge ); - Image GetImage( USHORT nId, BOOL bLarge ) const; - Image GetImage( USHORT nId) const; - Image SeekImage( USHORT nId, BOOL bLarge ) const; - Image SeekImage( USHORT nId ) const; + Image GetImage( sal_uInt16 nId, bool bLarge ) const; + Image GetImage( sal_uInt16 nId) const; + Image SeekImage( sal_uInt16 nId, bool bLarge ) const; + Image SeekImage( sal_uInt16 nId ) const; }; #endif diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx index aec56328de65..bdcddc500ddb 100644..100755 --- a/sfx2/inc/sfx2/ipclient.hxx +++ b/sfx2/inc/sfx2/ipclient.hxx @@ -82,7 +82,7 @@ public: sal_Bool IsObjectInPlaceActive() const; sal_Bool IsObjectActive() const; void DeactivateObject(); - BOOL SetObjArea( const Rectangle & ); + sal_Bool SetObjArea( const Rectangle & ); Rectangle GetObjArea() const; Rectangle GetScaledObjArea() const; void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); @@ -97,11 +97,12 @@ public: ErrCode DoVerb( long nVerb ); void VisAreaChanged(); void ResetObject(); - BOOL IsUIActive(); + sal_Bool IsUIActive(); // used in Writer // Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const; // Rectangle LogicObjAreaToPixel( const Rectangle & rRect ) const; + virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning) }; #endif diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx index a094297bfc01..1ca48d8d8635 100644..100755 --- a/sfx2/inc/sfx2/itemconnect.hxx +++ b/sfx2/inc/sfx2/itemconnect.hxx @@ -262,13 +262,13 @@ public: /** Receives pointer to a newly created control wrapper. @descr Takes ownership of the control wrapper. */ - explicit ItemControlConnection( USHORT nSlot, ControlWrpT* pNewCtrlWrp, + explicit ItemControlConnection( sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); /** Convenience constructor. Receives reference to a control directly. @descr May only be used, if ControlWrpT::ControlWrpT( ControlType& ) constructor exists. */ - explicit ItemControlConnection( USHORT nSlot, ControlType& rControl, + explicit ItemControlConnection( sal_uInt16 nSlot, ControlType& rControl, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); virtual ~ItemControlConnection(); @@ -300,7 +300,7 @@ class SFX2_DLLPUBLIC DummyItemConnection: public ItemConnectionBase, public DummyWindowWrapper { public: - explicit DummyItemConnection( USHORT nSlot, Window& rWindow, + explicit DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: @@ -309,7 +309,7 @@ protected: virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); private: - USHORT mnSlot; + sal_uInt16 mnSlot; }; // ---------------------------------------------------------------------------- @@ -334,7 +334,7 @@ class NumericConnection : public ItemControlConnection< ItemWrpT, public: typedef typename ItemControlConnectionType::ControlWrapperType NumericFieldWrapperType; - explicit NumericConnection( USHORT nSlot, NumericField& rField, + explicit NumericConnection( sal_uInt16 nSlot, NumericField& rField, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; @@ -365,7 +365,7 @@ class MetricConnection : public ItemControlConnection< ItemWrpT, public: typedef typename ItemControlConnectionType::ControlWrapperType MetricFieldWrapperType; - explicit MetricConnection( USHORT nSlot, MetricField& rField, + explicit MetricConnection( sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; @@ -397,7 +397,7 @@ public: typedef typename ItemControlConnectionType::ControlWrapperType ListBoxWrapperType; typedef typename ListBoxWrapperType::MapEntryType MapEntryType; - explicit ListBoxConnection( USHORT nSlot, ListBox& rListBox, + explicit ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; @@ -429,7 +429,7 @@ public: typedef typename ItemControlConnectionType::ControlWrapperType ValueSetWrapperType; typedef typename ValueSetWrapperType::MapEntryType MapEntryType; - explicit ValueSetConnection( USHORT nSlot, ValueSet& rValueSet, + explicit ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); }; @@ -484,7 +484,7 @@ private: template< typename ItemWrpT, typename ControlWrpT > ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection( - USHORT nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), maItemWrp( nSlot ), mxCtrlWrp( pNewCtrlWrp ) @@ -493,7 +493,7 @@ ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection( template< typename ItemWrpT, typename ControlWrpT > ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection( - USHORT nSlot, ControlType& rControl, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, ControlType& rControl, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), maItemWrp( nSlot ), mxCtrlWrp( new ControlWrpT( rControl ) ) @@ -536,7 +536,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet( // do not rely on existence of ItemValueType::operator!= if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) ) { - USHORT nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() ); + sal_uInt16 nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() ); std::auto_ptr< ItemType > xItem( static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) ); xItem->SetWhich( nWhich ); @@ -556,7 +556,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet( template< typename ItemWrpT > NumericConnection< ItemWrpT >::NumericConnection( - USHORT nSlot, NumericField& rField, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, NumericField& rField, ItemConnFlags nFlags ) : ItemControlConnectionType( nSlot, rField, nFlags ) { } @@ -565,7 +565,7 @@ NumericConnection< ItemWrpT >::NumericConnection( template< typename ItemWrpT > MetricConnection< ItemWrpT >::MetricConnection( - USHORT nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) : ItemControlConnectionType( nSlot, new MetricFieldWrapperType( rField, eItemUnit ), nFlags ) { } @@ -574,7 +574,7 @@ MetricConnection< ItemWrpT >::MetricConnection( template< typename ItemWrpT > ListBoxConnection< ItemWrpT >::ListBoxConnection( - USHORT nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) : ItemControlConnectionType( nSlot, new ListBoxWrapperType( rListBox, pMap ), nFlags ) { } @@ -583,7 +583,7 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection( template< typename ItemWrpT > ValueSetConnection< ItemWrpT >::ValueSetConnection( - USHORT nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) : + sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) : ItemControlConnectionType( nSlot, new ValueSetWrapperType( rValueSet, pMap ), nFlags ) { } diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx index ba1f208f78d5..55d7c9b2a4d3 100644..100755 --- a/sfx2/inc/sfx2/itemwrapper.hxx +++ b/sfx2/inc/sfx2/itemwrapper.hxx @@ -48,20 +48,20 @@ class SFX2_DLLPUBLIC ItemWrapperHelper { public: /** Returns the WID of the passed SID in the item set. */ - static USHORT GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot ); + static sal_uInt16 GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns true, if the passed item set supports the SID. */ - static bool IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static bool IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns an item from an item set, if it is not in "don't know" state. @return Pointer to item, or 0 if it has "don't know" state. */ - static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns the default item from the pool of the passed item set. */ - static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Removes an item from rDestSet, if it is default in rOldSet. */ - static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot ); + static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ); }; // ============================================================================ @@ -103,10 +103,10 @@ public: typedef ValueT ItemValueType; typedef SingleItemWrapper< ItemT, ValueT > SingleItemWrapperType; - inline explicit SingleItemWrapper( USHORT nSlot ) : mnSlot( nSlot ) {} + inline explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} /** Returns the SID this wrapper works on. */ - inline USHORT GetSlotId() const { return mnSlot; } + inline sal_uInt16 GetSlotId() const { return mnSlot; } /** Returns the item from an item set, if it is not in "don't know" state. @descr Similar to ItemWrapperHelper::GetUniqueItem(), but works always @@ -124,7 +124,7 @@ public: virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const = 0; private: - USHORT mnSlot; /// The SID of this item wrapper. + sal_uInt16 mnSlot; /// The SID of this item wrapper. }; // ============================================================================ @@ -143,7 +143,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT > class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT > { public: - inline explicit ValueItemWrapper( USHORT nSlot ) : + inline explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} virtual ValueT GetItemValue( const ItemT& rItem ) const @@ -154,11 +154,11 @@ public: // ---------------------------------------------------------------------------- -typedef ValueItemWrapper< SfxBoolItem, BOOL > BoolItemWrapper; -typedef ValueItemWrapper< SfxInt16Item, INT16 > Int16ItemWrapper; -typedef ValueItemWrapper< SfxUInt16Item, UINT16 > UInt16ItemWrapper; -typedef ValueItemWrapper< SfxInt32Item, INT32 > Int32ItemWrapper; -typedef ValueItemWrapper< SfxUInt32Item, UINT32 > UInt32ItemWrapper; +typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; +typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper; +typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; +typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; +typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper; typedef ValueItemWrapper< SfxStringItem, const String& > StringItemWrapper; // ============================================================================ @@ -168,7 +168,7 @@ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > { public: - inline explicit IdentItemWrapper( USHORT nSlot ) : + inline explicit IdentItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {} virtual const ItemT& GetItemValue( const ItemT& rItem ) const diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx index e7eddef08f39..e7eddef08f39 100644..100755 --- a/sfx2/inc/sfx2/layout-post.hxx +++ b/sfx2/inc/sfx2/layout-post.hxx diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx index db467fd06da7..db467fd06da7 100644..100755 --- a/sfx2/inc/sfx2/layout-pre.hxx +++ b/sfx2/inc/sfx2/layout-pre.hxx diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx index 2629b2c7c106..2629b2c7c106 100644..100755 --- a/sfx2/inc/sfx2/layout-tabdlg.hxx +++ b/sfx2/inc/sfx2/layout-tabdlg.hxx diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx index 95bd42d39c88..95bd42d39c88 100644..100755 --- a/sfx2/inc/sfx2/layout.hxx +++ b/sfx2/inc/sfx2/layout.hxx diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 19945092f683..dbd792413784 100644..100755 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -73,7 +73,7 @@ class SFX2_DLLPUBLIC LinkManager SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden protected: - BOOL InsertLink( SvBaseLink* pLink, USHORT nObjType, USHORT nUpdateType, + sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, const String* pName = 0 ); public: @@ -101,27 +101,27 @@ public: void SetPersist( SfxObjectShell * p ) { pPersist = p; } void Remove( SvBaseLink *pLink ); - void Remove( USHORT nPos, USHORT nCnt = 1 ); - BOOL Insert( SvBaseLink* pLink ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ); + sal_Bool Insert( SvBaseLink* pLink ); // den Link mit einem SvLinkSource verbinden und in die Liste eintragen - BOOL InsertDDELink( SvBaseLink*, + sal_Bool InsertDDELink( SvBaseLink*, const String& rServer, const String& rTopic, const String& rItem ); // falls am Link schon alles eingestellt ist ! - BOOL InsertDDELink( SvBaseLink* ); + sal_Bool InsertDDELink( SvBaseLink* ); // den Link mit einem PseudoObject verbinden und in die Liste eintragen - BOOL InsertFileLink( sfx2::SvBaseLink&, - USHORT nFileType, + sal_Bool InsertFileLink( sfx2::SvBaseLink&, + sal_uInt16 nFileType, const String& rTxt, const String* pFilterNm = 0, const String* pRange = 0 ); // falls am Link schon alles eingestellt ist ! - BOOL InsertFileLink( sfx2::SvBaseLink& ); + sal_Bool InsertFileLink( sfx2::SvBaseLink& ); void ReconnectDdeLink(SfxObjectShell& rServer); @@ -135,7 +135,7 @@ public: void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; // erfrage die Strings fuer den Dialog - BOOL GetDisplayNames( const SvBaseLink *, + sal_Bool GetDisplayNames( const SvBaseLink *, String* pType, String* pFile = 0, String* pLink = 0, @@ -143,9 +143,9 @@ public: SvLinkSourceRef CreateObj( SvBaseLink* ); - void UpdateAllLinks( BOOL bAskUpdate = TRUE, - BOOL bCallErrHdl = TRUE, - BOOL bUpdateGrfLinks = FALSE, + void UpdateAllLinks( sal_Bool bAskUpdate = sal_True, + sal_Bool bCallErrHdl = sal_True, + sal_Bool bUpdateGrfLinks = sal_False, Window* pParentWin = 0 ); // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog) @@ -156,9 +156,9 @@ public: // Liste der zu serviereden Links erfragen const SvLinkSources& GetServers() const { return aServerTbl; } // einen zu servierenden Link eintragen/loeschen - BOOL InsertServer( SvLinkSource* rObj ); + sal_Bool InsertServer( SvLinkSource* rObj ); void RemoveServer( SvLinkSource* rObj ); - void RemoveServer( USHORT nPos, USHORT nCnt = 1 ) + void RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ) { aServerTbl.Remove( nPos, nCnt ); } // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln @@ -170,11 +170,11 @@ public: // dann die entsprechenden Informationen als String. // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt // - das braucht Informationen ueber Load/Abort/Error - static ULONG RegisterStatusInfoId(); + static sal_uIntPtr RegisterStatusInfoId(); // if the mimetype says graphic/bitmap/gdimetafile then get the // graphic from the Any. Return says no errors - static BOOL GetGraphicFromAny( const String& rMimeType, + static sal_Bool GetGraphicFromAny( const String& rMimeType, const ::com::sun::star::uno::Any & rValue, Graphic& rGrf ); diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index 4a0e38751782..11a9a2281f08 100644..100755 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -72,12 +72,12 @@ public: SvLinkSource(); virtual ~SvLinkSource(); - BOOL HasDataLinks( const SvBaseLink* = 0 ) const; + sal_Bool HasDataLinks( const SvBaseLink* = 0 ) const; void Closed(); - ULONG GetUpdateTimeout() const; - void SetUpdateTimeout( ULONG nTime ); + sal_uIntPtr GetUpdateTimeout() const; + void SetUpdateTimeout( sal_uIntPtr nTime ); // notify the sink, the mime type is not // a selection criterion void DataChanged( const String & rMimeType, @@ -85,22 +85,22 @@ public: void SendDataChanged(); void NotifyDataChanged(); - virtual BOOL Connect( SvBaseLink* ); - virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual sal_Bool Connect( SvBaseLink* ); + virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const String & rMimeType, - BOOL bSynchron = FALSE ); + sal_Bool bSynchron = sal_False ); - // TRUE => waitinmg for data - virtual BOOL IsPending() const; - // TRUE => data complete loaded - virtual BOOL IsDataComplete() const; + // sal_True => waitinmg for data + virtual sal_Bool IsPending() const; + // sal_True => data complete loaded + virtual sal_Bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const String & rMimeType, - USHORT nAdviceMode ); + sal_uInt16 nAdviceMode ); void RemoveAllDataAdvise( SvBaseLink * ); void AddConnectAdvise( SvBaseLink * ); diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx index ddd3ce79de10..2c0e4c625c11 100644..100755 --- a/sfx2/inc/sfx2/lnkbase.hxx +++ b/sfx2/inc/sfx2/lnkbase.hxx @@ -81,18 +81,18 @@ private: SvLinkSourceRef xObj; String aLinkName; BaseLink_Impl* pImpl; - USHORT nObjType; - BOOL bVisible : 1; - BOOL bSynchron : 1; - BOOL bUseCache : 1; // fuer GrafikLinks! - BOOL bWasLastEditOK : 1; + sal_uInt16 nObjType; + sal_Bool bVisible : 1; + sal_Bool bSynchron : 1; + sal_Bool bUseCache : 1; // fuer GrafikLinks! + sal_Bool bWasLastEditOK : 1; DECL_LINK( EndEditHdl, String* ); bool ExecuteEdit( const String& _rNewName ); protected: - void SetObjType( USHORT ); + void SetObjType( sal_uInt16 ); // setzen des LinkSourceName ohne aktion void SetName( const String & rLn ); @@ -106,10 +106,10 @@ protected: m_xInputStreamToLoadFrom; SvBaseLink(); - SvBaseLink( USHORT nLinkType, ULONG nContentType = FORMAT_STRING ); + SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING ); virtual ~SvBaseLink(); - void _GetRealObject( BOOL bConnect = TRUE ); + void _GetRealObject( sal_Bool bConnect = sal_True ); SvLinkSource* GetRealObject() { @@ -122,10 +122,10 @@ public: TYPEINFO(); // ask JP virtual void Closed(); - SvBaseLink( const String& rNm, USHORT nObjectType, + SvBaseLink( const String& rNm, sal_uInt16 nObjectType, SvLinkSource* ); - USHORT GetObjType() const { return nObjType; } + sal_uInt16 GetObjType() const { return nObjType; } void SetObj( SvLinkSource * pObj ); SvLinkSource* GetObj() const { return xObj; } @@ -136,30 +136,30 @@ public: virtual void DataChanged( const String & rMimeType, const ::com::sun::star::uno::Any & rValue ); - void SetUpdateMode( USHORT ); - USHORT GetUpdateMode() const; - ULONG GetContentType() const; - BOOL SetContentType( ULONG nType ); + void SetUpdateMode( sal_uInt16 ); + sal_uInt16 GetUpdateMode() const; + sal_uIntPtr GetContentType() const; + sal_Bool SetContentType( sal_uIntPtr nType ); LinkManager* GetLinkManager(); const LinkManager* GetLinkManager() const; void SetLinkManager( LinkManager* _pMgr ); - BOOL Update(); + sal_Bool Update(); void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this virtual void Edit( Window*, const Link& rEndEditHdl ); // soll der Link im Dialog angezeigt werden ? (Links im Link im ...) - BOOL IsVisible() const { return bVisible; } - void SetVisible( BOOL bFlag ) { bVisible = bFlag; } + sal_Bool IsVisible() const { return bVisible; } + void SetVisible( sal_Bool bFlag ) { bVisible = bFlag; } // soll der Link synchron oder asynchron geladen werden? - BOOL IsSynchron() const { return bSynchron; } - void SetSynchron( BOOL bFlag ) { bSynchron = bFlag; } + sal_Bool IsSynchron() const { return bSynchron; } + void SetSynchron( sal_Bool bFlag ) { bSynchron = bFlag; } - BOOL IsUseCache() const { return bUseCache; } - void SetUseCache( BOOL bFlag ) { bUseCache = bFlag; } + sal_Bool IsUseCache() const { return bUseCache; } + void SetUseCache( sal_Bool bFlag ) { bUseCache = bFlag; } void setStreamToLoadFrom( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, @@ -169,7 +169,7 @@ public: // #i88291# void clearStreamToLoadFrom(); - inline BOOL WasLastEditOK() const { return bWasLastEditOK; } + inline sal_Bool WasLastEditOK() const { return bWasLastEditOK; } FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const; }; diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index 60692b4c49a6..60692b4c49a6 100644..100755 --- a/sfx2/inc/sfx2/macrconf.hxx +++ b/sfx2/inc/sfx2/macrconf.hxx diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx new file mode 100755 index 000000000000..fda2e3feaf96 --- /dev/null +++ b/sfx2/inc/sfx2/macropg.hxx @@ -0,0 +1,150 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _MACROPG_HXX +#define _MACROPG_HXX + +#include "sal/config.h" +#include "sfx2/dllapi.h" + +#include <sfx2/basedlgs.hxx> +#include <sfx2/tabdlg.hxx> +#include <svl/macitem.hxx> +#include <vcl/lstbox.hxx> +#include <com/sun/star/frame/XFrame.hpp> + +class _SfxMacroTabPage; +class SvStringsDtor; +class SvTabListBox; +class Edit; +class String; +class SfxObjectShell; + +typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage ); +typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange ); + +class SfxConfigGroupListBox_Impl; +class SfxConfigFunctionListBox_Impl; + +class _HeaderTabListBox; +class _SfxMacroTabPage_Impl; + +class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage +{ + SvxMacroTableDtor aTbl; +//#if 0 // _SOLAR__PRIVATE + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * ); + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * ); + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * ); + + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* ); + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); + + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * ); + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* ); + DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); +//#endif +protected: + _SfxMacroTabPage_Impl* mpImpl; + + _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); + + void InitAndSetHandler(); + void FillEvents(); + void FillMacroList(); + void EnableButtons( const String& rLanguage ); + +public: + + virtual ~_SfxMacroTabPage(); + + void AddEvent( const String & rEventName, sal_uInt16 nEventId ); + + const SvxMacroTableDtor& GetMacroTbl() const; + void SetMacroTbl( const SvxMacroTableDtor& rTbl ); + void ClearMacroTbl(); + + virtual void ScriptChanged( const String& rLanguage ); + + // zum setzen / abfragen der Links + void SetGetRangeLink( FNGetRangeHdl pFn ); + FNGetRangeHdl GetGetRangeLink() const; + void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); + FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; + + // --------- Erben aus der Basis ------------- + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + + void SetReadOnly( sal_Bool bSet ); + sal_Bool IsReadOnly() const; + void SelectEvent( const String& rEventName, sal_uInt16 nEventId ); +}; + +inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const +{ + return aTbl; +} + +inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl ) +{ + aTbl = rTbl; +} + +inline void _SfxMacroTabPage::ClearMacroTbl() +{ + aTbl.DelDtor(); +} + +class SFX2_DLLPUBLIC SfxMacroTabPage : public _SfxMacroTabPage +{ +public: + SfxMacroTabPage( + Window* pParent, + const ResId& rId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, + const SfxItemSet& rSet + ); + + // --------- Erben aus der Basis ------------- + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); +}; + +class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxSingleTabDialog +{ +public: + SfxMacroAssignDlg( + Window* pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, + SfxItemSet& rSet ); + SfxMacroAssignDlg( + Window* pParent, + const SfxObjectShell* _pShell, + SfxItemSet& rSet ); + virtual ~SfxMacroAssignDlg(); +}; + +#endif diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx index 6abe5f987597..3411a7647451 100644..100755 --- a/sfx2/inc/mailmodelapi.hxx +++ b/sfx2/inc/sfx2/mailmodelapi.hxx @@ -139,7 +139,7 @@ public: sal_Bool IsEmpty() const; }; -BOOL CreateFromAddress_Impl( String& rFrom ); +sal_Bool CreateFromAddress_Impl( String& rFrom ); #endif // INCLUDED_SFX_MAILMODEL_HXX diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx index d1f58b7337d4..ee0f313d0470 100644..100755 --- a/sfx2/inc/sfx2/mgetempl.hxx +++ b/sfx2/inc/sfx2/mgetempl.hxx @@ -36,6 +36,9 @@ #include <sfx2/tabdlg.hxx> +#include <svtools/svmedit2.hxx> +#include <svtools/svmedit.hxx> + /* erwartet: SID_TEMPLATE_NAME : In: StringItem, Name der Vorlage SID_TEMPLATE_FAMILY : In: Familie der Vorlage @@ -53,6 +56,8 @@ class SfxManageStyleSheetPage : public SfxTabPage { FixedText aNameFt; Edit aNameEd; + ExtMultiLineEdit aNameMLE; + CheckBox aAutoCB; FixedText aFollowFt; @@ -64,21 +69,21 @@ class SfxManageStyleSheetPage : public SfxTabPage FixedText aFilterFt; ListBox aFilterLb; + FixedLine aDescGb; FixedInfo aDescFt; MultiLineEdit aDescED; - FixedLine aDescGb; SfxStyleSheetBase *pStyle; SfxStyleFamilies *pFamilies; const SfxStyleFamilyItem *pItem; String aBuf; - BOOL bModified; + sal_Bool bModified; // initiale Daten des Styles String aName; String aFollow; String aParent; - USHORT nFlags; + sal_uInt16 nFlags; private: friend class SfxStyleDialog; @@ -95,7 +100,7 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual BOOL FillItemSet(SfxItemSet &); + virtual sal_Bool FillItemSet(SfxItemSet &); virtual void Reset(const SfxItemSet &); using TabPage::ActivatePage; diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx index 6ab7c0a0006a..72f2e4e0487b 100644..100755 --- a/sfx2/inc/mieclip.hxx +++ b/sfx2/inc/sfx2/mieclip.hxx @@ -49,8 +49,8 @@ public: ~MSE40HTMLClipFormatObj(); //JP 31.01.2001: old interfaces - SAL_DLLPRIVATE BOOL GetData( SotDataObject& ); - SAL_DLLPRIVATE BOOL GetData( SvData& ); + SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& ); + SAL_DLLPRIVATE sal_Bool GetData( SvData& ); //JP 31.01.2001: the new one SvStream* IsValid( SvStream& ); diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx index e3913854804c..22b2695ab16a 100644..100755 --- a/sfx2/inc/sfx2/minarray.hxx +++ b/sfx2/inc/sfx2/minarray.hxx @@ -47,42 +47,42 @@ class ARR\ {\ private:\ T* pData;\ - USHORT nUsed;\ - BYTE nGrow;\ - BYTE nUnused;\ + sal_uInt16 nUsed;\ + sal_uInt8 nGrow;\ + sal_uInt8 nUnused;\ public:\ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG );\ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG );\ ARR( const ARR& rOrig );\ ~ARR();\ \ ARR& operator= ( const ARR& rOrig );\ \ - const T& GetObject( USHORT nPos ) const; \ - T& GetObject( USHORT nPos ); \ + const T& GetObject( sal_uInt16 nPos ) const; \ + T& GetObject( sal_uInt16 nPos ); \ \ - void Insert( USHORT nPos, ARR& rIns, USHORT nStart = 0, USHORT nEnd = USHRT_MAX );\ - void Insert( USHORT nPos, const T& rElem );\ - void Insert( USHORT nPos, const T& rElems, USHORT nLen );\ + void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\ + void Insert( sal_uInt16 nPos, const T& rElem );\ + void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\ void Append( const T& rElem );\ \ - BOOL Remove( const T& rElem );\ - USHORT Remove( USHORT nPos, USHORT nLen );\ + sal_Bool Remove( const T& rElem );\ + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );\ \ - USHORT Count() const { return nUsed; }\ + sal_uInt16 Count() const { return nUsed; }\ T* operator*();\ - const T& operator[]( USHORT nPos ) const;\ - T& operator[]( USHORT nPos );\ + const T& operator[]( sal_uInt16 nPos ) const;\ + T& operator[]( sal_uInt16 nPos );\ \ - BOOL Contains( const T& rItem ) const;\ + sal_Bool Contains( const T& rItem ) const;\ void Clear() { Remove( 0, Count() ); }\ };\ \ -inline void ARR::Insert( USHORT nPos, ARR& rIns, USHORT nStart, USHORT nEnd )\ +inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\ {\ Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\ }\ \ -inline void ARR::Insert( USHORT nPos, const T& rElem )\ +inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\ {\ Insert( nPos, rElem, 1 );\ }\ @@ -91,24 +91,24 @@ inline T* ARR::operator*()\ {\ return ( nUsed==0 ? 0 : pData );\ } \ -inline const T& ARR::operator[]( USHORT nPos ) const\ +inline const T& ARR::operator[]( sal_uInt16 nPos ) const\ {\ DBG_ASSERT( nPos < nUsed, "" ); \ return *(pData+nPos);\ } \ -inline T& ARR::operator [] (USHORT nPos) \ +inline T& ARR::operator [] (sal_uInt16 nPos) \ {\ DBG_ASSERT( nPos < nUsed, "" ); \ return *(pData+nPos); \ } \ -inline const T& ARR::GetObject( USHORT nPos ) const { return operator[](nPos); } \ -inline T& ARR::GetObject( USHORT nPos ) { return operator[](nPos); } \ +inline const T& ARR::GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ +inline T& ARR::GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ #ifndef _lint // String too long #define IMPL_OBJARRAY( ARR, T ) \ -ARR::ARR( BYTE nInitSize, BYTE nGrowSize ): \ +ARR::ARR( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ): \ nUsed(0), \ nGrow( nGrowSize ? nGrowSize : 1 ), \ nUnused(nInitSize) \ @@ -134,7 +134,7 @@ ARR::ARR( const ARR& rOrig ) \ size_t nBytes = (nUsed + nUnused) * sizeof(T); \ pData = (T*) new char [ nBytes ]; \ memset( pData, 0, nBytes ); \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ *(pData+n) = *(rOrig.pData+n); \ } \ else \ @@ -143,14 +143,14 @@ ARR::ARR( const ARR& rOrig ) \ \ ARR::~ARR() \ { \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ ( pData+n )->T::~T(); \ delete[] (char*) pData;\ } \ \ ARR& ARR::operator= ( const ARR& rOrig )\ { \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ ( pData+n )->T::~T(); \ delete[] (char*) pData;\ \ @@ -163,7 +163,7 @@ ARR& ARR::operator= ( const ARR& rOrig )\ size_t nBytes = (nUsed + nUnused) * sizeof(T); \ pData = (T*) new char[ nBytes ]; \ memset( pData, 0, nBytes ); \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ *(pData+n) = *(rOrig.pData+n); \ } \ else \ @@ -176,7 +176,7 @@ void ARR::Append( const T& aElem ) \ \ if ( nUnused == 0 ) \ { \ - USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \ + sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \ size_t nBytes = nNewSize * sizeof(T); \ T* pNewData = (T*) new char[ nBytes ]; \ memset( pNewData, 0, nBytes ); \ @@ -185,7 +185,7 @@ void ARR::Append( const T& aElem ) \ memcpy( pNewData, pData, nUsed * sizeof(T) ); \ delete[] (char*) pData;\ } \ - nUnused = (BYTE)(nNewSize-nUsed); \ + nUnused = (sal_uInt8)(nNewSize-nUsed); \ pData = pNewData; \ } \ \ @@ -195,17 +195,17 @@ void ARR::Append( const T& aElem ) \ --nUnused; \ } \ \ -USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ +sal_uInt16 ARR::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) \ { \ DBG_ASSERT( (nPos+nLen) < (nUsed+1), "" ); \ DBG_ASSERT( nLen > 0, "" ); \ \ - nLen = Min( (USHORT)(nUsed-nPos), (USHORT)nLen ); \ + nLen = Min( (sal_uInt16)(nUsed-nPos), (sal_uInt16)nLen ); \ \ if ( nLen == 0 ) \ return 0; \ \ - for ( USHORT n = nPos; n < (nPos+nLen); ++n ) \ + for ( sal_uInt16 n = nPos; n < (nPos+nLen); ++n ) \ ( pData+n )->T::~T(); \ \ if ( (nUsed-nLen) == 0 ) \ @@ -219,8 +219,8 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ \ if ( (nUnused+nLen) >= nGrow ) \ { \ - USHORT nNewUsed = nUsed-nLen; \ - USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \ + sal_uInt16 nNewUsed = nUsed-nLen; \ + sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \ DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize, \ "shrink size computation failed" ); \ size_t nBytes = nNewSize * sizeof(T); \ @@ -233,7 +233,7 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ delete[] (char*) pData;\ pData = pNewData; \ nUsed = nNewUsed; \ - nUnused = (BYTE)(nNewSize - nNewUsed); \ + nUnused = (sal_uInt8)(nNewSize - nNewUsed); \ return nLen; \ } \ \ @@ -243,39 +243,39 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ memmove(pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen) * sizeof(T));\ } \ nUsed = nUsed - nLen; \ - nUnused = sal::static_int_cast< BYTE >(nUnused + nLen); \ + nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen); \ return nLen; \ } \ \ -BOOL ARR::Remove( const T& aElem ) \ +sal_Bool ARR::Remove( const T& aElem ) \ { \ if ( nUsed == 0 ) \ - return FALSE; \ + return sal_False; \ \ const T *pIter = pData + nUsed - 1; \ - for ( USHORT n = 0; n < nUsed; ++n, --pIter ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter ) \ if ( *pIter == aElem ) \ { \ Remove(nUsed-n-1, 1); \ - return TRUE; \ + return sal_True; \ } \ - return FALSE; \ + return sal_False; \ } \ \ -BOOL ARR::Contains( const T& rItem ) const \ +sal_Bool ARR::Contains( const T& rItem ) const \ { \ if ( !nUsed ) \ - return FALSE; \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + return sal_False; \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ { \ const T& r2ndItem = GetObject(n); \ if ( r2ndItem == rItem ) \ - return TRUE; \ + return sal_True; \ } \ - return FALSE; \ + return sal_False; \ } \ \ -void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ +void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \ { \ DBG_ASSERT( nPos <= nUsed, "" ); \ \ @@ -283,7 +283,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ { \ \ /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \ - USHORT nNewSize; \ + sal_uInt16 nNewSize; \ for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \ /* empty loop */; \ size_t nBytes = nNewSize * sizeof(T); \ @@ -296,7 +296,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ memcpy( pNewData, pData, nUsed * sizeof(T) ); \ delete (char*) pData;\ } \ - nUnused = (BYTE)(nNewSize-nUsed); \ + nUnused = (sal_uInt8)(nNewSize-nUsed); \ pData = pNewData; \ } \ \ @@ -308,7 +308,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ \ memmove(pData+nPos, &rElems, sizeof(T) * nLen); \ nUsed = nUsed + nLen; \ - nUnused = sal::static_int_cast< BYTE >(nUnused - nLen); \ + nUnused = sal::static_int_cast< sal_uInt8 >(nUnused - nLen); \ } // _lint @@ -318,26 +318,26 @@ class SFX2_DLLPUBLIC SfxPtrArr { private: void** pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - SfxPtrArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + SfxPtrArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); SfxPtrArr( const SfxPtrArr& rOrig ); ~SfxPtrArr(); SfxPtrArr& operator= ( const SfxPtrArr& rOrig ); - void* GetObject( USHORT nPos ) const { return operator[](nPos); } - void*& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, void* rElem ); + void* GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, void* rElem ); void Append( void* rElem ); - BOOL Replace( void* pOldElem, void* pNewElem ); - BOOL Remove( void* rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Replace( void* pOldElem, void* pNewElem ); + sal_Bool Remove( void* rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } inline void** operator*(); - inline void* operator[]( USHORT nPos ) const; - inline void*& operator[]( USHORT nPos ); - BOOL Contains( const void* rItem ) const; + inline void* operator[]( sal_uInt16 nPos ) const; + inline void*& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const void* rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -346,13 +346,13 @@ inline void** SfxPtrArr::operator*() return ( nUsed==0 ? 0 : pData ); } -inline void* SfxPtrArr::operator[]( USHORT nPos ) const +inline void* SfxPtrArr::operator[]( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < nUsed, "" ); return *(pData+nPos); } -inline void*& SfxPtrArr::operator [] (USHORT nPos) +inline void*& SfxPtrArr::operator [] (sal_uInt16 nPos) { DBG_ASSERT( nPos < nUsed, "" ); return *(pData+nPos); @@ -363,35 +363,35 @@ inline void*& SfxPtrArr::operator [] (USHORT nPos) class ARR: public SfxPtrArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\ SfxPtrArr(nIni,nGrowValue) \ {}\ ARR( const ARR& rOrig ):\ SfxPtrArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ SfxPtrArr::Insert(nPos,(void *)aElement);\ }\ void Append( T aElement ) {\ SfxPtrArr::Append((void *)aElement);\ }\ - BOOL Replace( T aOldElem, T aNewElem ) {\ + sal_Bool Replace( T aOldElem, T aNewElem ) {\ return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\ }\ void Remove( T aElement ) {\ SfxPtrArr::Remove((void*)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ SfxPtrArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) SfxPtrArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) SfxPtrArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) SfxPtrArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; @@ -400,25 +400,25 @@ class ByteArr { private: char* pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - ByteArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + ByteArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); ByteArr( const ByteArr& rOrig ); ~ByteArr(); ByteArr& operator= ( const ByteArr& rOrig ); - char GetObject( USHORT nPos ) const { return operator[](nPos); } - char& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, char rElem ); + char GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + char& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, char rElem ); void Append( char rElem ); - BOOL Remove( char rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Remove( char rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } char* operator*(); - char operator[]( USHORT nPos ) const; - char& operator[]( USHORT nPos ); - BOOL Contains( const char rItem ) const; + char operator[]( sal_uInt16 nPos ) const; + char& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const char rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -431,15 +431,15 @@ inline char* ByteArr::operator*() class ARR: public ByteArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrow=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrow=nG ):\ ByteArr(nIni,nGrow) \ {}\ ARR( const ARR& rOrig ):\ ByteArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ ByteArr::Insert(nPos,(char)aElement);\ }\ void Append( T aElement ) {\ @@ -448,15 +448,15 @@ public:\ void Remove( T aElement ) {\ ByteArr::Remove((char)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ ByteArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) ByteArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) ByteArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) ByteArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; @@ -465,25 +465,25 @@ class WordArr { private: short* pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - WordArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + WordArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); WordArr( const WordArr& rOrig ); ~WordArr(); WordArr& operator= ( const WordArr& rOrig ); - short GetObject( USHORT nPos ) const { return operator[](nPos); } - short& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, short rElem ); + short GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + short& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, short rElem ); void Append( short rElem ); - BOOL Remove( short rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Remove( short rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } short* operator*(); - short operator[]( USHORT nPos ) const; - short& operator[]( USHORT nPos ); - BOOL Contains( const short rItem ) const; + short operator[]( sal_uInt16 nPos ) const; + short& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const short rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -496,15 +496,15 @@ inline short* WordArr::operator*() class ARR: public WordArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\ WordArr(nIni,nGrowValue) \ {}\ ARR( const ARR& rOrig ):\ WordArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ WordArr::Insert(nPos,(short)aElement);\ }\ void Append( T aElement ) {\ @@ -513,15 +513,15 @@ public:\ void Remove( T aElement ) {\ WordArr::Remove((short)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ WordArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) WordArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) WordArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) WordArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx index a3485f8b1934..3d2cd29aaa44 100644..100755 --- a/sfx2/inc/minfitem.hxx +++ b/sfx2/inc/sfx2/minfitem.hxx @@ -44,7 +44,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem public: TYPEINFO(); - SfxMacroInfoItem( USHORT nWhich, + SfxMacroInfoItem( sal_uInt16 nWhich, const BasicManager* pMgr, const String &rLibName, const String &rModuleName, diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx index 89a5586d4da9..4c98ec5ef0f2 100644..100755 --- a/sfx2/inc/sfx2/minstack.hxx +++ b/sfx2/inc/sfx2/minstack.hxx @@ -35,7 +35,7 @@ DECL_OBJARRAY( ARR##arr_, T, nI, nG ); \ class ARR: private ARR##arr_ \ { \ public: \ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \ ARR##arr_( nInitSize, nGrowSize ) \ {} \ \ @@ -43,14 +43,14 @@ public: \ ARR##arr_( rOrig ) \ {} \ \ - USHORT Count() const { return ARR##arr_::Count(); } \ + sal_uInt16 Count() const { return ARR##arr_::Count(); } \ void Push( const T& rElem ) { Append( rElem ); } \ - const T& Top( USHORT nLevel = 0 ) const \ + const T& Top( sal_uInt16 nLevel = 0 ) const \ { return (*this)[Count()-nLevel-1]; } \ const T& Bottom() const { return (*this)[0]; } \ T Pop(); \ void Clear() { ARR##arr_::Clear(); } \ - BOOL Contains( const T& rItem ) const \ + sal_Bool Contains( const T& rItem ) const \ { return ARR##arr_::Contains( rItem ); } \ } @@ -68,7 +68,7 @@ DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \ class ARR: private ARR##arr_ \ { \ public: \ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \ ARR##arr_( nInitSize, nGrowSize ) \ {} \ \ @@ -76,11 +76,11 @@ public: \ ARR##arr_( rOrig ) \ {} \ \ - USHORT Count() const { return ARR##arr_::Count(); } \ + sal_uInt16 Count() const { return ARR##arr_::Count(); } \ void Push( T rElem ) { Append( rElem ); } \ - BOOL Replace( T rOldElem, T rNewElem ) \ + sal_Bool Replace( T rOldElem, T rNewElem ) \ { return ARR##arr_::Replace( rOldElem, rNewElem ); } \ - T Top( USHORT nLevel = 0 ) const \ + T Top( sal_uInt16 nLevel = 0 ) const \ { return (*this)[Count()-nLevel-1]; } \ T Bottom() const { return (*this)[0]; } \ T Pop() \ @@ -91,7 +91,7 @@ public: \ T* operator*() \ { return &(*this)[Count()-1]; } \ void Clear() { ARR##arr_::Clear(); } \ - BOOL Contains( const T pItem ) const \ + sal_Bool Contains( const T pItem ) const \ { return ARR##arr_::Contains( pItem ); } \ } diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index 0763115d4749..a4b990c63b1f 100644..100755 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -47,23 +47,23 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem String aTitle; SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pSubMenu; - BOOL b_ShowStrings; - BOOL b_UnusedDummy; + sal_Bool b_ShowStrings; + sal_Bool b_UnusedDummy; public: SfxMenuControl(); - SfxMenuControl( BOOL bShowStrings ); - SfxMenuControl( USHORT, SfxBindings&); + SfxMenuControl( sal_Bool bShowStrings ); + SfxMenuControl( sal_uInt16, SfxBindings&); - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); - static void RegisterControl( USHORT nSlotId = 0, SfxModule *pMod=NULL ); + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); + static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); ~SfxMenuControl(); using SfxControllerItem::Bind; - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, const String& rTitle, SfxBindings& rBindings ); - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, SfxVirtualMenu& rSubMenu, const String& rTitle, SfxBindings& rBindings ); @@ -73,13 +73,13 @@ public: void SetOwnMenu( SfxVirtualMenu* pMenu ); void RemovePopup(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - static SfxMenuControl* CreateControl( USHORT nId, Menu &, SfxBindings & ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, SfxBindings&, SfxVirtualMenu* ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* ); - static BOOL IsSpecialControl( USHORT nId, SfxModule* ); + static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* ); + static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* ); static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); }; @@ -88,25 +88,25 @@ class SfxUnoMenuControl : public SfxMenuControl { SfxUnoControllerItem* pUnoCtrl; public: - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, SfxBindings&, SfxVirtualMenu* ); - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, const String&, SfxBindings&, SfxVirtualMenu* ); ~SfxUnoMenuControl(); void Select(); }; -typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & ); +typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & ); struct SfxMenuCtrlFactory { SfxMenuControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -124,13 +124,13 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const } #define SFX_DECL_MENU_CONTROL() \ - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \ - SfxMenuControl* Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \ + SfxMenuControl* Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \ { return new Class(nId, rMenu, rBindings); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } @@ -138,15 +138,15 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const class SfxAppMenuControl_Impl : public SfxMenuControl { PopupMenu* pMenu; - ULONG m_nSymbolsStyle; - BOOL m_bShowMenuImages; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bShowMenuImages; protected: DECL_LINK( Activate, Menu * ); public: SFX_DECL_MENU_CONTROL(); - SfxAppMenuControl_Impl( USHORT nPos, Menu& rMenu, SfxBindings& rBindings ); + SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); ~SfxAppMenuControl_Impl(); }; diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 1ca5aa9d824e..7fd7618ea3ea 100644..100755 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -31,7 +31,7 @@ #include <stdarg.h> #include <vcl/menu.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <tools/link.hxx> #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -59,11 +59,11 @@ friend class SfxPopupMenuManager; SfxVirtualMenu* pMenu; // das eigentliche Menu SfxVirtualMenu* pOldMenu; // only while reconfiguring - BOOL bMenuBar; // Popup oder MenuBar + sal_Bool bMenuBar; // Popup oder MenuBar SfxBindings* pBindings; ResMgr* pResMgr; sal_uInt32 nType; - BOOL bAddClipboardFuncs : 1; + sal_Bool bAddClipboardFuncs : 1; void Construct( SfxVirtualMenu& rMenu ); @@ -71,7 +71,7 @@ protected: SfxMenuManager( Menu*, SfxBindings& ); SfxMenuManager( const ResId&, SfxBindings& ); ~SfxMenuManager(); - USHORT GetItemPos( USHORT nId ); + sal_uInt16 GetItemPos( sal_uInt16 nId ); sal_uInt32 GetType() { return nType; } public: @@ -86,9 +86,9 @@ public: const SfxBindings& GetBindings() const { return *pBindings; } void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() const { return pResMgr; } - void SetPopupMenu( USHORT nId, PopupMenu *pMenu ); + void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); - void Construct_Impl( Menu* pMenu, BOOL bWithHelp ); + void Construct_Impl( Menu* pMenu, sal_Bool bWithHelp ); }; //-------------------------------------------------------------------- @@ -118,20 +118,20 @@ public: // Changing code which relies on Popup would need much more effort. static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); - USHORT Execute( const Point& rPos, Window *pWindow ); - USHORT Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); - USHORT Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... ); + sal_uInt16 Execute( const Point& rPos, Window *pWindow ); + sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); + sal_uInt16 Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... ); // @deprecated (start)!! // Don't use these methods any longer. The whole class will be removed in the future. // Changing code which relies on these methods would need much more effort! void StartInsert(); void EndInsert(); - void CheckItem( USHORT, BOOL ); - void RemoveItem( USHORT ); - void InsertItem( USHORT, const String&, MenuItemBits, - USHORT nPos = MENU_APPEND ); - void InsertSeparator( USHORT nPos = MENU_APPEND ); + void CheckItem( sal_uInt16, sal_Bool ); + void RemoveItem( sal_uInt16 ); + void InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId, + sal_uInt16 nPos = MENU_APPEND ); + void InsertSeparator( sal_uInt16 nPos = MENU_APPEND ); // @deprecated (end) void RemoveDisabledEntries(); diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx index 0ae9c471e493..d737b6cf295d 100644..100755 --- a/sfx2/inc/sfx2/module.hxx +++ b/sfx2/inc/sfx2/module.hxx @@ -34,7 +34,7 @@ #include <sfx2/shell.hxx> #include <sfx2/imgdef.hxx> #include <sal/types.h> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> class ImageList; @@ -89,10 +89,10 @@ public: virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); - virtual void Invalidate(USHORT nId = 0); - BOOL IsActive() const; + virtual void Invalidate(sal_uInt16 nId = 0); + sal_Bool IsActive() const; - /*virtual*/ bool IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const; + /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; static SfxModule* GetActiveModule( SfxViewFrame* pFrame=NULL ); static FieldUnit GetCurrentFieldUnit(); @@ -104,7 +104,7 @@ public: SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const; - SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig ); + SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig ); }; #endif diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 434a9612b005..f13fcabcecfe 100644..100755 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -30,6 +30,9 @@ #include <tools/rtti.hxx> #include <sfx2/shell.hxx> +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> +#include <sfx2/dllapi.h> //-------------------------------------------------------------------- @@ -109,14 +112,14 @@ enum SfxSlotKind struct SfxTypeAttrib { - USHORT nAID; + sal_uInt16 nAID; const char* pName; }; struct SfxType { TypeId aTypeId; - USHORT nAttribs; + sal_uInt16 nAttribs; SfxTypeAttrib aAttrib[16]; const TypeId& Type() const @@ -128,7 +131,7 @@ struct SfxType struct SfxType0 { TypeId aTypeId; - USHORT nAttribs; + sal_uInt16 nAttribs; const TypeId& Type() const { return aTypeId; } @@ -139,7 +142,7 @@ struct SfxType0 #define SFX_DECL_TYPE(n) struct SfxType##n \ { \ TypeId aTypeId; \ - USHORT nAttribs; \ + sal_uInt16 nAttribs; \ SfxTypeAttrib aAttrib[n]; \ } @@ -238,7 +241,7 @@ struct SfxFormalArgument { const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse) const char* pName; // Name des Parameters - USHORT nSlotId;// Slot-Id zur Identifikation des Parameters + sal_uInt16 nSlotId;// Slot-Id zur Identifikation des Parameters const TypeId& Type() const { return pType->aTypeId; } @@ -251,13 +254,13 @@ struct SfxFormalArgument class SfxSlot { public: - USHORT nSlotId; // in Shell eindeutige Slot-Id - USHORT nGroupId; // f"ur Konfigurations-Bereich - ULONG nHelpId; // i.d.R. == nSlotId - ULONG nFlags; // artihm. veroderte Flags + sal_uInt16 nSlotId; // in Shell eindeutige Slot-Id + sal_uInt16 nGroupId; // f"ur Konfigurations-Bereich + sal_uIntPtr nHelpId; // i.d.R. == nSlotId + sal_uIntPtr nFlags; // artihm. veroderte Flags - USHORT nMasterSlotId; // Enum-Slot bzw. Which-Id - USHORT nValue; // Wert, falls Enum-Slot + sal_uInt16 nMasterSlotId; // Enum-Slot bzw. Which-Id + sal_uInt16 nValue; // Wert, falls Enum-Slot SfxExecFunc fnExec; // Funktion zum Ausf"uhren SfxStateFunc fnState; // Funktion f"ur Status @@ -270,7 +273,7 @@ public: const SfxSlot* pNextSlot; // mit derselben Status-Methode const SfxFormalArgument* pFirstArgDef; // erste formale Argument-Definition - USHORT nArgDefCount; // Anzahl der formalen Argumente + sal_uInt16 nArgDefCount; // Anzahl der formalen Argumente long nDisableFlags; // DisableFlags, die vorhanden sein // m"ussen, damit der Slot enabled ist const char* pUnoName; // UnoName des Slots @@ -278,19 +281,21 @@ public: public: SfxSlotKind GetKind() const; - USHORT GetSlotId() const; - ULONG GetHelpId() const; - ULONG GetMode() const; - BOOL IsMode( ULONG nMode ) const; - USHORT GetGroupId() const; - USHORT GetMasterSlotId() const { return nMasterSlotId; } - USHORT GetWhich( const SfxItemPool &rPool ) const; - USHORT GetValue() const { return nValue; } + sal_uInt16 GetSlotId() const; + sal_uIntPtr GetHelpId() const; + sal_uIntPtr GetMode() const; + sal_Bool IsMode( sal_uIntPtr nMode ) const; + sal_uInt16 GetGroupId() const; + sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; } + sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; + sal_uInt16 GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } + SFX2_DLLPUBLIC rtl::OString GetCommand() const; + SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; - USHORT GetFormalArgumentCount() const { return nArgDefCount; } - const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const + sal_uInt16 GetFormalArgumentCount() const { return nArgDefCount; } + const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const { return pFirstArgDef[nNo]; } SfxExecFunc GetExecFnc() const { return fnExec; } @@ -304,14 +309,14 @@ public: // returns the id of the function -inline USHORT SfxSlot::GetSlotId() const +inline sal_uInt16 SfxSlot::GetSlotId() const { return nSlotId; } //-------------------------------------------------------------------- // returns the help-id of the slot -inline ULONG SfxSlot::GetHelpId() const +inline sal_uIntPtr SfxSlot::GetHelpId() const { return nHelpId; } @@ -320,7 +325,7 @@ inline ULONG SfxSlot::GetHelpId() const // returns a bitfield with flags -inline ULONG SfxSlot::GetMode() const +inline sal_uIntPtr SfxSlot::GetMode() const { return nFlags; } @@ -328,7 +333,7 @@ inline ULONG SfxSlot::GetMode() const // determines if the specified mode is assigned -inline BOOL SfxSlot::IsMode( ULONG nMode ) const +inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const { return (nFlags & nMode) != 0; } @@ -336,7 +341,7 @@ inline BOOL SfxSlot::IsMode( ULONG nMode ) const // returns the id of the associated group -inline USHORT SfxSlot::GetGroupId() const +inline sal_uInt16 SfxSlot::GetGroupId() const { return nGroupId; diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx index bb5259779707..05854edbb010 100644..100755 --- a/sfx2/inc/sfx2/msgpool.hxx +++ b/sfx2/inc/sfx2/msgpool.hxx @@ -52,13 +52,13 @@ class SFX2_DLLPUBLIC SfxSlotPool SfxSlotPool* _pParentPool; ResMgr* _pResMgr; SfxInterfaceArr_Impl* _pInterfaces; - USHORT _nCurGroup; - USHORT _nCurInterface; - USHORT _nCurMsg; + sal_uInt16 _nCurGroup; + sal_uInt16 _nCurInterface; + sal_uInt16 _nCurMsg; SfxSlotArr_Impl* _pUnoSlots; private: - const SfxSlot* SeekSlot( USHORT nObject ); + const SfxSlot* SeekSlot( sal_uInt16 nObject ); public: SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0); @@ -71,14 +71,14 @@ public: static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=NULL ); - USHORT GetGroupCount(); - String SeekGroup( USHORT nNo ); + sal_uInt16 GetGroupCount(); + String SeekGroup( sal_uInt16 nNo ); const SfxSlot* FirstSlot(); const SfxSlot* NextSlot(); - const SfxSlot* GetSlot( USHORT nId ); - const SfxSlot* GetUnoSlot( USHORT nId ); + const SfxSlot* GetSlot( sal_uInt16 nId ); + const SfxSlot* GetUnoSlot( sal_uInt16 nId ); const SfxSlot* GetUnoSlot( const String& rUnoName ); - TypeId GetSlotType( USHORT nSlotId ) const; + TypeId GetSlotType( sal_uInt16 nSlotId ) const; }; //-------------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx index 2661cf13db34..2412fca06a09 100644..100755 --- a/sfx2/inc/sfx2/navigat.hxx +++ b/sfx2/inc/sfx2/navigat.hxx @@ -39,7 +39,7 @@ class SfxNavigatorWrapper : public SfxChildWindow public: SfxNavigatorWrapper( Window* pParent , - USHORT nId , + sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -58,7 +58,7 @@ public: virtual void Resize(); virtual void Resizing( Size& rSize ); - virtual BOOL Close(); + virtual sal_Bool Close(); }; #endif diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx index a566703508c6..d97ee529b3c3 100644..100755 --- a/sfx2/inc/sfx2/new.hxx +++ b/sfx2/inc/sfx2/new.hxx @@ -79,20 +79,20 @@ private: public: - SfxNewFileDialog(Window *pParent, USHORT nFlags = 0); + SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); ~SfxNewFileDialog(); - // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist - // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen + // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist + // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen // erfragt werden - BOOL IsTemplate() const; + sal_Bool IsTemplate() const; String GetTemplateRegion() const; String GetTemplateName() const; String GetTemplateFileName() const; // load template methods - USHORT GetTemplateFlags()const; - void SetTemplateFlags(USHORT nSet); + sal_uInt16 GetTemplateFlags()const; + void SetTemplateFlags(sal_uInt16 nSet); }; #endif diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx index 22f47eec8974..22f47eec8974 100644..100755 --- a/sfx2/inc/sfx2/newstyle.hxx +++ b/sfx2/inc/sfx2/newstyle.hxx diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index e77681223411..d867bd065f2b 100644..100755 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -54,27 +54,27 @@ friend class SfxSlotPool; const char* pName; // Sfx-internal name of interface const SfxInterface* pGenoType; // base interface SfxSlot* pSlots; // SlotMap - USHORT nCount; // number of slots in SlotMap + sal_uInt16 nCount; // number of slots in SlotMap SfxInterfaceId nClassId; // Id of interface ResId aNameResId; // ResId of external interface name SfxInterface_Impl* pImpData; - SfxSlot* operator[]( USHORT nPos ) const; + SfxSlot* operator[]( sal_uInt16 nPos ) const; public: SfxInterface( const char *pClass, const ResId& rResId, SfxInterfaceId nClassId, const SfxInterface* pGeno, - SfxSlot &rMessages, USHORT nMsgCount ); + SfxSlot &rMessages, sal_uInt16 nMsgCount ); virtual ~SfxInterface(); - void SetSlotMap( SfxSlot& rMessages, USHORT nMsgCount ); - inline USHORT Count() const; + void SetSlotMap( SfxSlot& rMessages, sal_uInt16 nMsgCount ); + inline sal_uInt16 Count() const; const SfxSlot* GetRealSlot( const SfxSlot * ) const; - const SfxSlot* GetRealSlot( USHORT nSlotId ) const; - virtual const SfxSlot* GetSlot( USHORT nSlotId ) const; + const SfxSlot* GetRealSlot( sal_uInt16 nSlotId ) const; + virtual const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const; const SfxSlot* GetSlot( const String& rCommand ) const; const char* GetClassName() const { return pName; } @@ -87,21 +87,21 @@ public: const SfxInterface* GetGenoType() const { return pGenoType; } const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const; - void RegisterObjectBar( USHORT, const ResId&, const String* pST=0 ); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 ); void RegisterStatusBar( const ResId& ); - const ResId& GetObjectBarResId( USHORT nNo ) const; - USHORT GetObjectBarPos( USHORT nNo ) const; - sal_uInt32 GetObjectBarFeature( USHORT nNo ) const; - USHORT GetObjectBarCount() const; - void SetObjectBarPos( USHORT nPos, USHORT nId ); - const String* GetObjectBarName( USHORT nNo ) const; - BOOL IsObjectBarVisible( USHORT nNo) const; - sal_uInt32 GetChildWindowFeature( USHORT nNo ) const; - sal_uInt32 GetChildWindowId( USHORT nNo ) const; - USHORT GetChildWindowCount() const; + const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; + sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarCount() const; + void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId ); + const String* GetObjectBarName( sal_uInt16 nNo ) const; + sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const; + sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; + sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; + sal_uInt16 GetChildWindowCount() const; void RegisterPopupMenu( const ResId& ); const ResId& GetPopupMenuResId() const; const ResId& GetStatusBarResId() const; @@ -118,7 +118,7 @@ public: // returns the number of functions in this cluster -inline USHORT SfxInterface::Count() const +inline sal_uInt16 SfxInterface::Count() const { return nCount; } @@ -127,7 +127,7 @@ inline USHORT SfxInterface::Count() const // returns a function by position in the array -inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const +inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const { return nPos < nCount? pSlots+nPos: 0; } @@ -135,15 +135,15 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const class SfxIFConfig_Impl { friend class SfxInterface; - USHORT nCount; + sal_uInt16 nCount; SfxObjectUIArr_Impl* pObjectBars; public: SfxIFConfig_Impl(); ~SfxIFConfig_Impl(); - BOOL Store(SvStream&); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - USHORT GetType(); + sal_Bool Store(SvStream&); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + sal_uInt16 GetType(); }; #endif diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx index b4d340e41b9c..cc14c6881791 100644..100755 --- a/sfx2/inc/sfx2/objitem.hxx +++ b/sfx2/inc/sfx2/objitem.hxx @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem public: TYPEINFO(); - SfxObjectItem( USHORT nWhich=0, SfxShell *pSh=0 ); + SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 6664786b99e7..a3ad4fbf917c 100644..100755 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -69,7 +69,6 @@ class BasicManager; class SfxMedium; class SfxObjectFactory; class SfxDocumentInfoDialog; -class SfxEventConfigItem_Impl; class SfxStyleSheetBasePool; class INote; class SfxStyleSheetPool; @@ -157,11 +156,6 @@ typedef sal_uInt32 SfxObjectShellFlags; //-------------------------------------------------------------------- -#define SEQUENCE ::com::sun::star::uno::Sequence -#define OUSTRING ::rtl::OUString - -//-------------------------------------------------------------------- - #define HIDDENINFORMATION_RECORDEDCHANGES 0x0001 #define HIDDENINFORMATION_NOTES 0x0002 #define HIDDENINFORMATION_DOCUMENTVERSIONS 0x0004 @@ -194,12 +188,6 @@ in fremde Objekte integriert werden k"onnen. ----------------------------------------------------------------------*/ -enum SfxTitleQuery -{ - SFX_TITLE_QUERY_SAVE_NAME_PROPOSAL -}; - - class SfxToolBoxConfig; struct TransferableObjectDescriptor; @@ -208,6 +196,7 @@ class SFX2_DLLPUBLIC SfxObjectShell : public ::comphelper::IEmbeddedHelper, public ::sfx2::IXmlIdRegistrySupplier { friend struct ModifyBlocker_Impl; +friend class SfxObjectShellLock; private: struct SfxObjectShell_Impl* pImp; // interne Daten @@ -263,7 +252,7 @@ public: GetCurrentComponent(); static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - virtual void Invalidate(USHORT nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0); void SetFlags( SfxObjectShellFlags eFlags ); SfxObjectShellFlags GetFlags( ) const ; @@ -317,7 +306,7 @@ public: sal_Bool DoLoad( SfxMedium* pMedium ); sal_Bool DoSave(); sal_Bool DoSaveAs( SfxMedium &rNewStor ); - sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, BOOL bCommit ); + sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit ); // TODO/LATER: currently only overloaded in Calc, should be made non-virtual virtual sal_Bool DoSaveCompleted( SfxMedium* pNewStor=0 ); @@ -344,9 +333,9 @@ public: void SetConfigOptionsChecked( sal_Bool bChecked ); // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action - virtual sal_Bool QuerySlotExecutable( USHORT nSlotId ); + virtual sal_Bool QuerySlotExecutable( sal_uInt16 nSlotId ); - sal_Bool SaveChildren(BOOL bObjectsOnly=FALSE); + sal_Bool SaveChildren(sal_Bool bObjectsOnly=sal_False); sal_Bool SaveAsChildren( SfxMedium &rMedium ); sal_Bool SwitchChildrenPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, @@ -363,36 +352,11 @@ public: sal_uInt16 GetScriptingSignatureState(); void SignScriptingContent(); - virtual String QueryTitle( SfxTitleQuery ) const; virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, const SfxItemSet& ); - sal_Bool IsBasic( const String & rCode, SbxObject * pVCtrl = NULL ); ErrCode CallBasic( const String& rMacro, const String& rBasicName, - SbxObject* pVCtrl, SbxArray* pArgs = 0, SbxValue* pRet = 0 ); - ErrCode Call( const String & rCode, sal_Bool bIsBasicReturn, SbxObject * pVCtrl = NULL ); - - ErrCode CallScript( - const String & rScriptType, const String & rCode, const void* pArgs = NULL, void* pRet = NULL ); - - /** calls a StarBasic script without magic - @param _rMacroName - specifies the name of the method to execute - @param _rLocation - specifies the location of the script to execute. Allowed values are "application" and "document". - @param _pArguments - This is a pointer to a Sequence< Any >. All elements of the Sequence are wrapped into Basic objects - and passed as arguments to the method specified by <arg>_rMacroName</arg> - @param _pReturn - If not <NULL/>, the Any pointed to by this argument contains the return value of the (synchronous) call - to the StarBasic macro - */ - ErrCode CallStarBasicScript( - const String& _rMacroName, - const String& _rLocation, - const void* _pArguments = NULL, - void* _pReturn = NULL - ); + SbxArray* pArgs = 0, SbxValue* pRet = 0 ); ErrCode CallXScript( const String& rScriptURL, @@ -496,7 +460,7 @@ public: SfxObjectCreateMode GetCreateMode() const { return eCreateMode; } virtual void MemoryError(); SfxProgress* GetProgress() const; - void SetWaitCursor( BOOL bSet ) const; + void SetWaitCursor( sal_Bool bSet ) const; // Naming Interface void SetTitle( const String& rTitle ); @@ -599,10 +563,10 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const; // Nur uebergangsweise fuer die Applikationen !!! - virtual SEQUENCE< OUSTRING > GetEventNames(); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames(); Window* GetDialogParent( SfxMedium* pMedium=0 ); - String UpdateTitle( SfxMedium* pMed=NULL, USHORT nDocViewNo=0 ); + String UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 ); static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 ); @@ -610,10 +574,10 @@ public: CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL ); static SfxObjectShell* GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp ); static String GetServiceNameFromFactory( const String& rFact ); - BOOL IsInPlaceActive(); - BOOL IsUIActive(); - virtual void InPlaceActivate( BOOL ); - virtual void UIActivate( BOOL ); + sal_Bool IsInPlaceActive(); + sal_Bool IsUIActive(); + virtual void InPlaceActivate( sal_Bool ); + virtual void UIActivate( sal_Bool ); static sal_Bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -655,11 +619,11 @@ public: virtual Printer * GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual Rectangle GetVisArea( USHORT nAspect ) const; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; virtual void SetVisArea( const Rectangle & rVisArea ); const Rectangle & GetVisArea() const; void SetVisAreaSize( const Size & rVisSize ); - virtual ULONG GetMiscStatus() const; + virtual sal_uIntPtr GetMiscStatus() const; MapUnit GetMapUnit() const; void SetMapUnit( MapUnit nMUnit ); @@ -668,9 +632,9 @@ public: void DoDraw( OutputDevice *, const Point & rObjPos, const Size & rSize, const JobSetup & rSetup, - USHORT nAspect = ASPECT_CONTENT ); + sal_uInt16 nAspect = ASPECT_CONTENT ); virtual void Draw( OutputDevice *, const JobSetup & rSetup, - USHORT nAspect = ASPECT_CONTENT ) = 0; + sal_uInt16 nAspect = ASPECT_CONTENT ) = 0; virtual void FillClass( SvGlobalName * pClassName, @@ -734,7 +698,7 @@ public: const Fraction & rScaleX, const Fraction & rScaleY, const JobSetup & rSetup, - USHORT nAspect ); + sal_uInt16 nAspect ); // Shell Interface SAL_DLLPRIVATE void ExecFile_Impl(SfxRequest &); @@ -773,9 +737,8 @@ public: SAL_DLLPRIVATE SfxObjectShell* GetParentShellByModel_Impl(); // configuration items - SAL_DLLPRIVATE SfxEventConfigItem_Impl* GetEventConfig_Impl( sal_Bool bForce=sal_False ); SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl(); - SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE ); + SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = sal_False ); SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplAnalyzeSignature( @@ -783,7 +746,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() ); - SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE ); + SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False ); SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); }; @@ -810,7 +773,6 @@ public: //-------------------------------------------------------------------- - #ifndef SFX_DECL_OBJECTSHELL_DEFINED #define SFX_DECL_OBJECTSHELL_DEFINED SV_DECL_REF(SfxObjectShell) @@ -819,7 +781,6 @@ SV_DECL_LOCK(SfxObjectShell) SV_IMPL_LOCK(SfxObjectShell) SV_IMPL_REF(SfxObjectShell) -SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, BOOL bWriting ); //-------------------------------------------------------------------- class AutoReloadTimer_Impl : public Timer { @@ -858,8 +819,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual String GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SfxObjectShell* GetObjectShell() const { return pObjSh; } diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx index 1c7a63998c03..1c7a63998c03 100644..100755 --- a/sfx2/inc/sfx2/objuno.hxx +++ b/sfx2/inc/sfx2/objuno.hxx diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index 45787962a1ef..3c9f20a18632 100644..100755 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -55,10 +55,7 @@ public: String GetCurrentFilter() const; void SetCurrentFilter(const String&); - /// Set dialog help id at FileDlgHelper - void SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ); - /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const INT32 _nHelpId ); + void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); private: // disable copy and assignment SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 5e426d9cfae9..567320cfa58e 100644..100755 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -29,25 +29,28 @@ #define _SFX_PASSWD_HXX #include "sal/config.h" -#include "sfx2/dllapi.h" - +#include <sfx2/dllapi.h> #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> +#include <sfx2/app.hxx> // defines --------------------------------------------------------------- -#define SHOWEXTRAS_NONE ((USHORT)0x0000) -#define SHOWEXTRAS_USER ((USHORT)0x0001) -#define SHOWEXTRAS_CONFIRM ((USHORT)0x0002) -#define SHOWEXTRAS_ALL ((USHORT)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM)) +#define SHOWEXTRAS_NONE ((sal_uInt16)0x0000) +#define SHOWEXTRAS_USER ((sal_uInt16)0x0001) +#define SHOWEXTRAS_CONFIRM ((sal_uInt16)0x0002) +#define SHOWEXTRAS_PASSWORD2 ((sal_uInt16)0x0004) +#define SHOWEXTRAS_CONFIRM2 ((sal_uInt16)0x0008) +#define SHOWEXTRAS_ALL ((sal_uInt16)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM)) // class SfxPasswordDialog ----------------------------------------------- class SFX2_DLLPUBLIC SfxPasswordDialog : public ModalDialog { private: + FixedLine maPasswordBox; FixedText maUserFT; Edit maUserED; FixedText maPasswordFT; @@ -55,18 +58,22 @@ private: FixedText maConfirmFT; Edit maConfirmED; FixedText maMinLengthFT; - FixedLine maPasswordBox; + FixedLine maPassword2Box; + FixedText maPassword2FT; + Edit maPassword2ED; + FixedText maConfirm2FT; + Edit maConfirm2ED; OKButton maOKBtn; CancelButton maCancelBtn; HelpButton maHelpBtn; String maConfirmStr; - USHORT mnMinLen; String maMinLenPwdStr; String maEmptyPwdStr; String maMainPwdStr; - USHORT mnExtras; + sal_uInt16 mnMinLen; + sal_uInt16 mnExtras; bool mbAsciiOnly; DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* ); @@ -81,10 +88,14 @@ public: String GetPassword() const { return maPasswordED.GetText(); } String GetConfirm() const { return maConfirmED.GetText(); } - void SetMinLen( USHORT Len ); - void SetMaxLen( USHORT Len ); - void SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); } - void ShowExtras( USHORT nExtras ) { mnExtras = nExtras; } + String GetPassword2() const { return maPassword2ED.GetText(); } + String GetConfirm2() const { return maConfirm2ED.GetText(); } + void SetGroup2Text( const String& i_rText ) { maPassword2Box.SetText( i_rText ); } + + void SetMinLen( sal_uInt16 Len ); + void SetMaxLen( sal_uInt16 Len ); + void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); } + void ShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; } void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; } virtual short Execute(); diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx index 2aa07e65be68..68315b772736 100644..100755 --- a/sfx2/inc/sfx2/printer.hxx +++ b/sfx2/inc/sfx2/printer.hxx @@ -33,60 +33,11 @@ #include "sal/types.h" #include <vcl/print.hxx> -class SfxFont; class SfxTabPage; class SfxItemSet; struct SfxPrinter_Impl; -#define SFX_RANGE_NOTSET ((USHORT)0xFFFF) - -// class SfxFontSizeInfo ------------------------------------------------- - -class SfxFontSizeInfo -{ -private: - static USHORT pStaticSizes[]; - Size* pSizes; - USHORT nSizes; - BOOL bScalable; - -public: - SfxFontSizeInfo( const SfxFont& rFont, const OutputDevice& rDevice ); - ~SfxFontSizeInfo(); - - BOOL HasSize(const Size &rSize) const; - BOOL IsScalable() const { return bScalable; } - - USHORT SizeCount() const { return nSizes; } - const Size& GetSize( USHORT nNo ) const - { return pSizes[nNo]; } -}; - -// class SfxFont --------------------------------------------------------- - -class SFX2_DLLPUBLIC SfxFont -{ -private: - String aName; - FontFamily eFamily; - FontPitch ePitch; - CharSet eCharSet; - - SfxFont& operator=(const SfxFont& rFont); // not implemented - -public: - SfxFont( const FontFamily eFam, - const String& aName, - const FontPitch eFontPitch = PITCH_DONTKNOW, - const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW ); - // ZugriffsMethoden: - inline const String& GetName() const { return aName; } - inline FontFamily GetFamily() const { return eFamily; } - inline FontPitch GetPitch() const { return ePitch; } - inline CharSet GetCharSet() const { return eCharSet; } -}; - // class SfxPrinter ------------------------------------------------------ class SFX2_DLLPUBLIC SfxPrinter : public Printer @@ -95,7 +46,7 @@ private: JobSetup aOrigJobSetup; SfxItemSet* pOptions; SfxPrinter_Impl* pImpl; - BOOL bKnown; + sal_Bool bKnown; SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined @@ -124,19 +75,8 @@ public: const SfxItemSet& GetOptions() const { return *pOptions; } void SetOptions( const SfxItemSet &rNewOptions ); - void EnableRange( USHORT nRange ); - void DisableRange( USHORT nRange ); - BOOL IsRangeEnabled( USHORT nRange ) const; - - BOOL IsKnown() const { return bKnown; } - BOOL IsOriginal() const { return bKnown; } - - using OutputDevice::GetFont; - USHORT GetFontCount(); - const SfxFont* GetFont( USHORT nNo ) const; - const SfxFont* GetFontByName( const String &rFontName ); - - BOOL InitJob( Window* pUIParent, BOOL bAskAboutTransparentObjects ); + sal_Bool IsKnown() const { return bKnown; } + sal_Bool IsOriginal() const { return bKnown; } }; #endif diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx index 18fc31ddc744..0b25dec5dc38 100644..100755 --- a/sfx2/inc/sfx2/printopt.hxx +++ b/sfx2/inc/sfx2/printopt.hxx @@ -114,7 +114,7 @@ public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SfxCommonPrintOptionsTabPage(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual Window* GetParentLabeledBy( const Window* pLabel ) const; virtual Window* GetParentLabelFor( const Window* pLabel ) const; @@ -140,7 +140,7 @@ public: TransparencyPrintWarningBox( Window* pParent ); ~TransparencyPrintWarningBox(); - BOOL IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); } + sal_Bool IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); } }; #endif // #ifndef _SFX_PRINTOPT_HXX diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index e15d6bbd49e3..c11f45e06396 100644..100755 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -64,7 +64,7 @@ public: const SfxItemSet *rOptions ); virtual ~SfxPrintOptionsDialog(); - BOOL Construct(); + sal_Bool Construct(); virtual short Execute(); virtual long Notify( NotifyEvent& rNEvt ); diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index 0b8fbf920d0f..f8bd9e7ffb9d 100644..100755 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -48,24 +48,24 @@ struct SvProgressArg; class SFX2_DLLPUBLIC SfxProgress { SfxProgress_Impl* pImp; - ULONG nVal; - BOOL bSuspended; + sal_uIntPtr nVal; + sal_Bool bSuspended; public: SfxProgress( SfxObjectShell* pObjSh, const String& rText, - ULONG nRange, BOOL bAllDocs = FALSE, - BOOL bWait = TRUE ); + sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False, + sal_Bool bWait = sal_True ); virtual ~SfxProgress(); virtual void SetText( const String& rText ); - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ); - virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ); - ULONG GetState() const { return nVal; } + sal_Bool SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 ); + virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 ); + sal_uIntPtr GetState() const { return nVal; } void Resume(); void Suspend(); - BOOL IsSuspended() const { return bSuspended; } + sal_Bool IsSuspended() const { return bSuspended; } void Lock(); void UnLock(); @@ -73,8 +73,8 @@ public: void Stop(); - void SetWaitMode( BOOL bWait ); - BOOL GetWaitMode() const; + void SetWaitMode( sal_Bool bWait ); + sal_Bool GetWaitMode() const; static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = 0 ); static void EnterLock(); diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx index 0df2789acb47..28a0460a4b5b 100644..100755 --- a/sfx2/inc/sfx2/querystatus.hxx +++ b/sfx2/inc/sfx2/querystatus.hxx @@ -44,7 +44,7 @@ class SfxQueryStatus_Impl; class SFX2_DLLPUBLIC SfxQueryStatus { public: - SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand ); + SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); ~SfxQueryStatus(); // Query method diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index d9dd1531de27..d7c993b94148 100644..100755 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -57,7 +57,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint { friend struct SfxRequest_Impl; - USHORT nSlot; + sal_uInt16 nSlot; SfxAllItemSet* pArgs; SfxRequest_Impl* pImp; @@ -72,52 +72,52 @@ private: //--------------------------------------------------------------------- public: - SfxRequest( SfxViewFrame*, USHORT nSlotId ); - SfxRequest( USHORT nSlot, USHORT nCallMode, SfxItemPool &rPool ); + SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); + SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool ); SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs, - USHORT nCallMode, SfxItemPool &rPool ); - SfxRequest( USHORT nSlot, USHORT nCallMode, const SfxAllItemSet& rSfxArgs ); + sal_uInt16 nCallMode, SfxItemPool &rPool ); + SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs ); SfxRequest( const SfxRequest& rOrig ); ~SfxRequest(); - USHORT GetSlot() const { return nSlot; } - void SetSlot(USHORT nNewSlot) { nSlot = nNewSlot; } + sal_uInt16 GetSlot() const { return nSlot; } + void SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; } - USHORT GetModifier() const; - void SetModifier( USHORT nModi ); + sal_uInt16 GetModifier() const; + void SetModifier( sal_uInt16 nModi ); SAL_DLLPRIVATE void SetInternalArgs_Impl( const SfxAllItemSet& rArgs ); SAL_DLLPRIVATE const SfxItemSet* GetInternalArgs_Impl() const; const SfxItemSet* GetArgs() const { return pArgs; } void SetArgs( const SfxAllItemSet& rArgs ); void AppendItem(const SfxPoolItem &); - void RemoveItem( USHORT nSlotId ); + void RemoveItem( sal_uInt16 nSlotId ); - static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId, + static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ); - const SfxPoolItem* GetArg( USHORT nSlotId, bool bDeep = false, TypeId aType = 0 ) const; + const SfxPoolItem* GetArg( sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ) const; void ReleaseArgs(); void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; static SfxMacro* GetRecordingMacro(); static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); - static BOOL HasMacroRecorder( SfxViewFrame* pFrame=NULL ); - USHORT GetCallMode() const; + static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); + sal_uInt16 GetCallMode() const; bool IsRecording() const; - void AllowRecording( BOOL ); - BOOL AllowsRecording() const; - BOOL IsAPI() const; - BOOL IsSynchronCall() const; - void SetSynchronCall( BOOL bSynchron ); + void AllowRecording( sal_Bool ); + sal_Bool AllowsRecording() const; + sal_Bool IsAPI() const; + sal_Bool IsSynchronCall() const; + void SetSynchronCall( sal_Bool bSynchron ); void SetTarget( const String &rTarget ); - BOOL IsDone() const; - void Done( BOOL bRemove = FALSE ); + sal_Bool IsDone() const; + void Done( sal_Bool bRemove = sal_False ); void Ignore(); void Cancel(); - BOOL IsCancelled() const; + sal_Bool IsCancelled() const; void Done(const SfxItemSet &, bool bKeep = true ); void ForgetAllArgs(); diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx index fd1cc6209510..93f5611a287f 100644..100755 --- a/sfx2/inc/sfx2/securitypage.hxx +++ b/sfx2/inc/sfx2/securitypage.hxx @@ -46,7 +46,7 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 2004955a5d36..65b620a9ec62 100755 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -206,24 +206,13 @@ #define RID_DEFAULTABOUT (RID_SFX_START+0) -#define ABOUT_BTN_OK 1 - -#define ABOUT_FTXT_VERSION 1 -#define ABOUT_FTXT_COPYRIGHT 2 #define ABOUT_FTXT_LINK 3 - -#define ABOUT_STR_DEVELOPER_ARY 1 -#define ABOUT_STR_FRENCH_COPYRIGHT 2 -#define ABOUT_STR_ACCEL 3 #define ABOUT_STR_VERSION 4 #define ABOUT_STR_COPYRIGHT 5 #define ABOUT_STR_LINK 6 - #define RID_APPTITLE (RID_SFX_START+4) -#define RID_BUILDVERSION (RID_SFX_START+5) #define RID_DOCALREADYLOADED_DLG (RID_SFX_START+1) -#define RID_CANTLOADDOC_DLG (RID_SFX_START+2) #define TP_DOCINFODESC (RID_SFX_START+3) #define TP_DOCINFODOC (RID_SFX_START+4) @@ -258,14 +247,15 @@ #define STR_MB (RID_SFX_START+113) #define STR_GB (RID_SFX_START+114) -#define STR_VERSION_TYPE (RID_SFX_START+115) -#define STR_VERSION_ID (RID_SFX_START+116) #define STR_STANDARD_SHORTCUT (RID_SFX_START+117) #define STR_REPAIREDDOCUMENT (RID_SFX_START+118) #define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) #define STR_SHARED (RID_SFX_START+120) #define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121) +// IAccessibility2 implementation 2009. ------ +#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) +// ------ IAccessibility2 implementation 2009. //========================================================================= @@ -313,16 +303,8 @@ // ------------------------------------------------------------------------ -#define BMP_COLS 21 -#define BMP_SFX_SMALL 1 -#define BMP_SFX_LARGE 2 - #define RID_SFX_GLOBALS 1000 -#define BMP_SFX_COLOR (RID_SFX_GLOBALS + 1) -#define BMP_SFX_MONO (RID_SFX_GLOBALS + 2) -#define SFX_MSG_RES (RID_SFX_GLOBALS + 3) - // ========================================================================= #define RID_OPTIONS_START (SID_LIB_START + 2000) @@ -330,24 +312,6 @@ // ResId's ------------------------------------------------------------------ -#define RID_SFXLANG_BEGIN (RID_OPTIONS_START + 0) -#define RID_SFXLANG_NO (RID_SFXLANG_BEGIN + 0) -#define RID_SFXLANG_GERMAN (RID_SFXLANG_BEGIN + 1) -#define RID_SFXLANG_SWISS_GERMAN (RID_SFXLANG_BEGIN + 2) -#define RID_SFXLANG_US_ENGLISH (RID_SFXLANG_BEGIN + 3) -#define RID_SFXLANG_UK_ENGLISH (RID_SFXLANG_BEGIN + 4) -#define RID_SFXLANG_FRENCH (RID_SFXLANG_BEGIN + 5) -#define RID_SFXLANG_ITALIAN (RID_SFXLANG_BEGIN + 6) -#define RID_SFXLANG_CAST_SPANISH (RID_SFXLANG_BEGIN + 7) -#define RID_SFXLANG_PORTUGUESE (RID_SFXLANG_BEGIN + 8) -#define RID_SFXLANG_DANISH (RID_SFXLANG_BEGIN + 9) -#define RID_SFXLANG_DUTCH (RID_SFXLANG_BEGIN + 10) -#define RID_SFXLANG_SWEDISH (RID_SFXLANG_BEGIN + 11) -#define RID_SFXLANG_FINNISH (RID_SFXLANG_BEGIN + 12) -#define RID_SFXLANG_NORWEG_BOKMAL (RID_SFXLANG_BEGIN + 13) -#define RID_SFXLANG_NORWEG_NYNORSK (RID_SFXLANG_BEGIN + 14) -#define RID_SFXLANG_ALL (RID_SFXLANG_BEGIN + 15) - #define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) #define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) #define RID_SFXPAGE_SPELL (RID_OPTIONS_START + 2) @@ -356,15 +320,9 @@ #define RID_SFXQB_DELDICT (RID_OPTIONS_START + 5) #define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) #define RID_SFXPAGE_LINGU (RID_OPTIONS_START + 7) -#define RID_SFXPAGE_INET (RID_OPTIONS_START + 8) -#define RID_SFXQB_DEL_IGNORELIST (RID_OPTIONS_START + 9) #define RID_SFXQB_SET_LANGUAGE (RID_OPTIONS_START + 10) -#define RID_ITEMLIST_LINGU (RID_OPTIONS_START + 11) #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) // Member-Ids ------------------------------------------------------------ diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx index dc3b3e061d15..cd0f1e8ce50d 100644..100755 --- a/sfx2/inc/sfx2/sfxbasecontroller.hxx +++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx @@ -67,7 +67,6 @@ // Some defines to write better code :-) #define REFERENCE ::com::sun::star::uno::Reference #define ANY ::com::sun::star::uno::Any -#define SEQUENCE ::com::sun::star::uno::Sequence #define XDISPATCH ::com::sun::star::frame::XDispatch #define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor #define XMODEL ::com::sun::star::frame::XModel @@ -305,7 +304,7 @@ public: @onerror - */ - virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; + virtual ::com::sun::star::uno::Sequence< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; //____________________________________________________________________________________________________ // XControllerBorder @@ -389,9 +388,9 @@ public: // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API SfxViewShell* GetViewShell_Impl() const; - SAL_DLLPRIVATE BOOL HandleEvent_Impl( NotifyEvent& rEvent ); - SAL_DLLPRIVATE BOOL HasKeyListeners_Impl(); - SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent ); + SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl(); SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper (); private: diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index f58757afb622..35e170042400 100644..100755 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -40,15 +40,17 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/document/XDocumentInfo.hpp> #include <com/sun/star/document/XDocumentInfoSupplier.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentRecovery.hpp> +#include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> +#include <com/sun/star/document/XDocumentEventBroadcaster.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> @@ -97,9 +99,9 @@ #include <com/sun/star/task/XInteractionHandler.hpp> //________________________________________________________________________________________________________ -#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30) -#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30 -#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 30 +#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32) +#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32 +#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32 #include <comphelper/implbase_var.hxx> #endif @@ -144,6 +146,7 @@ #define XDOCUMENTINFO ::com::sun::star::document::XDocumentInfo #define XDOCUMENTINFOSUPPLIER ::com::sun::star::document::XDocumentInfoSupplier #define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster +#define XDOCUMENTEVENTBROADCASTER ::com::sun::star::document::XDocumentEventBroadcaster #define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier #define XEMBEDDEDSCRIPTS ::com::sun::star::document::XEmbeddedScripts #define XSCRIPTINVOCATIONCONTEXT ::com::sun::star::document::XScriptInvocationContext @@ -160,7 +163,6 @@ #define EVENTOBJECT ::com::sun::star::lang::EventObject #define PROPERTYVALUE ::com::sun::star::beans::PropertyValue #define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence #define MUTEX ::osl::Mutex #define OUSTRING ::rtl::OUString #define UNOTYPE ::com::sun::star::uno::Type @@ -238,12 +240,14 @@ namespace sfx { namespace intern { SfxListener */ -typedef ::comphelper::WeakImplHelper30 < XCHILD +typedef ::comphelper::WeakImplHelper32 < XCHILD , XDOCUMENTINFOSUPPLIER , ::com::sun::star::document::XDocumentPropertiesSupplier , ::com::sun::star::rdf::XDocumentMetadataAccess , ::com::sun::star::document::XDocumentRecovery + , ::com::sun::star::document::XUndoManagerSupplier , XEVENTBROADCASTER + , XDOCUMENTEVENTBROADCASTER , XEVENTLISTENER , XEVENTSSUPPLIER , XEMBEDDEDSCRIPTS @@ -383,7 +387,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual SEQUENCE< UNOTYPE > SAL_CALL getTypes() throw( RUNTIMEEXCEPTION ) ; + virtual ::com::sun::star::uno::Sequence< UNOTYPE > SAL_CALL getTypes() throw( RUNTIMEEXCEPTION ) ; /**___________________________________________________________________________________________________ @short get implementation id @@ -399,7 +403,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( RUNTIMEEXCEPTION ) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( RUNTIMEEXCEPTION ) ; //____________________________________________________________________________________________________ @@ -578,7 +582,7 @@ public: */ virtual sal_Bool SAL_CALL attachResource( const OUSTRING& sURL , - const SEQUENCE< PROPERTYVALUE >& aArgs ) + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aArgs ) throw (::com::sun::star::uno::RuntimeException); /**___________________________________________________________________________________________________ @@ -609,7 +613,7 @@ public: @onerror - */ - virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getArgs() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< PROPERTYVALUE > SAL_CALL getArgs() throw (::com::sun::star::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -859,7 +863,7 @@ public: @onerror - */ - virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< PROPERTYVALUE > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -874,7 +878,7 @@ public: @onerror - */ - virtual void SAL_CALL setPrinter( const SEQUENCE< PROPERTYVALUE >& seqPrinter ) + virtual void SAL_CALL setPrinter( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqPrinter ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -889,14 +893,14 @@ public: @onerror - */ - virtual void SAL_CALL print( const SEQUENCE< PROPERTYVALUE >& seqOptions ) + virtual void SAL_CALL print( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //____________________________________________________________________________________________________ // XStorable2 //____________________________________________________________________________________________________ - virtual void SAL_CALL storeSelf( const SEQUENCE< PROPERTYVALUE >& seqArguments ) + virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); //____________________________________________________________________________________________________ @@ -977,7 +981,7 @@ public: */ virtual void SAL_CALL storeAsURL( const OUSTRING& sURL , - const SEQUENCE< PROPERTYVALUE >& seqArguments ) + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; /**___________________________________________________________________________________________________ @@ -994,7 +998,7 @@ public: */ virtual void SAL_CALL storeToURL( const OUSTRING& sURL , - const SEQUENCE< PROPERTYVALUE >& seqArguments ) + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -1035,7 +1039,7 @@ public: @onerror - */ - virtual void SAL_CALL load( const SEQUENCE< PROPERTYVALUE >& seqArguments ) + virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, @@ -1056,7 +1060,7 @@ public: //____________________________________________________________________________________________________ virtual void SAL_CALL loadFromStorage( const REFERENCE< XSTORAGE >& xStorage, - const SEQUENCE< PROPERTYVALUE >& aMediaDescriptor ) + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor ) throw ( ILLEGALARGUMENTEXCEPTION, DOUBLEINITIALIZATIONEXCEPTION, IOEXCEPTION, @@ -1064,7 +1068,7 @@ public: RUNTIMEEXCEPTION ); virtual void SAL_CALL storeToStorage( const REFERENCE< XSTORAGE >& xStorage, - const SEQUENCE< PROPERTYVALUE >& aMediaDescriptor ) + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor ) throw ( ILLEGALARGUMENTEXCEPTION, IOEXCEPTION, EXCEPTION, @@ -1162,7 +1166,7 @@ public: */ - virtual SEQUENCE< DATAFLAVOR > SAL_CALL getTransferDataFlavors() + virtual ::com::sun::star::uno::Sequence< DATAFLAVOR > SAL_CALL getTransferDataFlavors() throw (::com::sun::star::uno::RuntimeException); /**___________________________________________________________________________________________________ @@ -1250,6 +1254,18 @@ public: virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ); + //____________________________________________________________________________________________________ + // XDocumentEventBroadcaster + //____________________________________________________________________________________________________ + + virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + + //____________________________________________________________________________________________________ + // XUnoTunnel + //____________________________________________________________________________________________________ + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // css.frame.XModule @@ -1307,6 +1323,9 @@ public: ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + // css.document.XUndoManagerSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager( ) throw (::com::sun::star::uno::RuntimeException); + //____________________________________________________________________________________________________ // ::com::sun::star::rdf::XNode: @@ -1471,22 +1490,11 @@ public: SfxObjectShell* GetObjectShell() const ; SAL_DLLPRIVATE SfxObjectShell* impl_getObjectShell() const ; - /**___________________________________________________________________________________________________ - @short - - @descr - - - @seealso - - - @param - - - @return - - - @onerror - - */ - SAL_DLLPRIVATE sal_Bool impl_isDisposed() const ; - sal_Bool IsDisposed() const ; sal_Bool IsInitialized() const; + sal_Bool IsDisposed() const { return impl_isDisposed(); } + void MethodEntryCheck( const bool i_mustBeInitialized ) const; + ::osl::Mutex& getMutex() const { return m_aMutex; } ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException); void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw (::com::sun::star::uno::RuntimeException); @@ -1531,9 +1539,11 @@ private: SAL_DLLPRIVATE ::rtl::OUString GetMediumFilterName_Impl(); SAL_DLLPRIVATE void impl_store( const OUSTRING& sURL , - const SEQUENCE< PROPERTYVALUE >& seqArguments , + const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments , sal_Bool bSaveTo ) ; - SAL_DLLPRIVATE void postEvent_Impl( ::rtl::OUString ); + + SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >() ); + SAL_DLLPRIVATE String getEventName_Impl( long nID ); SAL_DLLPRIVATE void NotifyStorageListeners_Impl(); SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler ); @@ -1561,6 +1571,44 @@ private: } ; // class SfxBaseModel +/** base class for sub components of an SfxBaseModel, which share their ref count and lifetime with the SfxBaseModel +*/ +class SFX2_DLLPUBLIC SfxModelSubComponent +{ +public: + /** checks whether the instance is alive, i.e. properly initialized, and not yet disposed + */ + void MethodEntryCheck() + { + m_rModel.MethodEntryCheck( true ); + } + + // called when the SfxBaseModel which the component is superordinate of is being disposed + virtual void disposing(); + +protected: + SfxModelSubComponent( SfxBaseModel& i_model ) + :m_rModel( i_model ) + { + } + virtual ~SfxModelSubComponent(); + + // helpers for implementing XInterface - delegates ref counting to the SfxBaseModel + void acquire() { m_rModel.acquire(); } + void release() { m_rModel.release(); } + + bool isDisposed() const { return m_rModel.IsDisposed(); } + +protected: + const SfxBaseModel& getBaseModel() const { return m_rModel; } + SfxBaseModel& getBaseModel() { return m_rModel; } + + ::osl::Mutex& getMutex() { return m_rModel.getMutex(); } + +private: + SfxBaseModel& m_rModel; +}; + class SFX2_DLLPUBLIC SfxModelGuard { public: @@ -1575,15 +1623,22 @@ public: SfxModelGuard( SfxBaseModel& i_rModel, const AllowedModelState i_eState = E_FULLY_ALIVE ) : m_aGuard() { - if ( i_rModel.IsDisposed() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *&i_rModel ); - if ( ( i_eState != E_INITIALIZING ) && !i_rModel.IsInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *&i_rModel ); + i_rModel.MethodEntryCheck( i_eState != E_INITIALIZING ); + } + SfxModelGuard( SfxModelSubComponent& i_rSubComponent ) + :m_aGuard( Application::GetSolarMutex() ) + { + i_rSubComponent.MethodEntryCheck(); } ~SfxModelGuard() { } + void reset() + { + m_aGuard.reset(); + } + void clear() { m_aGuard.clear(); diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h new file mode 100755 index 000000000000..035f2f187bb8 --- /dev/null +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -0,0 +1,342 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SFX2_SFXCOMMANDS_HRC +#define SFX2_SFXCOMMANDS_HRC + +#define CMD_SID_VIEWSHELL0 ".uno:_SwitchViewShell0" +#define CMD_SID_VIEWSHELL1 ".uno:_SwitchViewShell1" +#define CMD_SID_VIEWSHELL2 ".uno:_SwitchViewShell2" +#define CMD_SID_VIEWSHELL3 ".uno:_SwitchViewShell3" +#define CMD_SID_VIEWSHELL4 ".uno:_SwitchViewShell4" +#define CMD_SID_ABOUT ".uno:About" +#define CMD_SID_ACTIVATE ".uno:Activate" +#define CMD_SID_HELPBALLOONS ".uno:ActiveHelp" +#define CMD_SID_STYLE_FAMILY ".uno:ActualStyleFamily" +#define CMD_SID_NEWDOC ".uno:NewDoc" +#define CMD_SID_CREATELINK ".uno:AddBookmark" +#define CMD_SID_NEWDOCDIRECT ".uno:AddDirect" +#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE ".uno:AddressBookSource" +#define CMD_SID_BASICIDE_ADDWATCH ".uno:AddWatch" +#define CMD_SID_DOCINFO_AUTHOR ".uno:Author" +#define CMD_SID_AUTOHIDE ".uno:AutoHide" +#define CMD_SID_AUTOPILOTMENU ".uno:AutoPilotMenu" +#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage" +#define CMD_SID_BACKSPACE ".uno:Backspace" +#define CMD_SID_BASICBREAK ".uno:BasicBreak" +#define CMD_SID_BASICIDE_APPEAR ".uno:BasicIDEAppear" +#define CMD_SID_BASICSTEPINTO ".uno:BasicStepInto" +#define CMD_SID_BASICSTEPOUT ".uno:BasicStepOut" +#define CMD_SID_BASICSTEPOVER ".uno:BasicStepOver" +#define CMD_SID_BASICSTOP ".uno:BasicStop" +#define CMD_SID_BROWSER ".uno:Beamer" +#define CMD_SID_BASICIDE_BRKPNTSCHANGED ".uno:BreakPointsChanged" +#define CMD_SID_BROWSE_BACKWARD ".uno:BrowseBackward" +#define CMD_SID_BROWSE_FORWARD ".uno:BrowseForward" +#define CMD_SID_BROWSER_MODE ".uno:BrowseView" +#define CMD_SID_BUILD_VERSION ".uno:BuildVersion" +#define CMD_SID_CAPTION ".uno:Caption" +#define CMD_SID_STYLE_FAMILY1 ".uno:CharStyle" +#define CMD_SID_CHECK_KEY ".uno:CheckKey" +#define CMD_SID_BASICIDE_CHOOSEMACRO ".uno:ChooseMacro" +#define CMD_SID_CLEARHISTORY ".uno:ClearHistory" +#define CMD_SID_CLOSEWINS ".uno:CloseWins" +#define CMD_SID_CLOSEDOCS ".uno:CloseDocs" +#define CMD_SID_CLOSEDOC ".uno:CloseDoc" +#define CMD_SID_CLOSEWIN ".uno:CloseWin" +#define CMD_SID_CLOSING ".uno:Closing" +#define CMD_SID_DOCINFO_COMMENTS ".uno:Comments" +#define CMD_SID_OFFICE_COMMERCIAL_USE ".uno:CommercialUse" +#define CMD_SID_DOCUMENT_COMPARE ".uno:CompareDocuments" +#define CMD_SID_BASICCOMPILE ".uno:CompileBasic" +#define CMD_SID_CONFIG ".uno:ConfigureDialog" +#define CMD_SID_CONTEXT ".uno:Context" +#define CMD_SID_COPY ".uno:Copy" +#define CMD_SID_CRASH ".uno:Crash" +#define CMD_SID_BASICIDE_CREATEMACRO ".uno:CreateMacro" +#define CMD_SID_CURRENT_URL ".uno:CurrentURL" +#define CMD_SID_CURSORENDOFSCREEN ".uno:CursorEndOfScreen" +#define CMD_SID_CURSORTOPOFSCREEN ".uno:CursorTopOfScreen" +#define CMD_SID_OFFICE_CUSTOMERNUMBER ".uno:CustomerNumber" +#define CMD_SID_CUT ".uno:Cut" +#define CMD_SID_DEFAULTFILEPATH ".uno:DefaultFilePath" +#define CMD_SID_DEFAULTFILENAME ".uno:DefaultFileName" +#define CMD_SID_DELETE ".uno:Delete" +#define CMD_SID_BASICIDE_DELETECURRENT ".uno:DeleteCurrent" +#define CMD_SID_STYLE_DELETE ".uno:DeleteStyle" +#define CMD_SID_STYLE_DESIGNER ".uno:DesignerDialog" +#define CMD_SID_STYLE_DRAGHIERARCHIE ".uno:DragHierarchy" +#define CMD_SID_EDITDOC ".uno:EditDoc" +#define CMD_SID_BASICIDE_EDITMACRO ".uno:EditMacro" +#define CMD_SID_STYLE_EDIT ".uno:EditStyle" +#define CMD_FID_SEARCH_NOW ".uno:ExecuteSearch" +#define CMD_SID_EXTENDEDHELP ".uno:ExtendedHelp" +#define CMD_SID_FILE_NAME ".uno:FileName" +#define CMD_SID_FOCUSURLBOX ".uno:FocusUrlBox" +#define CMD_SID_FORMATMENU ".uno:FormatMenu" +#define CMD_SID_STYLE_FAMILY3 ".uno:FrameStyle" +#define CMD_SID_FRAMETITLE ".uno:FrameTitle" +#define CMD_SID_PROGFILENAME ".uno:FullName" +#define CMD_SID_DOCFULLNAME ".uno:FullName" +#define CMD_SID_WIN_FULLSCREEN ".uno:FullScreen" +#define CMD_SID_FILLFRAME ".uno:GetFrameWindow" +#define CMD_SID_CURSORDOWN ".uno:GoDown" +#define CMD_SID_CURSORPAGEDOWN ".uno:GoDownBlock" +#define CMD_SID_CURSORPAGEDOWN_SEL ".uno:GoDownBlockSel" +#define CMD_SID_CURSORDOWN_SEL ".uno:GoDownSel" +#define CMD_SID_CURSORLEFT ".uno:GoLeft" +#define CMD_SID_CURSORPAGELEFT ".uno:GoLeftBlock" +#define CMD_SID_CURSORPAGELEFT_SEL ".uno:GoLeftBlockSel" +#define CMD_SID_CURSORLEFT_SEL ".uno:GoLeftSel" +#define CMD_SID_CURSORRIGHT ".uno:GoRight" +#define CMD_SID_CURSORRIGHT_SEL ".uno:GoRightSel" +#define CMD_SID_CURSORENDOFFILE ".uno:GoToEndOfData" +#define CMD_SID_CURSORENDOFFILE_SEL ".uno:GoToEndOfDataSel" +#define CMD_SID_CURSOREND ".uno:GoToEndOfRow" +#define CMD_SID_CURSOREND_SEL ".uno:GoToEndOfRowSel" +#define CMD_SID_CURSORTOPOFFILE ".uno:GoToStart" +#define CMD_SID_CURSORHOME ".uno:GoToStartOfRow" +#define CMD_SID_CURSORHOME_SEL ".uno:GoToStartOfRowSel" +#define CMD_SID_CURSORTOPOFFILE_SEL ".uno:GoToStartSel" +#define CMD_SID_CURSORUP ".uno:GoUp" +#define CMD_SID_CURSORPAGEUP ".uno:GoUpBlock" +#define CMD_SID_CURSORPAGEUP_SEL ".uno:GoUpBlockSel" +#define CMD_SID_CURSORUP_SEL ".uno:GoUpSel" +#define CMD_SID_HELP_ANNOTATE ".uno:HelpAnnotate" +#define CMD_SID_HELP_BOOKMARK ".uno:HelpBookmark" +#define CMD_SID_HELP_HELPFILEBOX ".uno:HelpChooseFile" +#define CMD_SID_HELP_DOWNLOAD ".uno:HelpDownload" +#define CMD_SID_HELP_PI ".uno:HelperDialog" +#define CMD_SID_HELPINDEX ".uno:HelpIndex" +#define CMD_SID_HELPMENU ".uno:HelpMenu" +#define CMD_SID_HELPONHELP ".uno:HelpOnHelp" +#define CMD_SID_HELP_SEARCH ".uno:HelpSearch" +#define CMD_SID_HELPTIPS ".uno:HelpTip" +#define CMD_SID_HELP_ZOOMIN ".uno:HelpZoomIn" +#define CMD_SID_HELP_ZOOMOUT ".uno:HelpZoomOut" +#define CMD_SID_BASICIDE_HIDECURPAGE ".uno:HideCurPage" +#define CMD_SID_HYPERLINK_DIALOG ".uno:HyperlinkDialog" +#define CMD_SID_INSERTDOC ".uno:InsertDoc" +#define CMD_SID_HYPERLINK_INSERT ".uno:InsertHyperlink" +#define CMD_SID_INSERT_FLOATINGFRAME ".uno:InsertObjectFloatingFrame" +#define CMD_SID_INTERNET_ONLINE ".uno:InternetOnline" +#define CMD_SID_INTERNET_SEARCH ".uno:InternetSearch" +#define CMD_SID_DOC_LOADING ".uno:IsLoading" +#define CMD_SID_IMG_LOADING ".uno:IsLoadingImages" +#define CMD_SID_PRINTOUT ".uno:IsPrinting" +#define CMD_SID_JUMPTOMARK ".uno:JumpToMark" +#define CMD_SID_DOCINFO_KEYWORDS ".uno:Keywords" +#define CMD_SID_BASICIDE_LIBLOADED ".uno:LibLoaded" +#define CMD_SID_BASICIDE_LIBREMOVED ".uno:LibRemoved" +#define CMD_SID_BASICIDE_LIBSELECTED ".uno:LibSelect" +#define CMD_SID_BASICIDE_LIBSELECTOR ".uno:LibSelector" +#define CMD_SID_OFFICE_PLK ".uno:LicenceKey" +#define CMD_SID_CONFIGACCEL ".uno:LoadAccel" +#define CMD_SID_BASICLOAD ".uno:LoadBasic" +#define CMD_SID_LOADCONFIG ".uno:LoadConfiguration" +#define CMD_SID_CONFIGEVENT ".uno:LoadEvents" +#define CMD_SID_CONFIGMENU ".uno:LoadMenu" +#define CMD_SID_CONFIGSTATUSBAR ".uno:LoadStatusBar" +#define CMD_SID_TOOLBOXOPTIONS ".uno:LoadToolBox" +#define CMD_SID_LOGOUT ".uno:Logout" +#define CMD_SID_SCRIPTORGANIZER ".uno:ScriptOrganizer" +#define CMD_SID_MACROORGANIZER ".uno:MacroOrganizer" +#define CMD_SID_RUNMACRO ".uno:RunMacro" +#define CMD_SID_BASICCHOOSER ".uno:MacroDialog" +#define CMD_SID_MAIL_NOTIFY ".uno:MailReceipt" +#define CMD_SID_MAIL_CHILDWIN ".uno:MailWindow" +#define CMD_SID_BASICIDE_MATCHGROUP ".uno:MatchGroup" +#define CMD_SID_TOGGLE_MENUBAR ".uno:MenuBarVisible" +#define CMD_SID_DOCUMENT_MERGE ".uno:MergeDocuments" +#define CMD_SID_ATTR_METRIC ".uno:MetricUnit" +#define CMD_SID_MODIFIED ".uno:Modified" +#define CMD_SID_DOC_MODIFIED ".uno:ModifiedStatus" +#define CMD_SID_BASICIDE_MODULEDLG ".uno:ModuleDialog" +#define CMD_SID_BASICIDE_NAMECHANGEDONTAB ".uno:NameChangedOnTab" +#define CMD_SID_NAVIGATOR ".uno:Navigator" +#define CMD_SID_RESTORE_EDITING_VIEW ".uno:RestoreEditingView" +#define CMD_SID_BASICIDE_NEWDIALOG ".uno:NewDialog" +#define CMD_SID_BASICIDE_NEWMODULE ".uno:NewModule" +#define CMD_SID_CREATE_BASICOBJECT ".uno:NewObject" +#define CMD_SID_STYLE_NEW ".uno:NewStyle" +#define CMD_SID_NEWWINDOW ".uno:NewWindow" +#define CMD_SID_BASICIDE_OBJCAT ".uno:ObjectCatalog" +#define CMD_SID_OBJECT ".uno:ObjectMenue" +#define CMD_SID_OLD_PALK ".uno:OldPALK" +#define CMD_SID_OPENDOC ".uno:Open" +#define CMD_SID_WEBHTML ".uno:WebHtml" +#define CMD_SID_OPENHYPERLINK ".uno:OpenHyperlink" +#define CMD_SID_DOCINFO_TITLE ".uno:DocInfoTitle" +#define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate" +#define CMD_SID_OPENURL ".uno:OpenUrl" +#define CMD_SID_OPTIONS ".uno:Options" +#define CMD_SID_ORGANIZER ".uno:Organizer" +#define CMD_SID_STYLE_FAMILY4 ".uno:PageStyle" +#define CMD_SID_STYLE_FAMILY2 ".uno:ParaStyle" +#define CMD_SID_PARTWIN ".uno:PartWindow" +#define CMD_SID_PASTE ".uno:Paste" +#define CMD_SID_CLIPBOARD_FORMAT_ITEMS ".uno:ClipboardFormatItems" +#define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial" +#define CMD_SID_DOCPATH ".uno:DocPath" +#define CMD_SID_PICKLIST ".uno:PickList" +#define CMD_SID_PLUGINS_ACTIVE ".uno:PlugInsActive" +#define CMD_SID_PRINTDOC ".uno:Print" +#define CMD_SID_PRINTDOCDIRECT ".uno:PrintDefault" +#define CMD_SID_PRINTER_NAME ".uno:Printer" +#define CMD_SID_SETUPPRINTER ".uno:PrinterSetup" +#define CMD_SID_PRINTPREVIEW ".uno:PrintPreview" +#define CMD_SID_OFFICE_PRIVATE_USE ".uno:PrivateUse" +#define CMD_SID_DOCINFO ".uno:SetDocumentProperties" +#define CMD_SID_QUITAPP ".uno:Quit" +#define CMD_SID_DOC_READONLY ".uno:ReadOnly" +#define CMD_SID_RECORDMACRO ".uno:MacroRecorder" +#define CMD_SID_STOP_RECORDING ".uno:StopRecording" +#define CMD_SID_RECORDING_FLOATWINDOW ".uno:MacroRecordingFloat" +#define CMD_SID_REDO ".uno:Redo" +#define CMD_SID_DELETE_BASICOBJECT ".uno:ReleaseObject" +#define CMD_SID_RELOAD ".uno:Reload" +#define CMD_SID_BASICIDE_REMOVEWATCH ".uno:RemoveWatch" +#define CMD_SID_BASICIDE_RENAMECURRENT ".uno:RenameCurrent" +#define CMD_SID_REPAINT ".uno:Repaint" +#define CMD_SID_REPEAT ".uno:RepeatAction" +#define CMD_SID_RUBY_DIALOG ".uno:RubyDialog" +#define CMD_SID_BASICRUN ".uno:RunBasic" +#define CMD_SID_SAVEDOC ".uno:Save" +#define CMD_SID_SAVEDOCS ".uno:SaveAll" +#define CMD_SID_SAVEASDOC ".uno:SaveAs" +#define CMD_SID_DOCTEMPLATE ".uno:SaveAsTemplate" +#define CMD_SID_BASICSAVEAS ".uno:SaveBasicAs" +#define CMD_SID_EXPORT_DIALOG ".uno:ExportDialog" +#define CMD_SID_IMPORT_DIALOG ".uno:ImportDialog" +#define CMD_SID_SAVECONFIG ".uno:SaveConfiguration" +#define CMD_SID_DOC_SAVED ".uno:Saved" +#define CMD_SID_BASICIDE_SBXDELETED ".uno:SbxDeleted" +#define CMD_SID_BASICIDE_SBXINSERTED ".uno:SbxInserted" +#define CMD_SID_BASICIDE_SBXRENAMED ".uno:SbxRenamed" +#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN ".uno:ScrollBodyPageDown" +#define CMD_SID_SEARCH_DLG ".uno:SearchDialog" +#define CMD_SID_SEARCH_OPTIONS ".uno:SearchOptions" +#define CMD_SID_SEARCH_ITEM ".uno:SearchProperties" +#define CMD_SID_SELECTALL ".uno:SelectAll" +#define CMD_FN_FAX ".uno:SendFax" +#define CMD_SID_MAIL_SENDDOC ".uno:SendMail" +#define CMD_SID_MAIL_SENDDOCASPDF ".uno:SendMailDocAsPDF" +#define CMD_SID_MAIL_SENDDOCASFORMAT ".uno:SendMailDocAsFormat" +#define CMD_SID_MAIL_SENDDOCASMS ".uno:SendMailDocAsMS" +#define CMD_SID_MAIL_SENDDOCASOOO ".uno:SendMailDocAsOOo" +#define CMD_SID_SETOPTIONS ".uno:SetOptions" +#define CMD_SID_OFFICE_PALK ".uno:SetPALK" +#define CMD_SID_SHOW_BROWSER ".uno:ShowBrowser" +#define CMD_SID_SHOWPOPUPS ".uno:ShowPopups" +#define CMD_SID_BASICIDE_SHOWSBX ".uno:ShowSbx" +#define CMD_SID_SOURCEVIEW ".uno:SourceView" +#define CMD_SID_ONLINE_REGISTRATION_DLG ".uno:StartRegistrationDialog" +#define CMD_SID_STATUSBARTEXT ".uno:StatusBar" +#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible" +#define CMD_SID_BASICIDE_STAT_DATE ".uno:StatusGetDate" +#define CMD_SID_BASICIDE_STAT_POS ".uno:StatusGetPosition" +#define CMD_SID_BASICIDE_STAT_TITLE ".uno:StatusGetTitle" +#define CMD_SID_BASICIDE_STOREALLMODULESOURCES ".uno:StoreAllModuleSources" +#define CMD_SID_BASICIDE_STOREMODULESOURCE ".uno:StoreModuleSource" +#define CMD_SID_STYLE_APPLY ".uno:StyleApplyState" +#define CMD_SID_STYLE_CATALOG ".uno:StyleCatalog" +#define CMD_SID_STYLE_NEW_BY_EXAMPLE ".uno:StyleNewByExample" +#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE ".uno:StyleUpdateByExample" +#define CMD_SID_STYLE_WATERCAN ".uno:StyleWatercanMode" +#define CMD_SID_VIEWSHELL ".uno:SwitchViewShell" +#define CMD_SID_TASKBAR ".uno:TaskBarVisible" +#define CMD_SID_STYLE_FAMILY5 ".uno:ListStyle" +#define CMD_SID_TIPWINDOW ".uno:TipsDialog" +#define CMD_SID_DOCTITLE ".uno:Title" +#define CMD_SID_TITLE ".uno:Title" +#define CMD_SID_BASICIDE_TOGGLEBRKPNT ".uno:ToggleBreakPoint" +#define CMD_SID_BASICIDE_SHOWWINDOW ".uno:BasicIDEShowWindow" +#define CMD_SID_UNDO ".uno:Undo" +#define CMD_SID_FORMATPAINTBRUSH ".uno:FormatPaintbrush" +#define CMD_SID_ATTR_UNDO_COUNT ".uno:UndoCount" +#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES ".uno:UpdateAllModuleSources" +#define CMD_SID_BASICIDE_UPDATEMODULESOURCE ".uno:UpdateModuleSource" +#define CMD_SID_BASICIDE_MANAGEBRKPNTS ".uno:ManageBreakPoints" +#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED ".uno:ToggleBreakPointEnabled" +#define CMD_SID_UPDATE_VERSION ".uno:UpdateVersion" +#define CMD_SID_VERSION ".uno:VersionDialog" +#define CMD_SID_SIGNATURE ".uno:Signature" +#define CMD_SID_MACRO_SIGNATURE ".uno:MacroSignature" +#define CMD_SID_VERSION_VISIBLE ".uno:VersionVisible" +#define CMD_SID_VIEW_DATA_SOURCE_BROWSER ".uno:ViewDataSourceBrowser" +#define CMD_SID_WIN_VISIBLE ".uno:WinVisible" +#define CMD_SID_MDIWINDOWLIST ".uno:WindowList" +#define CMD_SID_ZOOM_IN ".uno:ZoomMinus" +#define CMD_SID_ZOOM ".uno:Zooming" +#define CMD_SID_ZOOM_NEXT ".uno:ZoomNext" +#define CMD_SID_ZOOM_OUT ".uno:ZoomPlus" +#define CMD_SID_ZOOM_PREV ".uno:ZoomPrevious" +#define CMD_SID_ZOOM_TOOLBOX ".uno:ZoomToolBox" +#define CMD_SID_EXPORTDOC ".uno:ExportTo" +#define CMD_SID_EXPORTDOCASPDF ".uno:ExportToPDF" +#define CMD_SID_DIRECTEXPORTDOCASPDF ".uno:ExportDirectToPDF" +#define CMD_SID_IMAGE_ORIENTATION ".uno:ImageOrientation" +#define CMD_SID_SAVE_VERSION_ON_CLOSE ".uno:SaveVersionOnClose" +#define CMD_SID_ADDONS ".uno:Addons" +#define CMD_SID_SHOW_IME_STATUS_WINDOW ".uno:ShowImeStatusWindow" +#define CMD_SID_UPDATE_CONFIG ".uno:UpdateConfiguration" +#define CMD_SID_HELP_SUPPORTPAGE ".uno:HelpSupport" +#define CMD_SID_HELP_TUTORIALS ".uno:HelpTutorials" +#define CMD_SID_ADDONHELP ".uno:AddonHelp" +#define CMD_SID_FORMATMENUSTATE ".uno:FormatMenuState" +#define CMD_SID_INET_DLG ".uno:InternetDialog" +#define CMD_SID_ONLINE_REGISTRATION ".uno:OnlineRegistrationDlg" +#define CMD_SID_OFFICE_CHECK_PLZ ".uno:CheckPLZ" +#define CMD_SID_ADDRESS_DATA_SOURCE ".uno:AutoPilotAddressDataSource" +#define CMD_FN_BUSINESS_CARD ".uno:InsertBusinessCard" +#define CMD_FN_LABEL ".uno:InsertLabels" +#define CMD_FN_XFORMS_INIT ".uno:NewXForms" +#define CMD_SID_SD_AUTOPILOT ".uno:AutoPilotPresentations" +#define CMD_SID_NEWSD ".uno:NewPresentation" +#define CMD_SID_COMP_BIBLIOGRAPHY ".uno:BibliographyComponent" +#define CMD_SID_MINIMIZED ".uno:Minimized" +#define CMD_SID_AUTO_CORRECT_DLG ".uno:AutoCorrectDlg" +#define CMD_SID_OPTIONS_TREEDIALOG ".uno:OptionsTreeDialog" +#define CMD_SID_TERMINATE_INPLACEACTIVATION ".uno:TerminateInplaceActivation" +#define CMD_SID_RECENTFILELIST ".uno:RecentFileList" +#define CMD_SID_AVAILABLE_TOOLBARS ".uno:AvailableToolbars" +#define CMD_SID_AVMEDIA_PLAYER ".uno:AVMediaPlayer" +#define CMD_SID_INSERT_AVMEDIA ".uno:InsertAVMedia" +#define CMD_SID_MORE_DICTIONARIES ".uno:MoreDictionaries" +#define CMD_SID_ACTIVATE_STYLE_APPLY ".uno:ActivateStyleApply" +#define CMD_SID_DOCKWIN_0 ".uno:DockingWindow0" +#define CMD_SID_DOCKWIN_1 ".uno:DockingWindow1" +#define CMD_SID_DOCKWIN_2 ".uno:DockingWindow2" +#define CMD_SID_DOCKWIN_3 ".uno:DockingWindow3" +#define CMD_SID_DOCKWIN_4 ".uno:DockingWindow4" +#define CMD_SID_DOCKWIN_5 ".uno:DockingWindow5" +#define CMD_SID_DOCKWIN_6 ".uno:DockingWindow6" +#define CMD_SID_DOCKWIN_7 ".uno:DockingWindow7" +#define CMD_SID_DOCKWIN_8 ".uno:DockingWindow8" +#define CMD_SID_DOCKWIN_9 ".uno:DockingWindow9" +#define CMD_SID_PASTE_UNFORMATTED ".uno:PasteUnformatted" + +#endif diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx index 95b8647a6eb0..2a9c64a87936 100644..100755 --- a/sfx2/inc/sfx2/sfxdefs.hxx +++ b/sfx2/inc/sfx2/sfxdefs.hxx @@ -33,7 +33,7 @@ #define MESSAGEFILE_EXT "smd" // Extension der Single-Mail/News-Files #define MESSAGETEMPFILE_EXT "sd~" // Extension f"ur Mail/News-TempFiles -#define SfxFilterFlags ULONG +#define SfxFilterFlags sal_uLong #define PRODUCT_VERSION "5.0" #endif diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index 8b4f151e6ca8..b1ab1b879c98 100644..100755 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -55,7 +55,7 @@ struct TransferableObjectDescriptor; #include <sfx2/tabdlg.hxx> //typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -//typedef USHORT* (*GetTabPageRanges)(); +//typedef sal_uInt16* (*GetTabPageRanges)(); namespace sfx2 { @@ -77,8 +77,8 @@ public: class SfxAbstractTabDialog : public SfxAbstractDialog { public: - virtual void SetCurPageId( USHORT nId ) = 0; - virtual const USHORT* GetInputRanges( const SfxItemPool& ) = 0; + virtual void SetCurPageId( sal_uInt16 nId ) = 0; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0; virtual void SetInputSet( const SfxItemSet* pInSet ) = 0; }; @@ -87,7 +87,7 @@ class SfxAbstractInsertObjectDialog : public VclAbstractDialog public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0; - virtual BOOL IsCreateNew()=0; + virtual sal_Bool IsCreateNew()=0; }; class SfxAbstractPasteDialog : public VclAbstractDialog @@ -95,7 +95,7 @@ class SfxAbstractPasteDialog : public VclAbstractDialog public: virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ) = 0; virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName ) = 0; - virtual ULONG GetFormat( const TransferableDataHelper& aHelper, + virtual sal_uIntPtr GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, const TransferableObjectDescriptor* pDesc=0 ) = 0; }; @@ -132,21 +132,21 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const String *pUserButtonText=0 ) = 0; - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0; virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - BOOL bShowSlots, + sal_Bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx index 2a25941cb91d..8c11031ff8e9 100644..100755 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfx2/sfxhelp.hxx @@ -46,12 +46,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); - SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); - + SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); + SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); + SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -61,12 +60,11 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); - static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); + using Help::OpenHelpAgent; + static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId ); static String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); }; diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 86c6f4243b71..3141c862db39 100644..100755 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -50,32 +50,32 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser SfxMedium* pMedium; SfxMedium *pDLMedium; // Medium fuer Download von Files - USHORT nMetaTags; // Anzahl der bisher gelesenen Meta-Tags + sal_uInt16 nMetaTags; // Anzahl der bisher gelesenen Meta-Tags ScriptType eScriptType; SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* ); protected: - SfxHTMLParser( SvStream& rStream, BOOL bNewDoc=TRUE, SfxMedium *pMedium=0 ); + SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 ); virtual ~SfxHTMLParser(); public: // Lesen der Optionen einer Image-Map - // <MAP>: TRUE = Image-Map hat einen Namen - // <AREA>: TRUE = Image-Map hat jetzt einen Bereich mehr - static BOOL ParseMapOptions(ImageMap * pImageMap, + // <MAP>: sal_True = Image-Map hat einen Namen + // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr + static sal_Bool ParseMapOptions(ImageMap * pImageMap, const HTMLOptions * pOptions ); - BOOL ParseMapOptions(ImageMap * pImageMap) + sal_Bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } - static BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, const HTMLOptions * pOptions, - USHORT nEventMouseOver = 0, - USHORT nEventMouseOut = 0 ); - inline BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - USHORT nEventMouseOver = 0, - USHORT nEventMouseOut = 0); + sal_uInt16 nEventMouseOver = 0, + sal_uInt16 nEventMouseOut = 0 ); + inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + sal_uInt16 nEventMouseOver = 0, + sal_uInt16 nEventMouseOut = 0); // <TD SDVAL="..." SDNUM="..."> static double GetTableDataOptionsValNum( sal_uInt32& nNumForm, @@ -99,14 +99,14 @@ protected: void StartFileDownload( const String& rURL, int nToken, SfxObjectShell *pSh=0 ); - // Beenden eines asynchronen File-Downloads. Gibt TRUE zurueck, wenn + // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn // der Download geklappt hat. Das gelesene File befindet sich dann in // dem uebergeben String. - BOOL FinishFileDownload( String& rStr ); + sal_Bool FinishFileDownload( String& rStr ); - // Gibt TRUE zurueck, wenn ein File downloaded wurde und + // Gibt sal_True zurueck, wenn ein File downloaded wurde und // FileDownloadFinished noch nicht gerufen wurde. - BOOL ShouldFinishFileDownload() const { return pDLMedium != 0; } + sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; } SfxMedium *GetMedium() { return pMedium; } const SfxMedium *GetMedium() const { return pMedium; } @@ -116,9 +116,9 @@ protected: const String& GetScriptTypeString( SvKeyValueIterator* ) const; }; -inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - USHORT nEventMouseOver, - USHORT nEventMouseOut) +inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + sal_uInt16 nEventMouseOver, + sal_uInt16 nEventMouseOut) { return ParseAreaOptions( pImageMap, rBaseURL, GetOptions(), nEventMouseOver, nEventMouseOut ); diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx index 37e6582b697d..37e6582b697d 100644..100755 --- a/sfx2/inc/sfx2/sfxmodelfactory.hxx +++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx index 8eb9412db12f..320d18bf0f03 100644..100755 --- a/sfx2/inc/sfxresid.hxx +++ b/sfx2/inc/sfx2/sfxresid.hxx @@ -29,13 +29,13 @@ #define _SFX_SFXRESID_HXX #include <tools/string.hxx> - +#include "sfx2/dllapi.h" #include <tools/resid.hxx> -class SfxResId: public ResId +class SFX2_DLLPUBLIC SfxResId: public ResId { public: - SfxResId( USHORT nId ); + SfxResId( sal_uInt16 nId ); static ResMgr* GetResMgr(); static void DeleteResMgr(); }; @@ -46,7 +46,7 @@ class SfxSimpleResId String m_sText; public: - SfxSimpleResId(USHORT nID); + SfxSimpleResId(sal_uInt16 nID); String getText() const { return m_sText; } diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 6e87e86c89a0..268c8f9a671f 100644..100755 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -94,6 +94,8 @@ #define SID_MAIL_PRIORITY (SID_SFX_START + 337) #define SID_MAIL_ATTACH_FILE (SID_SFX_START + 375) +#define SID_MAIL_PREPAREEXPORT (SID_SFX_START + 385) +#define SID_MAIL_NEEDS_PREPAREEXPORT (SID_SFX_START + 386) #define SID_MAIL_EXPORT_FINISHED (SID_SFX_START + 388) #define SID_WEBHTML (SID_SFX_START + 393) @@ -193,7 +195,7 @@ #define SID_EXPLORER_FILEPROPS_END (SID_SFX_START + 1399) #define ID_FILETP_START SID_EXPLORER_FILEPROPS_START -#define ID_FILETP_READONLY (ID_FILETP_START + 0) +#define ID_FILETP_READONLY (ID_FILETP_START + 0) #define ID_FILETP_TITLE (ID_FILETP_START + 1) #define SID_EXPLORER_PROPS_START (SID_SFX_START + 1410) @@ -227,9 +229,9 @@ #define SID_OFFICE_PLK (SID_SFX_START + 1601) #define SID_OFFICE_PALK (SID_SFX_START + 1604) #define SID_CHECK_KEY (SID_SFX_START + 1605) -#define SID_OFFICE_PRIVATE_USE (SID_SFX_START + 1606) -#define SID_OFFICE_COMMERCIAL_USE (SID_SFX_START + 1607) -#define SID_OFFICE_CUSTOMERNUMBER (SID_SFX_START + 1608) +#define SID_OFFICE_PRIVATE_USE (SID_SFX_START + 1606) +#define SID_OFFICE_COMMERCIAL_USE (SID_SFX_START + 1607) +#define SID_OFFICE_CUSTOMERNUMBER (SID_SFX_START + 1608) #define SID_OFFICE_INVALIDATE_TITLE (SID_SFX_START + 1609) #define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610) #define SID_INTERNET_SEARCH (SID_SFX_START + 1611) @@ -242,11 +244,11 @@ #define SID_NEW_MSG_PARENT (SID_SFX_START + 1622) -#define SID_PGP_ENCODE (SID_SFX_START + 1625) -#define SID_PGP_DECODE (SID_SFX_START + 1626) -#define SID_TIPWINDOW (SID_SFX_START + 1632) +#define SID_PGP_ENCODE (SID_SFX_START + 1625) +#define SID_PGP_DECODE (SID_SFX_START + 1626) +#define SID_TIPWINDOW (SID_SFX_START + 1632) #define SID_CHARSET (SID_SFX_START + 1633) -#define SID_OVERWRITE (SID_SFX_START + 1634) +#define SID_OVERWRITE (SID_SFX_START + 1634) #define SID_RENAME (SID_SFX_START + 1653) #define SID_PARTWIN (SID_SFX_START + 1640) #define SID_CRASH (SID_SFX_START + 1645) @@ -277,7 +279,7 @@ #define SID_SHOW_IME_STATUS_WINDOW (SID_SFX_START + 1680) #define SID_UPDATE_CONFIG (SID_SFX_START + 1681) #define SID_VIEWONLY (SID_SFX_START + 1682) -#define SID_REPAIRPACKAGE (SID_SFX_START + 1683) +#define SID_REPAIRPACKAGE (SID_SFX_START + 1683) #define SID_ADDONHELP (SID_SFX_START + 1684) #define SID_OBJECTSHELL (SID_SFX_START + 1685) #define SID_MINIMIZED (SID_SFX_START + 1687) @@ -311,7 +313,11 @@ #define SID_DEFAULTFILENAME (SID_SFX_START + 1717) #define SID_MODIFYPASSWORDINFO (SID_SFX_START + 1718) #define SID_RECOMMENDREADONLY (SID_SFX_START + 1719) -#define SID_SFX_free_START (SID_SFX_START + 1720) +#define SID_SUGGESTEDSAVEASDIR (SID_SFX_START + 1720) +#define SID_SUGGESTEDSAVEASNAME (SID_SFX_START + 1721) +#define SID_ENCRYPTIONDATA (SID_SFX_START + 1722) +#define SID_PASSWORDINTERACTION (SID_SFX_START + 1723) +#define SID_SFX_free_START (SID_SFX_START + 1724) #define SID_SFX_free_END (SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) @@ -424,7 +430,6 @@ #define SID_INSERT_PLUGIN (SID_SFX_START + 672) #define SID_INSERT_SOUND (SID_SFX_START + 676) #define SID_INSERT_VIDEO (SID_SFX_START + 677) -#define SID_INSERT_APPLET (SID_SFX_START + 673) #define SID_HYPERLINK_DIALOG (SID_SFX_START + 678) @@ -496,7 +501,7 @@ #define SID_PASTE (SID_SFX_START + 712) // steht unter diesem Wert in chaos/cntids.hrc!!! -//#define SID_DELETE (SID_SFX_START + 713) +//#define SID_DELETE (SID_SFX_START + 713) #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH (SID_SFX_START + 715) @@ -520,41 +525,29 @@ #define SID_CURSORTOPOFSCREEN (SID_SFX_START + 744) #define SID_CURSORHOME (SID_SFX_START + 745) #define SID_CURSOREND (SID_SFX_START + 746) -#define SID_SCROLLDOWN (SID_SFX_START + 751) -#define SID_SCROLLUP (SID_SFX_START + 752) #define SID_FORMATMENU (SID_SFX_START + 780) #define SID_OBJECTMENU0 SID_FORMATMENU #define SID_OBJECTMENU1 (SID_SFX_START + 781) #define SID_OBJECTMENU2 (SID_SFX_START + 782) #define SID_OBJECTMENU3 (SID_SFX_START + 783) #define SID_OBJECTMENU_LAST SID_OBJECTMENU3 -#define SID_EDITMENU (SID_SFX_START + 790) #define SID_FORMATMENUSTATE (SID_SFX_START + 791) // default-ids for macros #define SID_RECORDING_FLOATWINDOW (SID_SFX_START + 800) #define SID_RECORDMACRO (SID_SFX_START + 1669) -#define SID_PLAYMACRO (SID_SFX_START + 801) -#define SID_EDITMACRO (SID_SFX_START + 802) -#define SID_MACROLIBMANAGER (SID_SFX_START + 803) -#define SID_LOADMACROLIB (SID_SFX_START + 804) -#define SID_RELEASEMACROLIB (SID_SFX_START + 805) -#define SID_BASICNAME (SID_SFX_START + 806) -#define SID_LIBNAME (SID_SFX_START + 807) -#define SID_MODULENAME (SID_SFX_START + 808) -#define SID_STATEMENT (SID_SFX_START + 810) + // FREE: SID_SFX_START + 801 + // FREE: SID_SFX_START + 802 + // FREE: SID_SFX_START + 803 + // FREE: SID_SFX_START + 804 + // FREE: SID_SFX_START + 805 + // FREE: SID_SFX_START + 806 + // FREE: SID_SFX_START + 807 + // FREE: SID_SFX_START + 808 + // FREE: SID_SFX_START + 809 + // FREE: SID_SFX_START + 810 #define SID_ASYNCHRON (SID_SFX_START + 811) -#define SID_START_APP (SID_SFX_START + 820) -#define SID_START_BEGIN (SID_SFX_START + 821) -#define SID_STARTSW SID_START_BEGIN -#define SID_STARTSC (SID_START_BEGIN + 1) -#define SID_STARTSD (SID_START_BEGIN + 2) -#define SID_STARTSIM (SID_START_BEGIN + 3) -#define SID_STARTSCH (SID_START_BEGIN + 4) -#define SID_STARTSMA (SID_START_BEGIN + 5) -#define SID_START_END SID_STARTSMA - // default-ids for configuration #define SID_RESTOREMENU (SID_SFX_START + 901) #define SID_RESTOREACCELS (SID_SFX_START + 902) @@ -620,11 +613,9 @@ #define SID_OBJECTRESIZE (SID_SFX_START + 1000) #define SID_INSERT_TEXT (SID_SFX_START + 1001) -#define SID_MACRO_START (SID_SFX_START + 1002) -#define SID_MACRO_END (SID_SFX_START + 1100) -#define SID_EVENTCONFIG (SID_MACRO_END + 1) -#define SID_VERB_START (SID_MACRO_END + 2) -#define SID_VERB_END (SID_MACRO_END + 21) +#define SID_EVENTCONFIG (SID_SFX_START + 1101) +#define SID_VERB_START (SID_SFX_START + 1100) +#define SID_VERB_END (SID_SFX_START + 1121) #define SID_BROWSER_TASK (SID_MACRO_END + 22) @@ -660,7 +651,7 @@ #define SID_OPT_HELP_PATH (SID_SFX_START + 1560) #define SID_OPT_BOOKMARKS_PATH (SID_SFX_START + 1561) #define SID_OPT_GALLERY_PATH (SID_SFX_START + 1562) -#define SID_OPT_NEWDOC_PATH (SID_SFX_START + 1563) +#define SID_OPT_NEWDOC_PATH (SID_SFX_START + 1563) #define SID_OPT_AGENTS_PATH (SID_SFX_START + 1564) #define SID_OPT_AUTOPILOT_PATH (SID_SFX_START + 1565) #define SID_OPT_EXPLORER_PATH (SID_SFX_START + 1566) @@ -754,9 +745,9 @@ #define SID_ATTR_AUTOHELPAGENT (SID_OPTIONS_START + 67) #define SID_AUTOHELPAGENT_RESET (SID_OPTIONS_START + 68) #define SID_HELPAGENT_TIMEOUT (SID_OPTIONS_START + 93) -#define SID_ATTR_WELCOMESCREEN (SID_OPTIONS_START + 81) +#define SID_ATTR_WELCOMESCREEN (SID_OPTIONS_START + 81) #define SID_WELCOMESCREEN_RESET (SID_OPTIONS_START + 82) -#define SID_RESTORE_EXPAND_STATE (SID_OPTIONS_START + 83) +#define SID_RESTORE_EXPAND_STATE (SID_OPTIONS_START + 83) #define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74) #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87) #define SID_ATTR_ALLOWFOLDERWEBVIEW (SID_OPTIONS_START + 92) @@ -829,7 +820,7 @@ #define SID_INET_CHANNELS_ONOFF (SID_OPTIONS_START + 64) -#define SID_INET_COOKIESHANDLE (SID_OPTIONS_START + 69) +#define SID_INET_COOKIESHANDLE (SID_OPTIONS_START + 69) #define SID_INET_CACHEJS (SID_OPTIONS_START + 70) #define SID_INET_CACHEEXPIRED (SID_OPTIONS_START + 71) diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index 8d9f4c614763..c8b709e2aeb5 100644..100755 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -45,7 +45,7 @@ class SfxStatusListenerInterface { public: - virtual void StateChanged( USHORT nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0; + virtual void StateChanged( sal_uInt16 nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0; }; class SFX2_DLLPUBLIC SfxStatusListener : @@ -57,17 +57,17 @@ class SFX2_DLLPUBLIC SfxStatusListener : public: SFX_DECL_XINTERFACE_XTYPEPROVIDER - SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand ); + SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); virtual ~SfxStatusListener(); // old methods from SfxControllerItem - USHORT GetId() const { return m_nSlotID; } + sal_uInt16 GetId() const { return m_nSlotID; } void Bind(); - void Bind( USHORT nSlotID, const rtl::OUString& rNewCommand ); + void Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand ); void UnBind(); void ReBind(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); // XComponent virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); @@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : SfxStatusListener(); SfxStatusListener& operator=( const SfxStatusListener& ); - USHORT m_nSlotID; + sal_uInt16 m_nSlotID; ::com::sun::star::util::URL m_aCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch; diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 1933626ab1e3..d0fc3601b593 100644..100755 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/task/ErrorCodeIOException.hpp> +#include <com/sun/star/beans/NamedValue.hpp> //________________________________________________________________________________________________________________________ @@ -72,7 +73,6 @@ #define UNOPROPERTYVALUE ::com::sun::star::beans::PropertyValue #define UNOREFERENCE ::com::sun::star::uno::Reference #define UNORUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define UNOINVALIDREGISTRYEXCEPTION ::com::sun::star::registry::InvalidRegistryException #define UNOSEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type #define UNOURL ::com::sun::star::util::URL @@ -104,7 +104,7 @@ SFX2_DLLPUBLIC void TransformItems( sal_uInt16 UNOSEQUENCE< UNOPROPERTYVALUE >& seqArgs , const SfxSlot* pSlot = 0 ); -sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd ); +bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); #define FrameSearchFlags sal_Int32 @@ -590,52 +590,6 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd ); } //************************************************************************************************************************ -// definition for "extern c component_writeInfo()" -//************************************************************************************************************************ -#define COMPONENT_INFO(CLASS) \ - \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False ; \ - \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is () ) \ - { \ - /* Build new keyname */ \ - sKeyName = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/" )) ; \ - sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); \ - \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - \ - /* If this new key valid ... */ \ - if ( xNewKey.is () ) \ - { \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - xNewKey->createKey( pArray [nCounter] ); \ - } \ - \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( UNOINVALIDREGISTRYEXCEPTION& ) \ - { \ - bReturn = sal_False ; \ - } \ - -//************************************************************************************************************************ // definition for "extern c component_getFactory()" //************************************************************************************************************************ #define CREATEFACTORY(CLASS) \ diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 87de8bf275f5..fc6c273a9f6c 100644..100755 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -66,12 +66,16 @@ class SfxShellSubObject; class SfxDispatcher; class SfxViewFrame; class SfxSlot; -class SfxUndoManager; class SfxRepeatTarget; class SbxVariable; class SbxBase; class SfxBindings; +namespace svl +{ + class IUndoManager; +} + //==================================================================== enum SfxInterfaceId @@ -163,7 +167,7 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster SfxShell_Impl* pImp; SfxItemPool* pPool; - SfxUndoManager* pUndoMgr; + ::svl::IUndoManager* pUndoMgr; private: SfxShell( const SfxShell & ); // n.i. @@ -175,7 +179,7 @@ protected: #ifndef _SFXSH_HXX SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView ); - SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, USHORT nId ); + SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ); SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const; SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj ); #endif @@ -205,25 +209,26 @@ public: static void EmptyExecStub(SfxShell *pShell, SfxRequest &); static void EmptyStateStub(SfxShell *pShell, SfxItemSet &); - const SfxPoolItem* GetSlotState( USHORT nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); + const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 ); - const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, BOOL bAsync ); - ULONG ExecuteSlot( USHORT nSlot, USHORT nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 ); + const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync ); + sal_uIntPtr ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 ); inline SfxItemPool& GetPool() const; inline void SetPool( SfxItemPool *pNewPool ) ; - virtual SfxUndoManager* GetUndoManager(); - void SetUndoManager( SfxUndoManager *pNewUndoMgr ); + virtual ::svl::IUndoManager* + GetUndoManager(); + void SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ); SfxRepeatTarget* GetRepeatTarget() const; void SetRepeatTarget( SfxRepeatTarget *pTarget ); - virtual void Invalidate(USHORT nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0); - BOOL IsActive() const; - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); + sal_Bool IsActive() const; + virtual void Activate(sal_Bool bMDI); + virtual void Deactivate(sal_Bool bMDI); virtual void ParentActivate(); virtual void ParentDeactivate(); @@ -234,30 +239,30 @@ public: void UIFeatureChanged(); // Items - const SfxPoolItem* GetItem( USHORT nSlotId ) const; + const SfxPoolItem* GetItem( sal_uInt16 nSlotId ) const; void PutItem( const SfxPoolItem& rItem ); - void RemoveItem( USHORT nSlotId ); + void RemoveItem( sal_uInt16 nSlotId ); // TODO/CLEANUP: still needed?! void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs); const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const; void VerbExec (SfxRequest&); void VerbState (SfxItemSet&); - SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(USHORT nId) const; + SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const; - void SetHelpId(ULONG nId); - ULONG GetHelpId() const; + void SetHelpId(sal_uIntPtr nId); + sal_uIntPtr GetHelpId() const; virtual SfxObjectShell* GetObjectShell(); - void SetDisableFlags( ULONG nFlags ); - ULONG GetDisableFlags() const; + void SetDisableFlags( sal_uIntPtr nFlags ); + sal_uIntPtr GetDisableFlags() const; - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); #ifndef _SFXSH_HXX SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); - SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI); - SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI); + SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); + SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); #endif }; @@ -332,7 +337,7 @@ inline void SfxShell::SetPool #Class, NameResId, GetInterfaceId(), \ SuperClass::GetStaticInterface(), \ a##Class##Slots_Impl[0], \ - (USHORT) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) ); \ + (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) ); \ InitInterface_Impl(); \ } \ return pInterface; \ @@ -373,13 +378,13 @@ inline void SfxShell::SetPool GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature ) #define SFX_CHILDWINDOW_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False ) #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE, nFeature ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False, nFeature ) #define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) TRUE ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_True ) #define SFX_POPUPMENU_REGISTRATION(rResId) \ GetStaticInterface()->RegisterPopupMenu( rResId ) diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx index a7e68013d499..a7e68013d499 100644..100755 --- a/sfx2/inc/sfx2/signaturestate.hxx +++ b/sfx2/inc/sfx2/signaturestate.hxx diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx index df478dd04ecd..8be28db84d92 100644..100755 --- a/sfx2/inc/stbitem.hxx +++ b/sfx2/inc/sfx2/stbitem.hxx @@ -45,16 +45,16 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); -typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( USHORT nSlotId, USHORT nId, StatusBar &rStb ); +typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); struct SfxStbCtrlFactory { SfxStatusBarControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -69,8 +69,8 @@ class UserDrawEvent; class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController { - USHORT nSlotId; - USHORT nId; + sal_uInt16 nSlotId; + sal_uInt16 nId; StatusBar* pBar; protected: @@ -105,29 +105,29 @@ protected: virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); // Old sfx2 interface - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); - virtual BOOL MouseButtonDown( const MouseEvent & ); - virtual BOOL MouseMove( const MouseEvent & ); - virtual BOOL MouseButtonUp( const MouseEvent & ); + virtual sal_Bool MouseButtonDown( const MouseEvent & ); + virtual sal_Bool MouseMove( const MouseEvent & ); + virtual sal_Bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); - static USHORT convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); + static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); public: - SfxStatusBarControl( USHORT nSlotID, USHORT nId, StatusBar& rBar ); + SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar ); virtual ~SfxStatusBarControl(); - USHORT GetSlotId() const { return nSlotId; } - USHORT GetId() const { return nId; } + sal_uInt16 GetSlotId() const { return nSlotId; } + sal_uInt16 GetId() const { return nId; } StatusBar& GetStatusBar() const { return *pBar; } void CaptureMouse(); void ReleaseMouse(); - static SfxStatusBarControl* CreateControl( USHORT nSlotID, USHORT nId, StatusBar *pBar, SfxModule* ); + static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* ); static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*); }; @@ -135,13 +135,13 @@ public: //------------------------------------------------------------------ #define SFX_DECL_STATUSBAR_CONTROL() \ - static SfxStatusBarControl* CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) #define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \ - SfxStatusBarControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \ + SfxStatusBarControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \ { return new Class( nSlotId, nId, rStb ); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx index 5434daec054d..dd79ff6556f8 100644..100755 --- a/sfx2/inc/sfx2/styfitem.hxx +++ b/sfx2/inc/sfx2/styfitem.hxx @@ -39,7 +39,7 @@ struct SfxFilterTupel { String aName; - USHORT nFlags; + sal_uInt16 nFlags; }; typedef ::std::vector< SfxFilterTupel* > SfxStyleFilter; @@ -51,7 +51,7 @@ class SfxStyleFamilyItem: public Resource Bitmap aBitmap; String aText; String aHelpText; - USHORT nFamily; + sal_uInt16 nFamily; SfxStyleFilter aFilterList; public: diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx index 3094964babbb..4d121edf0e24 100644..100755 --- a/sfx2/inc/sfx2/styledlg.hxx +++ b/sfx2/inc/sfx2/styledlg.hxx @@ -46,7 +46,7 @@ protected: public: #define ID_TABPAGE_MANAGESTYLES 1 SfxStyleDialog( Window* pParent, const ResId& rResId, SfxStyleSheetBase&, - BOOL bFreeRes = TRUE, const String* pUserBtnTxt = 0 ); + sal_Bool bFreeRes = sal_True, const String* pUserBtnTxt = 0 ); ~SfxStyleDialog(); diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 01137af6831a..c426476cbf02 100644..100755 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -58,7 +58,7 @@ class SfxBindings; #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/ typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Wert +typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Wert struct TabPageImpl; class SfxUs_Impl; @@ -80,10 +80,10 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem { public: TYPEINFO(); - SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet ); + SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const; - virtual SfxPoolItem* Create(SvStream& rStream, USHORT nVersion) const; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog @@ -105,11 +105,11 @@ friend class SfxTabDialogController; const SfxItemSet* pSet; SfxItemSet* pOutSet; TabDlg_Impl* pImpl; - USHORT* pRanges; + sal_uInt16* pRanges; sal_uInt32 nResId; - USHORT nAppPageId; - BOOL bItemsReset; - BOOL bFmt; + sal_uInt16 nAppPageId; + sal_Bool bItemsReset; + sal_Bool bFmt; DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * ); @@ -118,80 +118,80 @@ friend class SfxTabDialogController; DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * ); DECL_DLLPRIVATE_LINK( UserHdl, Button * ); DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); - SAL_DLLPRIVATE void Init_Impl(BOOL, const String *); + SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *); protected: virtual short Ok(); // wird im Sfx gel"oscht! - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); // wird *nicht* im Sfx gel"oscht! virtual const SfxItemSet* GetRefreshedSet(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual long Notify( NotifyEvent& rNEvt ); SfxItemSet* pExampleSet; SfxItemSet* GetInputSetImpl(); - SfxTabPage* GetTabPage( USHORT nPageId ) const; + SfxTabPage* GetTabPage( sal_uInt16 nPageId ) const; - BOOL IsInOK() const; + sal_Bool IsInOK() const; /** prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary), handles the item sets to copy. - @return TRUE if it is allowed to leave the current page, FALSE otherwise + @return sal_True if it is allowed to leave the current page, sal_False otherwise */ bool PrepareLeaveCurrentPage(); public: - SfxTabDialog( Window* pParent, const ResId &rResId, USHORT nSetId, SfxBindings& rBindings, - BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 ); + SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings, + sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0, - BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 ); + sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, - const SfxItemSet * = 0, BOOL bEditFmt = FALSE, + const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); ~SfxTabDialog(); - void AddTabPage( USHORT nId, + void AddTabPage( sal_uInt16 nId, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False); + void AddTabPage( sal_uInt16 nId, const String &rRiderText, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); + void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); - void AddTabPage( USHORT nId, - BOOL bItemsOnDemand = FALSE); - void AddTabPage( USHORT nId, + void AddTabPage( sal_uInt16 nId, + sal_Bool bItemsOnDemand = sal_False); + void AddTabPage( sal_uInt16 nId, const String &rRiderText, - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); + void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); - void RemoveTabPage( USHORT nId ); + void RemoveTabPage( sal_uInt16 nId ); - void SetCurPageId( USHORT nId ) { nAppPageId = nId; } - USHORT GetCurPageId() const + void SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; } + sal_uInt16 GetCurPageId() const { return aTabCtrl.GetCurPageId(); } - void ShowPage( USHORT nId ); + void ShowPage( sal_uInt16 nId ); // liefert ggf. per Map konvertierte lokale Slots - const USHORT* GetInputRanges( const SfxItemPool& ); + const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ) const; + const SfxItemSet* GetOutputItemSet( sal_uInt16 nId ) const; int FillOutputItemSet(); - BOOL IsFormat() const { return bFmt; } + sal_Bool IsFormat() const { return bFmt; } const OKButton& GetOKButton() const { return aOKBtn; } OKButton& GetOKButton() { return aOKBtn; } @@ -211,7 +211,7 @@ public: short Execute(); void StartExecuteModal( const Link& rEndDialogHdl ); - void Start( BOOL bShow = TRUE ); + void Start( sal_Bool bShow = sal_True ); #if !ENABLE_LAYOUT_SFX_TABDIALOG const SfxItemSet* GetExampleSet() const { return pExampleSet; } @@ -220,13 +220,13 @@ public: #endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ SfxViewFrame* GetViewFrame() const { return pFrame; } - void EnableApplyButton(BOOL bEnable = TRUE); - BOOL IsApplyButtonEnabled() const; + void EnableApplyButton(sal_Bool bEnable = sal_True); + sal_Bool IsApplyButtonEnabled() const; void SetApplyHandler(const Link& _rHdl); Link GetApplyHandler() const; SAL_DLLPRIVATE void Start_Impl(); - SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); } + SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); } }; END_NAMESPACE_LAYOUT_SFX_TABDIALOG @@ -249,7 +249,7 @@ friend class SfxTabDialog; private: const SfxItemSet* pSet; String aUserString; - BOOL bHasExchangeSupport; + sal_Bool bHasExchangeSupport; SfxTabDialog* pTabDlg; TabPageImpl* pImpl; @@ -260,12 +260,12 @@ protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ); - USHORT GetSlot( USHORT nWhich ) const + sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - USHORT GetWhich( USHORT nSlot, sal_Bool bDeep = sal_True ) const + sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); + const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); + const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, sal_uInt16 nSlot ); SfxTabDialog* GetTabDialog() const { return pTabDlg; } void AddItemConnection( sfx::ItemConnectionBase* pConnection ); @@ -275,12 +275,12 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); - BOOL HasExchangeSupport() const + sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( BOOL bNew = TRUE ) + void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; } enum sfxpg { @@ -301,9 +301,9 @@ public: { aUserString = rString; } String GetUserData() { return aUserString; } virtual void FillUserData(); - virtual BOOL IsReadOnly() const; + virtual sal_Bool IsReadOnly() const; virtual void PageCreated (SfxAllItemSet aSet); - static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True ); + static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx index 1086efde6fd9..f80b66c4d0ee 100644..100755 --- a/sfx2/inc/sfx2/taskpane.hxx +++ b/sfx2/inc/sfx2/taskpane.hxx @@ -66,7 +66,7 @@ namespace sfx2 public: TaskPaneWrapper( Window* i_pParent, - USHORT i_nId, + sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ); diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index caa17a247694..3051f3ed188f 100644..100755 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -56,16 +56,16 @@ class SfxUnoControllerItem; svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); -typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox ); +typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); struct SfxTbxCtrlFactory { SfxToolBoxControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -112,11 +112,11 @@ class SfxFrameStatusListener : public svt::FrameStatusListener class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface { friend class SfxToolBox_Impl; - BOOL m_bFloating; - ULONG m_nEventId; - BOOL m_bCascading; + sal_Bool m_bFloating; + sal_uIntPtr m_nEventId; + sal_Bool m_bCascading; Link m_aDeleteLink; - USHORT m_nId; + sal_uInt16 m_nId; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; SfxFrameStatusListener* m_pStatusListener; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xStatusListener; @@ -131,10 +131,10 @@ private: protected: virtual void PopupModeEnd(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void DeleteFloatingWindow(); - USHORT GetId() const { return m_nId; } + sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& GetServiceManager() const { return m_xServiceManager; } @@ -146,21 +146,21 @@ protected: // SfxStatusListenerInterface using FloatingWindow::StateChanged; - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ResId &rId ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const ResId &rId ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, WinBits nBits ); @@ -181,8 +181,8 @@ public: //------------------------------------------------------------------ #define SFX_DECL_TOOLBOX_CONTROL() \ - static SfxToolBoxControl* CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) /* F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass @@ -214,9 +214,9 @@ protected: DECL_LINK( ClosePopupWindow, SfxPopupWindow * ); // old SfxToolBoxControl methods - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Select( BOOL bMod1 = FALSE ); - virtual void Select( USHORT nModifier ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void Select( sal_uInt16 nModifier ); virtual void DoubleClick(); virtual void Click(); @@ -279,7 +279,7 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SfxToolBoxControl( USHORT nSlotID, USHORT nId, ToolBox& rBox, BOOL bShowStrings = FALSE ); + SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False ); virtual ~SfxToolBoxControl(); ToolBox& GetToolBox() const; @@ -293,21 +293,21 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static SfxItemState GetItemState( const SfxPoolItem* pState ); - static SfxToolBoxControl* CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule *pMod ); + static SfxToolBoxControl* CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod ); static void RegisterToolBoxControl( SfxModule*, SfxTbxCtrlFactory*); }; #define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \ - SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \ + SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx ); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } #define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \ - SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \ + SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx, Arg); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } @@ -328,10 +328,10 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SfxDragToolBoxControl_Impl( USHORT nId, ToolBox& rBox ); + SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); virtual Window* CreateItemWindow( Window *pParent ); using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); }; //------------------------------------------------------------------------ @@ -347,7 +347,7 @@ class SfxAppToolBoxControl_Impl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); ~SfxAppToolBoxControl_Impl(); void SetImage( const String& rFacName ); @@ -363,16 +363,16 @@ public: protected: virtual void Click(); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* CreatePopupWindow(); DECL_LINK( Activate, Menu * ); private: String aLastURL; - BOOL bBigImages; + sal_Bool bBigImages; PopupMenu* pMenu; - ULONG m_nSymbolsStyle; - BOOL m_bShowMenuImages; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bShowMenuImages; }; class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl @@ -385,22 +385,22 @@ private: protected: virtual void Click( ); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); + virtual void Select( sal_Bool ); public: SFX_DECL_TOOLBOX_CONTROL(); - SfxHistoryToolBoxControl_Impl( USHORT nId, ToolBox& rBox ); + SfxHistoryToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); }; class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: using SfxToolBoxControl::Select; - virtual void Select( USHORT nSelectModifier ); + virtual void Select( sal_uInt16 nSelectModifier ); public: SFX_DECL_TOOLBOX_CONTROL(); - SfxReloadToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); }; class SfxPopupMenuManager; @@ -413,19 +413,19 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl */ { - BOOL bBigImages; + sal_Bool bBigImages; PopupMenu* pMenu; - BOOL m_bShowMenuImages; + sal_Bool m_bShowMenuImages; protected: virtual void Click(); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); DECL_LINK( Activate, Menu * ); public: SFX_DECL_TOOLBOX_CONTROL(); - SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); ~SfxAddonsToolBoxControl_Impl(); void RefreshMenuImages( Menu* pMenu ); diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx index 22303fda3a21..e235e760698c 100644..100755 --- a/sfx2/inc/sfx2/templdlg.hxx +++ b/sfx2/inc/sfx2/templdlg.hxx @@ -93,7 +93,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow { public: SfxTemplateDialogWrapper - (Window*,USHORT,SfxBindings*,SfxChildWinInfo*); + (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(SfxTemplateDialogWrapper); void SetParagraphFamily(); diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index b8606a84a836..8b03be062387 100644..100755 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -77,7 +77,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - USHORT AddDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -101,6 +101,11 @@ namespace sfx2 ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } + /** Return the border that is painted around the inner window as + decoration. + */ + SvBorder GetDecorationBorder (void) const { return m_aBorder; } + protected: // Window overridables virtual void Paint( const Rectangle& i_rArea ); @@ -110,7 +115,7 @@ namespace sfx2 virtual void SetText( const String& i_rText ); // DockingWindow overridables - void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); // own overridables virtual void onLayoutDone(); @@ -122,7 +127,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - USHORT impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ); /** returns the current title. @@ -154,6 +159,11 @@ namespace sfx2 since the last Paint(). */ bool m_bLayoutPending; + + /** Height of the title bar. Calculated in impl_layout(). + */ + int m_nTitleBarHeight; + }; //...................................................................................................................... diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx index 2821bba00419..c8c9765be13c 100644..100755 --- a/sfx2/inc/tplpitem.hxx +++ b/sfx2/inc/sfx2/tplpitem.hxx @@ -40,18 +40,18 @@ class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem public: TYPEINFO(); SfxTemplateItem(); - SfxTemplateItem( USHORT nWhich, + SfxTemplateItem( sal_uInt16 nWhich, const String &rStyle, - USHORT nMask = 0xffff ); + sal_uInt16 nMask = 0xffff ); SfxTemplateItem( const SfxTemplateItem& ); const String& GetStyleName() const { return aStyle; } virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual BYTE GetFlagCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_uInt8 GetFlagCount() const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx index d1fcf169046b..d1fcf169046b 100644..100755 --- a/sfx2/inc/sfx2/unoctitm.hxx +++ b/sfx2/inc/sfx2/unoctitm.hxx diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx index 4f7311125bd3..4f7311125bd3 100644..100755 --- a/sfx2/inc/sfx2/userinputinterception.hxx +++ b/sfx2/inc/sfx2/userinputinterception.hxx diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index 2cf735cb304c..da4d7902c30a 100644..100755 --- a/sfx2/inc/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -45,13 +45,12 @@ class SFX2_DLLPUBLIC SfxViewFactory { public: SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, - USHORT nOrdinal, const sal_Char* asciiViewName ); + sal_uInt16 nOrdinal, const sal_Char* asciiViewName ); ~SfxViewFactory(); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); void InitFactory(); - - USHORT GetOrdinal() const { return nOrd; } + sal_uInt16 GetOrdinal() const { return nOrd; } /// returns a legacy view name. This is "view" with an appended ordinal/ID. String GetLegacyViewName() const; @@ -66,7 +65,7 @@ public: private: SfxViewCtor fnCreate; SfxViewInit fnInit; - USHORT nOrd; + sal_uInt16 nOrd; const String m_sViewName; }; diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index 327c54cd301d..f450e0108690 100644..100755 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -81,7 +81,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener SfxObjectShellRef xObjSh; SfxDispatcher* pDispatcher; SfxBindings* pBindings; - USHORT nAdjustPosPixelLock; + sal_uInt16 nAdjustPosPixelLock; private: #ifndef _SFX_HXX @@ -105,21 +105,21 @@ public: static void SetViewFrame( SfxViewFrame* ); - static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId ); - static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId = 0 ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const USHORT i_nViewId = 0 ); - static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId = 0 ); + static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); + static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 ); + static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 ); static SfxViewFrame* Current(); - static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE ); - static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE ); - static USHORT Count(); + static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True ); + static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True ); + static sal_uInt16 Count(); static SfxViewFrame* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL ); - void DoActivate(BOOL bMDI, SfxViewFrame *pOld=NULL); - void DoDeactivate(BOOL bMDI, SfxViewFrame *pOld=NULL); + void DoActivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL); + void DoDeactivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL); SfxViewFrame* GetParentViewFrame() const; @@ -148,12 +148,12 @@ public: const Point &rPos, const Size &rSize ); void Hide(); void Show(); - BOOL IsVisible() const; + sal_Bool IsVisible() const; void ToTop(); - void Enable( BOOL bEnable ); - virtual BOOL Close(); - virtual void Activate( BOOL bUI ); - virtual void Deactivate( BOOL bUI ); + void Enable( sal_Bool bEnable ); + virtual sal_Bool Close(); + virtual void Activate( sal_Bool bUI ); + virtual void Deactivate( sal_Bool bUI ); // DDE-Interface virtual long DdeExecute( const String& rCmd ); @@ -173,17 +173,17 @@ public: static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ); // interne Handler - SAL_DLLPRIVATE virtual BOOL SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); + SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const; SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell(); - USHORT GetCurViewId() const; + sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; - BOOL DoClose(); - ULONG GetFrameType() const + sal_Bool DoClose(); + sal_uIntPtr GetFrameType() const { return GetFrame().GetFrameType(); } SfxFrame& GetTopFrame() const { return GetFrame().GetTopFrame(); } @@ -192,46 +192,46 @@ public: void CancelTransfers() { GetFrame().CancelTransfers(); } - void SetModalMode( BOOL ); - BOOL IsInModalMode() const; - void Resize(BOOL bForce=FALSE); - - //void SetChildWindow(USHORT nId, BOOL bVisible ); - void SetChildWindow(USHORT nId, BOOL bVisible, BOOL bSetFocus=TRUE); - void ToggleChildWindow(USHORT); - BOOL HasChildWindow(USHORT); - BOOL KnowsChildWindow(USHORT); - void ShowChildWindow(USHORT,BOOL bVisible=TRUE); - SfxChildWindow* GetChildWindow(USHORT); + void SetModalMode( sal_Bool ); + sal_Bool IsInModalMode() const; + void Resize(sal_Bool bForce=sal_False); + + //void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible ); + void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True); + void ToggleChildWindow(sal_uInt16); + sal_Bool HasChildWindow(sal_uInt16); + sal_Bool KnowsChildWindow(sal_uInt16); + void ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True); + SfxChildWindow* GetChildWindow(sal_uInt16); void ChildWindowExecute(SfxRequest&); void ChildWindowState(SfxItemSet&); SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); - SAL_DLLPRIVATE BOOL IsDowning_Impl() const; + SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const; SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh ); SAL_DLLPRIVATE void ReleaseObjectShell_Impl(); SAL_DLLPRIVATE void GetState_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq ); - SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, BOOL bAsync ); + SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, sal_Bool bAsync ); SAL_DLLPRIVATE void StateReload_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecView_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const; - SAL_DLLPRIVATE void ForceOuterResize_Impl(BOOL bOn=TRUE); - SAL_DLLPRIVATE BOOL IsResizeInToOut_Impl() const; - SAL_DLLPRIVATE BOOL IsAdjustPosSizePixelLocked_Impl() const + SAL_DLLPRIVATE void ForceOuterResize_Impl(sal_Bool bOn=sal_True); + SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const; + SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const { return nAdjustPosPixelLock != 0; } - SAL_DLLPRIVATE void ForceInnerResize_Impl( BOOL bOn ); + SAL_DLLPRIVATE void ForceInnerResize_Impl( sal_Bool bOn ); SAL_DLLPRIVATE void UpdateDocument_Impl(); - SAL_DLLPRIVATE void LockObjectShell_Impl(BOOL bLock=TRUE); + SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True); - SAL_DLLPRIVATE void MakeActive_Impl( BOOL bActivate ); - SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL ); + SAL_DLLPRIVATE void MakeActive_Impl( sal_Bool bActivate ); + SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool ); SAL_DLLPRIVATE const Size& GetMargin_Impl() const; SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* ); SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const; @@ -239,20 +239,20 @@ public: SAL_DLLPRIVATE static void CloseHiddenFrames_Impl(); SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &); SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); - SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( USHORT nId ); + SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId ); SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro); SAL_DLLPRIVATE void Exec_Impl(SfxRequest &); SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); - SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID ); + SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID ); SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ); private: - SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE ); + SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False ); SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ); - SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const USHORT i_nNewViewId ); + SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ); /** loads the given existing document into the given frame @@ -275,7 +275,7 @@ private: const SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rLoadArgs, - const USHORT i_nViewId, + const sal_uInt16 i_nViewId, const bool i_bHidden ); @@ -297,7 +297,7 @@ private: SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const USHORT i_nViewId, + const sal_uInt16 i_nViewId, const bool i_bHidden ); }; @@ -314,7 +314,7 @@ public: SfxPoolItem( 0 ), pFrame( pViewFrame) {} - SfxViewFrameItem( USHORT nWhichId, SfxViewFrame *pViewFrame ): + SfxViewFrameItem( sal_uInt16 nWhichId, SfxViewFrame *pViewFrame ): SfxPoolItem( nWhichId ), pFrame( pViewFrame) {} @@ -333,16 +333,16 @@ class SfxVerbListItem : public SfxPoolItem public: TYPEINFO(); - SfxVerbListItem( USHORT nWhichId = SID_OBJECT ) : + SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) : SfxPoolItem( nWhichId ) {} - SfxVerbListItem( USHORT nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); + SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; } }; diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 1cb69aaf41f0..a40321c61b45 100644..100755 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -38,6 +38,7 @@ #include <svl/lstner.hxx> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> #include <cppuhelper/interfacecontainer.hxx> #include "shell.hxx" #include <tools/gen.hxx> @@ -61,7 +62,6 @@ class SfxItemPool; class SfxTabPage; class SfxPrintMonitor; class SfxFrameSetDescriptor; -class PrintDialog; class Printer; class SfxPrinter; class SfxProgress; @@ -122,7 +122,7 @@ private: \ static SfxViewFactory *pFactory; \ public: \ static SfxViewShell *CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView); \ - static void RegisterFactory( USHORT nPrio = USHRT_MAX ); \ + static void RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() @@ -130,7 +130,7 @@ public: \ SfxViewFactory* Class::pFactory; \ SfxViewShell* Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ - void Class::RegisterFactory( USHORT nPrio ) \ + void Class::RegisterFactory( sal_uInt16 nPrio ) \ { \ pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\ InitFactory(); \ @@ -161,11 +161,11 @@ friend class SfxPrinterController; SfxViewFrame* pFrame; SfxShell* pSubShell; Window* pWindow; - BOOL bNoNewWindow; + sal_Bool bNoNewWindow; protected: - virtual void Activate(BOOL IsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool IsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual Size GetOptimalSizePixel() const; @@ -179,9 +179,9 @@ protected: public: // Iteration - static SfxViewShell* GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE ); + static SfxViewShell* GetFirst( const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True ); static SfxViewShell* GetNext( const SfxViewShell& rPrev, - const TypeId* pType = 0, BOOL bOnlyVisible = TRUE ); + const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True ); static SfxViewShell* Current(); static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController ); @@ -190,7 +190,7 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH) - SfxViewShell( SfxViewFrame *pFrame, USHORT nFlags = 0 ); + SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 ); virtual ~SfxViewShell(); SfxInPlaceClient* GetIPClient() const; @@ -213,22 +213,23 @@ public: void SetScrollingMode( SfxScrollingMode eMode ); // Misc - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; virtual SdrView* GetDrawView() const; + void SetSubShell( SfxShell *pShell ); SfxShell* GetSubShell() const { return pSubShell; } void AddSubShell( SfxShell& rShell ); void RemoveSubShell( SfxShell *pShell=NULL ); - SfxShell* GetSubShell( USHORT ); + SfxShell* GetSubShell( sal_uInt16 ); // Focus, KeyInput, Cursor void GotFocus() const; inline void LostFocus() const; virtual void ShowCursor( bool bOn = true ); virtual bool KeyInput( const KeyEvent &rKeyEvent ); - BOOL Escape(); + sal_Bool Escape(); // Viewing Interface Window* GetWindow() const { return pWindow; } @@ -241,21 +242,17 @@ public: void AdjustVisArea(const Rectangle& rRect); // Printing Interface - virtual void PreparePrint( PrintDialog *pPrintDialog = 0 ); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); - virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 ); - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE ); + virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - virtual PrintDialog* CreatePrintDialog( Window *pParent ); - void LockPrinter( BOOL bLock = TRUE ); - BOOL IsPrinterLocked() const; + void LockPrinter( sal_Bool bLock = sal_True ); + sal_Bool IsPrinterLocked() const; virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Workingset - virtual void WriteUserData( String&, BOOL bBrowse = FALSE ); - virtual void ReadUserData( const String&, BOOL bBrowse = FALSE ); + virtual void WriteUserData( String&, sal_Bool bBrowse = sal_False ); + virtual void ReadUserData( const String&, sal_Bool bBrowse = sal_False ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void QueryObjAreaPixel( Rectangle& rRect ) const; @@ -282,20 +279,21 @@ public: void SetMargin( const Size& ); void DisconnectAllClients(); virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); - BOOL NewWindowAllowed() const { return !bNoNewWindow; } - void SetNewWindowAllowed( BOOL bSet ) { bNoNewWindow = !bSet; } + sal_Bool NewWindowAllowed() const { return !bNoNewWindow; } + void SetNewWindowAllowed( sal_Bool bSet ) { bNoNewWindow = !bSet; } void SetController( SfxBaseController* pController ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); ::cppu::OInterfaceContainerHelper& GetContextMenuInterceptors() const; - BOOL TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); + sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); void SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool ); - void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL ); + void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool ); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier(); #if _SOLAR__PRIVATE SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const; @@ -306,17 +304,17 @@ public: SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) { GetIPClientList_Impl(TRUE)->push_back(pIPClient); } SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient ); - SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const; + SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const; SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP ); SAL_DLLPRIVATE void DiscardClients_Impl(); - SAL_DLLPRIVATE BOOL PlugInsActive() const; + SAL_DLLPRIVATE sal_Bool PlugInsActive() const; SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter ); - SAL_DLLPRIVATE BOOL IsShowView_Impl() const; + SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const; SAL_DLLPRIVATE long HandleNotifyEvent_Impl( NotifyEvent& rEvent ); - SAL_DLLPRIVATE BOOL HasKeyListeners_Impl(); - SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl(); SAL_DLLPRIVATE SfxBaseController* GetBaseController_Impl() const; @@ -327,12 +325,12 @@ public: SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const; SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*); SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& ); - SAL_DLLPRIVATE void PushSubShells_Impl( BOOL bPush=TRUE ); - SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( FALSE ); } + SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True ); + SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); } SAL_DLLPRIVATE void TakeOwnerShip_Impl(); SAL_DLLPRIVATE void CheckOwnerShip_Impl(); SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl(); - SAL_DLLPRIVATE BOOL ExecKey_Impl(const KeyEvent& aKey); + SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey); #endif }; @@ -383,4 +381,4 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx index 14a8bd7f9904..14a8bd7f9904 100644..100755 --- a/sfx2/inc/sfxbasic.hxx +++ b/sfx2/inc/sfxbasic.hxx diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index f0148d5e03cc..aedb2ab16ac8 100644..100755 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -46,8 +46,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); String getLanguage() { return aLanguage; }; }; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index a36527b66cda..2e6d1effb4c7 100644..100755 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -78,14 +78,14 @@ public: inline String GetSearchText() const { return m_aSearchEdit.GetText(); } inline void SetSearchText( const String& _rText ) { m_aSearchEdit.SetText( _rText ); } - inline bool IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != FALSE ); } - inline bool IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != FALSE ); } - inline bool IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != FALSE ); } - inline bool IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != FALSE ); } + inline bool IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != sal_False ); } + inline bool IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != sal_False ); } + inline bool IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != sal_False ); } + inline bool IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != sal_False ); } void SetFocusOnEdit(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); }; |