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 /svx/source/dialog | |
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 'svx/source/dialog')
104 files changed, 3093 insertions, 1657 deletions
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 1996183f7a68..60c20b6da050 100644..100755 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -39,7 +39,7 @@ namespace svx { -----------------------------------------------------------------------*/ SpellDialogChildWindow::SpellDialogChildWindow ( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/) : SfxChildWindow (_pParent, nId) @@ -53,7 +53,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( this ); pWindow = m_pAbstractSpellDialog->GetWindow(); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - SetHideNotDelete (TRUE); + SetHideNotDelete (sal_True); } /*------------------------------------------------------------------------- diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 2854eed67681..674b9d18491d 100644..100755 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -62,7 +62,7 @@ ( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) && \ ( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) ) \ { \ - aCol = pDstCols[i]; bReplace = TRUE; break; \ + aCol = pDstCols[i]; bReplace = sal_True; break; \ } \ } \ } @@ -187,16 +187,16 @@ void MaskSet::onEditColor() class MaskData { SvxBmpMask* pMask; - BOOL bIsReady; - BOOL bExecState; + sal_Bool bIsReady; + sal_Bool bExecState; SfxBindings& rBindings; public: MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ); - BOOL IsCbxReady() const { return bIsReady; } - void SetExecState( BOOL bState ) { bExecState = bState; } - BOOL IsExecReady() const { return bExecState; } + sal_Bool IsCbxReady() const { return bIsReady; } + void SetExecState( sal_Bool bState ) { bExecState = bState; } + sal_Bool IsExecReady() const { return bExecState; } DECL_LINK( PipetteHdl, ToolBox* pTbx ); DECL_LINK( CbxHdl, CheckBox* pCbx ); @@ -210,8 +210,8 @@ public: MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : pMask ( pBmpMask ), - bIsReady ( FALSE ), - bExecState ( FALSE ), + bIsReady ( sal_False ), + bExecState ( sal_False ), rBindings ( rBind ) { @@ -258,7 +258,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) pSet->SelectItem( 1 ); pSet->Select(); - pMask->aTbxPipette.CheckItem( TBI_PIPETTE, TRUE ); + pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True ); PipetteHdl( &( pMask->aTbxPipette ) ); } @@ -344,7 +344,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG ) { - SfxBoolItem aBItem( SID_BMPMASK_EXEC, TRUE ); + SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True ); rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L ); return 0L; @@ -368,7 +368,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ ) //------------------------------------------------------------------------- -SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask, +SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask, SfxBindings& rBindings ) : SfxControllerItem ( nId_, rBindings ), rBmpMask ( rMask) @@ -377,7 +377,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask, //------------------------------------------------------------------------- -void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, +void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_BMPMASK_EXEC ) && pItem ) @@ -392,7 +392,7 @@ void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, //------------------------------------------------------------------------- -SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, USHORT nId, +SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( pParent_, nId ) @@ -418,6 +418,10 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, aBtnExec ( this, BMP_RESID( BTN_EXEC ) ), aGrpQ ( this, BMP_RESID( GRP_Q ) ), + aFt1 ( this, BMP_RESID ( FT_1 ) ), + aFt2 ( this, BMP_RESID ( FT_2 ) ), + aFt3 ( this, BMP_RESID ( FT_3 ) ), + aCbx1 ( this, BMP_RESID( CBX_1 ) ), pQSet1 ( new MaskSet( this, BMP_RESID( QCOL_1 ) ) ), aSp1 ( this, BMP_RESID( SP_1 ) ), @@ -441,9 +445,6 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pData ( new MaskData( this, *pBindinx ) ), aCbxTrans ( this, BMP_RESID( CBX_TRANS ) ), aLbColorTrans ( this, BMP_RESID ( LB_TRANS ) ), - aFt1 ( this, BMP_RESID ( FT_1 ) ), - aFt2 ( this, BMP_RESID ( FT_2 ) ), - aFt3 ( this, BMP_RESID ( FT_3 ) ), pColTab ( NULL ), aPipetteColor ( COL_WHITE ), aSelItem ( SID_BMPMASK_EXEC, *this, *pBindinx ), @@ -504,6 +505,42 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pQSet2->Show(); pQSet3->Show(); pQSet4->Show(); + + aCbx1.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet1->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp1.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor1.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx1.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet1->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp1.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor1.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx2.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet2->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp2.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor2.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx2.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet2->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp2.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor2.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx3.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet3->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp3.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor3.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx3.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet3->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp3.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor3.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx4.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet4->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp4.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor4.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx4.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet4->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp4.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor4.SetAccessibleRelationLabeledBy( &aFt3 ); + aLbColorTrans.SetAccessibleRelationLabeledBy( &aCbxTrans ); + aLbColorTrans.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ ); } //------------------------------------------------------------------------- @@ -539,9 +576,9 @@ void SvxBmpMask::onSelect( MaskSet* pSet ) //------------------------------------------------------------------------- -BOOL SvxBmpMask::Close() +sal_Bool SvxBmpMask::Close() { - SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, FALSE ); + SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False ); GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L ); return SfxDockingWindow::Close(); @@ -549,7 +586,7 @@ BOOL SvxBmpMask::Close() //------------------------------------------------------------------------- -BOOL SvxBmpMask::NeedsColorTable() const +sal_Bool SvxBmpMask::NeedsColorTable() const { return ( aLbColor1.GetEntryCount() == 0 ); } @@ -599,36 +636,36 @@ void SvxBmpMask::PipetteClicked() { if( pQSet1->GetSelectItemId() == 1 ) { - aCbx1.Check( TRUE ); + aCbx1.Check( sal_True ); pData->CbxHdl( &aCbx1 ); pQSet1->SetItemColor( 1, aPipetteColor ); } else if( pQSet2->GetSelectItemId() == 1 ) { - aCbx2.Check( TRUE ); + aCbx2.Check( sal_True ); pData->CbxHdl( &aCbx2 ); pQSet2->SetItemColor( 1, aPipetteColor ); } else if( pQSet3->GetSelectItemId() == 1 ) { - aCbx3.Check( TRUE ); + aCbx3.Check( sal_True ); pData->CbxHdl( &aCbx3 ); pQSet3->SetItemColor( 1, aPipetteColor ); } else if( pQSet4->GetSelectItemId() == 1 ) { - aCbx4.Check( TRUE ); + aCbx4.Check( sal_True ); pData->CbxHdl( &aCbx4 ); pQSet4->SetItemColor( 1, aPipetteColor ); } - aTbxPipette.CheckItem( TBI_PIPETTE, FALSE ); + aTbxPipette.CheckItem( TBI_PIPETTE, sal_False ); pData->PipetteHdl( &aTbxPipette ); } //------------------------------------------------------------------------- -void SvxBmpMask::SetExecState( BOOL bEnable ) +void SvxBmpMask::SetExecState( sal_Bool bEnable ) { pData->SetExecState( bEnable ); @@ -640,36 +677,36 @@ void SvxBmpMask::SetExecState( BOOL bEnable ) //------------------------------------------------------------------------- -USHORT SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, ULONG* pTols ) +sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ) { - USHORT nCount = 0; + sal_uInt16 nCount = 0; if ( aCbx1.IsChecked() ) { pSrcCols[nCount] = pQSet1->GetItemColor( 1 ); pDstCols[nCount] = aLbColor1.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp1.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp1.GetValue()); } if ( aCbx2.IsChecked() ) { pSrcCols[nCount] = pQSet2->GetItemColor( 1 ); pDstCols[nCount] = aLbColor2.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp2.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp2.GetValue()); } if ( aCbx3.IsChecked() ) { pSrcCols[nCount] = pQSet3->GetItemColor( 1 ); pDstCols[nCount] = aLbColor3.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp3.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp3.GetValue()); } if ( aCbx4.IsChecked() ) { pSrcCols[nCount] = pQSet4->GetItemColor( 1 ); pDstCols[nCount] = aLbColor4.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp4.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp4.GetValue()); } return nCount; @@ -682,8 +719,8 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) Bitmap aBitmap( rBitmap ); Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - const USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_uIntPtr pTols[4]; + const sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); EnterWait(); aBitmap.Replace( pSrcCols, pDstCols, nCount, pTols ); @@ -724,11 +761,11 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) Animation aAnimation( rAnimation ); Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; + sal_uIntPtr pTols[4]; InitColorArrays( pSrcCols, pDstCols, pTols ); - USHORT nAnimationCount = aAnimation.Count(); + sal_uInt16 nAnimationCount = aAnimation.Count(); - for( USHORT i = 0; i < nAnimationCount; i++ ) + for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx(); @@ -745,9 +782,9 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) GDIMetaFile aMtf; Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); - BOOL pTrans[4]; + sal_uIntPtr pTols[4]; + sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_Bool pTrans[4]; // If no color is selected, we copy only the Mtf if( !nCount ) @@ -766,8 +803,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) long* pMaxG = new long[nCount]; long* pMinB = new long[nCount]; long* pMaxB = new long[nCount]; - USHORT i; - BOOL bReplace; + sal_uInt16 i; + sal_Bool bReplace; aMtf.SetPrefSize( rMtf.GetPrefSize() ); aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() ); @@ -793,11 +830,11 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } // Investigate actions and if necessary replace colors - for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) + for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) { MetaAction* pAction = rMtf.GetAction( nAct ); - bReplace = FALSE; + bReplace = sal_False; switch( pAction->GetType() ) { @@ -1024,9 +1061,9 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor ) { Animation aAnimation( rAnim ); - USHORT nAnimationCount = aAnimation.Count(); + sal_uInt16 nAnimationCount = aAnimation.Count(); - for( USHORT i = 0; i < nAnimationCount; i++ ) + for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor ); @@ -1044,9 +1081,9 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C GDIMetaFile aMtf; const MapMode& rPrefMap = rMtf.GetPrefMapMode(); const Size& rPrefSize = rMtf.GetPrefSize(); - const ULONG nActionCount = rMtf.GetActionCount(); + const sal_uIntPtr nActionCount = rMtf.GetActionCount(); - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); aMtf.SetPrefSize( rPrefSize ); aMtf.SetPrefMapMode( rPrefMap ); @@ -1056,7 +1093,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C // retrieve one action at the time; first // set the whole area to the replacement color. aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) ); - for ( ULONG i = 0; i < nActionCount; i++ ) + for ( sal_uIntPtr i = 0; i < nActionCount; i++ ) { MetaAction* pAct = rMtf.GetAction( i ); @@ -1107,13 +1144,13 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_uIntPtr pTols[4]; + sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); if( nCount ) { // first set all transparent colors - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { // Do we have a transparent color? if( pDstCols[i] == TRANSP_COL ) @@ -1178,7 +1215,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) //------------------------------------------------------------------------- -BOOL SvxBmpMask::IsEyedropping() const +sal_Bool SvxBmpMask::IsEyedropping() const { return aTbxPipette.IsItemChecked( TBI_PIPETTE ); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 7397d644f115..8245faa763ba 100644..100755 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -51,7 +51,7 @@ #define _XOUTBMP_STATICS_ONLY #include <svx/dialmgr.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <svx/contdlg.hxx> @@ -60,7 +60,7 @@ #include "contwnd.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <vcl/svapp.hxx> /******************************************************************************/ @@ -88,13 +88,13 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG ); /******************************************************************************/ -SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : +SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rDlg ( rContourDlg ) { } -void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) +void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( pItem && ( SID_CONTOUR_EXEC == nSID ) ) { @@ -109,7 +109,7 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons /******************************************************************************/ -SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId, +SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { @@ -124,7 +124,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId pDlg->Initialize( pInfo ); } -void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked, +void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { if ( SfxViewFrame::Current() && @@ -146,10 +146,10 @@ SvxContourDlg::~SvxContourDlg() PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect, - const ULONG nFlags ) + const sal_uIntPtr nFlags ) { Bitmap aBmp; - ULONG nContourFlags = XOUTBMP_CONTOUR_HORZ; + sal_uIntPtr nContourFlags = XOUTBMP_CONTOUR_HORZ; if ( rGraphic.GetType() == GRAPHIC_BITMAP ) { @@ -160,14 +160,14 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, PolyPolygon aAnimPolyPoly; const Animation aAnim( rGraphic.GetAnimation() ); const Size& rSizePix = aAnim.GetDisplaySizePixel(); - const USHORT nCount = aAnim.Count(); + const sal_uInt16 nCount = aAnim.Count(); if ( aVDev.SetOutputSizePixel( rSizePix ) ) { aVDev.SetLineColor( Color( COL_BLACK ) ); aVDev.SetFillColor( Color( COL_BLACK ) ); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const AnimationBitmap& rStepBmp = aAnim.Get( i ); @@ -235,7 +235,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic const Size aGrfSize( rGraphic.GetPrefSize() ); Size aOrgSize; Point aNewPoint; - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; if ( bPixelMap ) aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap ); @@ -247,11 +247,11 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width(); double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height(); - for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = rContour[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { if ( bPixelMap ) aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap ); @@ -267,7 +267,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic // Loop through to super class, no virtual Methods to not become incompatible // due to IF changes -void SvxContourDlg::SetExecState( BOOL bEnable ) +void SvxContourDlg::SetExecState( sal_Bool bEnable ) { pSuperClass->SetExecState( bEnable ); } @@ -277,7 +277,7 @@ void SvxContourDlg::SetGraphic( const Graphic& rGraphic ) pSuperClass->SetGraphic( rGraphic ); } -void SvxContourDlg::SetGraphicLinked( BOOL bGraphicLinked ) +void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked ) { pSuperClass->SetGraphicLinked( bGraphicLinked ); } @@ -287,7 +287,7 @@ const Graphic& SvxContourDlg::GetGraphic() const return pSuperClass->GetGraphic(); } -BOOL SvxContourDlg::IsGraphicChanged() const +sal_Bool SvxContourDlg::IsGraphicChanged() const { return pSuperClass->IsGraphicChanged(); } @@ -299,7 +299,7 @@ void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) PolyPolygon SvxContourDlg::GetPolyPolygon() { - return pSuperClass->GetPolyPolygon( TRUE ); + return pSuperClass->GetPolyPolygon( sal_True ); } void SvxContourDlg::SetEditingObject( void* pObj ) @@ -312,7 +312,7 @@ const void* SvxContourDlg::GetEditingObject() const return pSuperClass->GetEditingObject(); } -void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked, +void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); @@ -328,8 +328,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow aContourWnd ( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ), aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ), nGrfChanged ( 0UL ), - bExecState ( FALSE ), - bGraphicLinked ( FALSE ), + bExecState ( sal_False ), + bGraphicLinked ( sal_False ), maImageList ( SVX_RES( CD_IMAPDLG ) ) { ApplyImageList(); @@ -408,9 +408,9 @@ void SvxSuperContourDlg::Resize() // Close methods -BOOL SvxSuperContourDlg::Close() +sal_Bool SvxSuperContourDlg::Close() { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( aTbx1.IsItemEnabled( TBI_APPLY ) ) { @@ -420,20 +420,20 @@ BOOL SvxSuperContourDlg::Close() if ( nRet == RET_YES ) { - SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } else if ( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } - return( bRet ? SfxFloatingWindow::Close() : FALSE ); + return( bRet ? SfxFloatingWindow::Close() : sal_False ); } // Enabled or disabled all Controls -void SvxSuperContourDlg::SetExecState( BOOL bEnable ) +void SvxSuperContourDlg::SetExecState( sal_Bool bEnable ) { bExecState = bEnable; } @@ -454,13 +454,13 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) const MapMode aMap100( MAP_100TH_MM ); const MapMode aGrfMap( aGraphic.GetPrefMapMode() ); OutputDevice* pOutDev = Application::GetDefaultDevice(); - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; - for ( USHORT j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = aPolyPoly[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { Point& rPt = rPoly[ i ]; @@ -475,7 +475,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) aContourWnd.GetSdrModel()->SetChanged( sal_True ); } -PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) +PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic ) { PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() ); @@ -484,13 +484,13 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) const MapMode aMap100( MAP_100TH_MM ); const MapMode aGrfMap( aGraphic.GetPrefMapMode() ); OutputDevice* pOutDev = Application::GetDefaultDevice(); - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; - for ( USHORT j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = aRetPolyPoly[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { Point& rPt = rPoly[ i ]; @@ -505,7 +505,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) return aRetPolyPoly; } -void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked, +void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { aUpdateGraphic = rGraphic; @@ -520,12 +520,12 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL aUpdateTimer.Start(); } -BOOL SvxSuperContourDlg::IsUndoPossible() const +sal_Bool SvxSuperContourDlg::IsUndoPossible() const { return aUndoGraphic.GetType() != GRAPHIC_NONE; } -BOOL SvxSuperContourDlg::IsRedoPossible() const +sal_Bool SvxSuperContourDlg::IsRedoPossible() const { return aRedoGraphic.GetType() != GRAPHIC_NONE; } @@ -537,7 +537,7 @@ void SvxSuperContourDlg::DoAutoCreate() void SvxSuperContourDlg::ReducePoints( const long nTol ) { - PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) ); + PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) ); if ( aPolyPoly.Count() ) { @@ -546,13 +546,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol ) Polygon& rPoly = aPolyPoly[ 0 ]; OutputDevice* pOutDev = Application::GetDefaultDevice(); Point aPtPix; - const USHORT nSize = rPoly.GetSize(); - USHORT nCounter = 0; + const sal_uInt16 nSize = rPoly.GetSize(); + sal_uInt16 nCounter = 0; if ( nSize ) aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode ); - for( USHORT i = 1; i < nSize; i++ ) + for( sal_uInt16 i = 1; i < nSize; i++ ) { const Point& rNewPt = rPoly[ i ]; const Point aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) ); @@ -578,13 +578,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol ) IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) { - USHORT nNewItemId = pTbx->GetCurItemId(); + sal_uInt16 nNewItemId = pTbx->GetCurItemId(); switch( pTbx->GetCurItemId() ) { case( TBI_APPLY ): { - SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } @@ -597,32 +597,32 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) ); if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) ) - aContourWnd.SetWorkplaceMode( TRUE ); + aContourWnd.SetWorkplaceMode( sal_True ); else - aTbx1.CheckItem( TBI_WORKPLACE, FALSE ); + aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); } else - aContourWnd.SetWorkplaceMode( FALSE ); + aContourWnd.SetWorkplaceMode( sal_False ); } break; case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); - aContourWnd.SetEditMode( TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); + aContourWnd.SetEditMode( sal_True ); } break; case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_RECT ); } break; case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_CIRC ); } @@ -630,14 +630,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_POLY ); } break; case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_FREEFILL ); } break; @@ -664,7 +664,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aRedoGraphic = aGraphic; aGraphic = aUndoGraphic; aUndoGraphic = Graphic(); - aContourWnd.SetGraphic( aGraphic, FALSE ); + aContourWnd.SetGraphic( aGraphic, sal_False ); } break; @@ -674,7 +674,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aUndoGraphic = aGraphic; aGraphic = aRedoGraphic; aRedoGraphic = Graphic(); - aContourWnd.SetGraphic( aGraphic, FALSE ); + aContourWnd.SetGraphic( aGraphic, sal_False ); } break; @@ -684,7 +684,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_PIPETTE ): { - BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); + sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); if ( !bPipette ) aStbStatus.Invalidate(); @@ -694,7 +694,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) if ( aQBox.Execute() != RET_YES ) { - aTbx1.CheckItem( TBI_PIPETTE, bPipette = FALSE ); + aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False ); aStbStatus.Invalidate(); } } @@ -760,7 +760,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) aUpdateGraphic = Graphic(); aUpdatePolyPoly = PolyPolygon(); - bUpdateGraphicLinked = FALSE; + bUpdateGraphicLinked = sal_False; aContourWnd.GetSdrModel()->SetChanged( sal_False ); } @@ -776,7 +776,7 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG ) const Rectangle aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) ); const Graphic& rGraphic = aContourWnd.GetGraphic(); - const BOOL bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom(); + const sal_Bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom(); EnterWait(); SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) ); @@ -789,12 +789,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); - const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); - const BOOL bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) ); - const BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); - const BOOL bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE ); - const BOOL bDontHide = !( bPipette || bWorkplace ); - const BOOL bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP; + const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); + const sal_Bool bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) ); + const sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); + const sal_Bool bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE ); + const sal_Bool bDontHide = !( bPipette || bWorkplace ); + const sal_Bool bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP; aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() ); @@ -819,7 +819,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) if ( bPolyEdit ) { - USHORT nId = 0; + sal_uInt16 nId = 0; switch( pWnd->GetPolyEditMode() ) { @@ -830,13 +830,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) break; } - aTbx1.CheckItem( nId, TRUE ); + aTbx1.CheckItem( nId, sal_True ); } else { - aTbx1.CheckItem( TBI_POLYEDIT, FALSE ); - aTbx1.CheckItem( TBI_POLYMOVE, TRUE ); - aTbx1.CheckItem( TBI_POLYINSERT, FALSE ); + aTbx1.CheckItem( TBI_POLYEDIT, sal_False ); + aTbx1.CheckItem( TBI_POLYMOVE, sal_True ); + aTbx1.CheckItem( TBI_POLYINSERT, sal_False ); pWnd->SetPolyEditMode( 0 ); } @@ -889,7 +889,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) if( !!aMask ) { QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) ); - BOOL bNewContour; + sal_Bool bNewContour; aRedoGraphic = Graphic(); aUndoGraphic = aGraphic; @@ -907,8 +907,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) LeaveWait(); } - aTbx1.CheckItem( TBI_PIPETTE, FALSE ); - pWnd->SetPipetteMode( FALSE ); + aTbx1.CheckItem( TBI_PIPETTE, sal_False ); + pWnd->SetPipetteMode( sal_False ); aStbStatus.Invalidate(); return 0L; @@ -916,9 +916,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) { - aTbx1.CheckItem( TBI_WORKPLACE, FALSE ); - aTbx1.CheckItem( TBI_SELECT, TRUE ); - pWnd->SetWorkplaceMode( FALSE ); + aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); + aTbx1.CheckItem( TBI_SELECT, sal_True ); + pWnd->SetWorkplaceMode( sal_False ); return 0L; } diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index f204cfcbf8f7..e726bef7c7bd 100644..100755 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -27,7 +27,11 @@ #define RID_SVXDLG_BMPMASK (RID_SVX_BMPMASK_START) #define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1) #define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2) - +/*IAccessibility2 Implementation 2009-----*/ +#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3) +#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4) +#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5) +/*-----IAccessibility2 Implementation 2009*/ #define GRP_Q 1 #define CTR_PIPETTE 1 #define CBX_1 1 diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 7ac9ae4d1470..d2fb4dc5d934 100644..100755 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -37,7 +37,7 @@ // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { - HelpId = SID_BMPMASK ; + HelpId = CMD_SID_BMPMASK ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_1 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_1 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 48 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_1 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 48 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_2 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_2 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 63 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_2 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 63 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_3 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_3 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3"; Border = TRUE ; Pos = MAP_APPFONT ( 58, 78 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_3 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 78 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_4 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_4 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 93 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_4 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 93 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_TRANS { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TabStop = TRUE ; @@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK PushButton BTN_EXEC { + HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC"; Pos = MAP_APPFONT ( 93 , 6 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK ListBox LB_TRANS { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 108 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -274,7 +289,7 @@ DockingWindow RID_SVXDLG_BMPMASK ImageBitmap = Bitmap { File = "sc10350.bmp" ; }; MASKCOLOR }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; }; }; }; @@ -285,7 +300,7 @@ DockingWindow RID_SVXDLG_BMPMASK Pos = MAP_APPFONT ( 22 , 6 ) ; Size = MAP_APPFONT ( 43 , 14 ) ; }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Color Replacer" ; Image IMG_PIPETTE { @@ -307,47 +322,16 @@ String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR Text [ en-US ] = "Source Color"; }; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +String RID_SVXDLG_BMPMASK_STR_PALETTE +{ + Text [ en-US ] = "Color Palette"; +}; +String RID_SVXDLG_BMPMASK_STR_TOLERANCE +{ + Text [ en-US ] = "Tolerance"; +}; +String RID_SVXDLG_BMPMASK_STR_REPLACEWITH +{ + Text [ en-US ] = "Replace with"; +}; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index bce0b3c779f8..5f1a2a6c1ab0 100644..100755 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -82,11 +82,11 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) : SetStyle( GetStyle() | WB_CLIPCHILDREN ); aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) ); - aVscrollSB.EnableDrag( TRUE ); + aVscrollSB.EnableDrag( sal_True ); // other settings like aVscroll depend on selected font => see SetFont - bDrag = FALSE; - InitSettings( TRUE, TRUE ); + bDrag = sal_False; + InitSettings( sal_True, sal_True ); } // ----------------------------------------------------------------------- @@ -94,7 +94,7 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) : void SvxShowCharSet::GetFocus() { Control::GetFocus(); - SelectIndex( nSelectedIndex, TRUE ); + SelectIndex( nSelectedIndex, sal_True ); } // ----------------------------------------------------------------------- @@ -102,7 +102,7 @@ void SvxShowCharSet::GetFocus() void SvxShowCharSet::LoseFocus() { Control::LoseFocus(); - SelectIndex( nSelectedIndex, FALSE ); + SelectIndex( nSelectedIndex, sal_False ); } // ----------------------------------------------------------------------- @@ -110,9 +110,9 @@ void SvxShowCharSet::LoseFocus() void SvxShowCharSet::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Control::StateChanged( nType ); } @@ -123,7 +123,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Control::DataChanged( rDCEvt ); } @@ -137,7 +137,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 1 ) { GrabFocus(); - bDrag = TRUE; + bDrag = sal_True; CaptureMouse(); int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() ); @@ -159,7 +159,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) aSelectHdl.Call( this ); ReleaseMouse(); - bDrag = FALSE; + bDrag = sal_False; } } @@ -196,14 +196,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) // ----------------------------------------------------------------------------- -USHORT SvxShowCharSet::GetRowPos(USHORT _nPos) const +sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const { return _nPos / COLUMN_COUNT ; } // ----------------------------------------------------------------------------- -USHORT SvxShowCharSet::GetColumnPos(USHORT _nPos) const +sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const { return _nPos % COLUMN_COUNT ; } @@ -222,9 +222,9 @@ int SvxShowCharSet::FirstInView( void ) const int SvxShowCharSet::LastInView( void ) const { - ULONG nIndex = FirstInView(); + sal_uIntPtr nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; - ULONG nCompare = sal::static_int_cast<ULONG>( maFontCharMap.GetCharCount() - 1 ); + sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>( maFontCharMap.GetCharCount() - 1 ); if( nIndex > nCompare ) nIndex = nCompare; return nIndex; @@ -311,7 +311,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) if ( tmpSelected >= 0 ) { - SelectIndex( tmpSelected, TRUE ); + SelectIndex( tmpSelected, sal_True ); aPreSelectHdl.Call( this ); } } @@ -441,7 +441,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) // ----------------------------------------------------------------------- -void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -487,12 +487,12 @@ void SvxShowCharSet::SetFont( const Font& rFont ) aFont.SetAlign( ALIGN_TOP ); int nFontHeight = (aOrigSize.Height() - 5) * 2 / (3 * ROW_COUNT); aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) ); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); Control::SetFont( aFont ); GetFontCharMap( maFontCharMap ); // hide scrollbar when there is nothing to scroll - BOOL bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT); + sal_Bool bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT); nX = (aOrigSize.Width() - (bNeedVscroll ? SBWIDTH : 0)) / COLUMN_COUNT; nY = aOrigSize.Height() / ROW_COUNT; @@ -523,7 +523,7 @@ void SvxShowCharSet::SetFont( const Font& rFont ) // ----------------------------------------------------------------------- -void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus ) +void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) { if( nNewIndex < 0 ) { @@ -608,7 +608,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus ) // ----------------------------------------------------------------------- -void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, BOOL bFocus ) +void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) { // get next available char of current font sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 ); @@ -679,7 +679,7 @@ void SvxShowCharSet::ReleaseAccessible() if ( aFind == m_aItems.end() ) { OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?"); - aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< USHORT >(_nPos)))).first; + aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first; rtl::OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) ); aFind->second->maText = buf.makeStringAndClear(); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index e66fdf975559..7fa5725a14b3 100644..100755 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -87,17 +87,17 @@ void SvxCheckListBox::Init_Impl() // ----------------------------------------------------------------------- -void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos, +void SvxCheckListBox::InsertEntry( const String& rStr, sal_uInt16 nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { - SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData, + SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData, eButtonKind ); } // ----------------------------------------------------------------------- -void SvxCheckListBox::RemoveEntry( USHORT nPos ) +void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos ) { if ( nPos < GetEntryCount() ) SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) ); @@ -105,7 +105,7 @@ void SvxCheckListBox::RemoveEntry( USHORT nPos ) // ----------------------------------------------------------------------- -void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect ) +void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) { if ( nPos < GetEntryCount() ) Select( GetEntry( nPos ), bSelect ); @@ -113,18 +113,18 @@ void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect ) // ----------------------------------------------------------------------- -USHORT SvxCheckListBox::GetSelectEntryPos() const +sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const { SvLBoxEntry* pEntry = GetCurEntry(); if ( pEntry ) - return (USHORT)GetModel()->GetAbsPos( pEntry ); + return (sal_uInt16)GetModel()->GetAbsPos( pEntry ); return LISTBOX_ENTRY_NOTFOUND; } // ----------------------------------------------------------------------- -String SvxCheckListBox::GetText( USHORT nPos ) const +String SvxCheckListBox::GetText( sal_uInt16 nPos ) const { SvLBoxEntry* pEntry = GetEntry( nPos ); @@ -135,12 +135,12 @@ String SvxCheckListBox::GetText( USHORT nPos ) const // ----------------------------------------------------------------------- -USHORT SvxCheckListBox::GetCheckedEntryCount() const +sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const { - USHORT nCheckCount = 0; - USHORT nCount = (USHORT)GetEntryCount(); + sal_uInt16 nCheckCount = 0; + sal_uInt16 nCount = (sal_uInt16)GetEntryCount(); - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) { if ( IsChecked( i ) ) nCheckCount++; @@ -150,7 +150,7 @@ USHORT SvxCheckListBox::GetCheckedEntryCount() const // ----------------------------------------------------------------------- -void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck ) +void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck ) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -160,17 +160,17 @@ void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck ) // ----------------------------------------------------------------------- -BOOL SvxCheckListBox::IsChecked( USHORT nPos ) const +sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const { if ( nPos < GetEntryCount() ) return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED); else - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- -void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData ) +void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData ) { void* pOld = NULL; @@ -184,7 +184,7 @@ void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData ) // ----------------------------------------------------------------------- -void* SvxCheckListBox::GetEntryData( USHORT nPos ) const +void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const { if ( nPos < GetEntryCount() ) return GetEntry( nPos )->GetUserData(); @@ -216,13 +216,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( pEntry ) { - BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() ); if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON ) { SvTreeListBox::MouseButtonDown( rMEvt ); - Select( pEntry, TRUE ); + Select( pEntry, sal_True ); return; } else @@ -257,7 +257,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) if ( pEntry ) { - BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); ToggleCheckButton( pEntry ); if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ) CheckButtonHdl(); @@ -269,7 +269,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) +SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind ); } diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 0c05dda3d085..433113a6abbc 100644..100755 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -38,9 +38,9 @@ #include <svx/svdpage.hxx> // SdrObjList -#include "connctrl.hxx" +#include "svx/connctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> @@ -69,33 +69,33 @@ void SvxXConnectionPreview::Construct() DBG_ASSERT( pView, "No valid view is passed on! "); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount >= 1 ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - for( USHORT i = 0; i < nMarkCount && !bFound; i++ ) + for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ ) { pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); if( nInv == SdrInventor && nId == OBJ_EDGE ) { - bFound = TRUE; + bFound = sal_True; SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj; pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone(); - SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( TRUE ); - SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( FALSE ); + SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True ); + SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False ); - rConn1 = pTmpEdgeObj->GetConnection( TRUE ); - rConn2 = pTmpEdgeObj->GetConnection( FALSE ); + rConn1 = pTmpEdgeObj->GetConnection( sal_True ); + rConn2 = pTmpEdgeObj->GetConnection( sal_False ); - SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE ); - SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE ); + SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True ); + SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False ); // potential memory leak here (!). Create SdrObjList only when there is // not yet one. @@ -108,13 +108,13 @@ void SvxXConnectionPreview::Construct() { SdrObject* pObj1 = pTmpObj1->Clone(); pObjList->InsertObject( pObj1 ); - pEdgeObj->ConnectToNode( TRUE, pObj1 ); + pEdgeObj->ConnectToNode( sal_True, pObj1 ); } if( pTmpObj2 ) { SdrObject* pObj2 = pTmpObj2->Clone(); pObjList->InsertObject( pObj2 ); - pEdgeObj->ConnectToNode( FALSE, pObj2 ); + pEdgeObj->ConnectToNode( sal_False, pObj2 ); } pObjList->InsertObject( pEdgeObj ); } @@ -223,7 +223,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) // Get number of lines which are offset based on the preview object -USHORT SvxXConnectionPreview::GetLineDeltaAnz() +sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() { const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); @@ -236,9 +236,9 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz() void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); - BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); - BOOL bCtrl = rMEvt.IsMod1(); + sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); + sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); + sal_Bool bCtrl = rMEvt.IsMod1(); if( bZoomIn || bZoomOut ) { diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index 612365c2e449..612365c2e449 100644..100755 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 9a9372a2bd0a..99424128688b 100644..100755 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -33,6 +33,7 @@ // RID_SVXDLG_CONTOUR ---------------------------------------------------- FloatingWindow RID_SVXDLG_CONTOUR { + HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -169,13 +170,14 @@ FloatingWindow RID_SVXDLG_CONTOUR { Identifier = TBI_PIPETTE ; HelpId = HID_CONTDLG_PIPETTE ; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; AutoCheck = TRUE ; }; }; }; MetricField MTF_TOLERANCE { + HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 99f04e2ac6d9..bf40b9812228 100644..100755 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -54,16 +54,16 @@ class SvxSuperContourDlg : public SvxContourDlg MetricField aMtfTolerance; ContourWindow aContourWnd; StatusBar aStbStatus; - ULONG nGrfChanged; - BOOL bExecState; - BOOL bPipetteMode; - BOOL bWorkplaceMode; - BOOL bUpdateGraphicLinked; - BOOL bGraphicLinked; + sal_uIntPtr nGrfChanged; + sal_Bool bExecState; + sal_Bool bPipetteMode; + sal_Bool bWorkplaceMode; + sal_Bool bUpdateGraphicLinked; + sal_Bool bGraphicLinked; ImageList maImageList; virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); void DoAutoCreate(); void ReducePoints( const long nTol = 8 ); @@ -85,23 +85,23 @@ public: Window* pParent, const ResId& rResId ); ~SvxSuperContourDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( BOOL bLinked ) { bGraphicLinked = bLinked; } + void SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; } const Graphic& GetGraphic() const { return aGraphic; } - BOOL IsGraphicChanged() const { return nGrfChanged > 0UL; } + sal_Bool IsGraphicChanged() const { return nGrfChanged > 0UL; } void SetPolyPolygon( const PolyPolygon& rPolyPoly ); - PolyPolygon GetPolyPolygon( BOOL bRescaleToGraphic = TRUE ); + PolyPolygon GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True ); void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } - BOOL IsUndoPossible() const; - BOOL IsRedoPossible() const; + sal_Bool IsUndoPossible() const; + sal_Bool IsRedoPossible() const; - void UpdateGraphic( const Graphic& rGraphic, BOOL bGraphicLinked, + void UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 1f0008e2ba95..3d7f091b9c5b 100644..100755 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <contdlg.hrc> @@ -41,16 +41,16 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> // #i75482# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #define TRANSCOL Color( COL_WHITE ) ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : GraphCtrl ( pParent, rResId ), aWorkRect ( 0, 0, 0, 0 ), - bPipetteMode ( FALSE ), - bWorkplaceMode ( FALSE ), - bClickValid ( FALSE ) + bPipetteMode ( sal_False ), + bWorkplaceMode ( sal_False ), + bClickValid ( sal_False ) { SetWinStyle( WB_SDRMODE ); } @@ -62,7 +62,7 @@ ContourWindow::~ContourWindow() void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - const USHORT nPolyCount = rPolyPoly.Count(); + const sal_uInt16 nPolyCount = rPolyPoly.Count(); // First delete all drawing objects aPolyPoly = rPolyPoly; @@ -73,7 +73,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) pPage->Clear(); - for ( USHORT i = 0; i < nPolyCount; i++ ) + for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon()); @@ -134,7 +134,7 @@ void ContourWindow::InitSdrModel() aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); } void ContourWindow::SdrObjCreated( const SdrObject& ) @@ -143,10 +143,10 @@ void ContourWindow::SdrObjCreated( const SdrObject& ) pView->CombineMarkedObjects( sal_False ); } -BOOL ContourWindow::IsContourChanged() const +sal_Bool ContourWindow::IsContourChanged() const { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pPage && pPage->GetObjCount() ) bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); @@ -163,7 +163,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) SetPolyPolygon( PolyPolygon() ); aWorkRect = Rectangle( aLogPt, aLogPt ); Paint( Rectangle( Point(), GetGraphicSize() ) ); - SetEditMode( TRUE ); + SetEditMode( sal_True ); } if ( !bPipetteMode ) @@ -172,7 +172,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) void ContourWindow::MouseMove( const MouseEvent& rMEvt ) { - bClickValid = FALSE; + bClickValid = sal_False; if ( bPipetteMode ) { diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 32159a301a42..cd4288cda6b0 100644..100755 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -40,9 +40,9 @@ class ContourWindow : public GraphCtrl Link aPipetteLink; Link aPipetteClickLink; Link aWorkplaceClickLink; - BOOL bPipetteMode; - BOOL bWorkplaceMode; - BOOL bClickValid; + sal_Bool bPipetteMode; + sal_Bool bWorkplaceMode; + sal_Bool bClickValid; protected: @@ -63,15 +63,15 @@ public: void SetPolyPolygon( const PolyPolygon& rPolyPoly ); const PolyPolygon& GetPolyPolygon(); - void SetPipetteMode( const BOOL bPipette ) { bPipetteMode = bPipette; } - BOOL IsPipetteMode() const { return bPipetteMode; } + void SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; } + sal_Bool IsPipetteMode() const { return bPipetteMode; } const Color& GetPipetteColor() const { return aPipetteColor; } - BOOL IsClickValid() const { return bClickValid; } - BOOL IsContourChanged() const; + sal_Bool IsClickValid() const { return bClickValid; } + sal_Bool IsContourChanged() const; - void SetWorkplaceMode( const BOOL bWorkplace ) { bWorkplaceMode = bWorkplace; } - BOOL IsWorkplaceMode() const { return bWorkplaceMode; } + void SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; } + sal_Bool IsWorkplaceMode() const { return bWorkplaceMode; } const Rectangle& GetWorkRect() const { return aWorkRect; } void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 6b6c2ec6159e..c7bb02dd1fa7 100644..100755 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -47,7 +47,7 @@ // Local Defines and Function //---------------------------------------------------------------------------- -inline void EnableDisable( Window& rWin, BOOL bEnable ) +inline void EnableDisable( Window& rWin, sal_Bool bEnable ) { if (bEnable) rWin.Enable(); @@ -68,7 +68,7 @@ static long nStaticTabs[]= RedlinData::RedlinData() { - bDisabled=FALSE; + bDisabled=sal_False; pData=NULL; } RedlinData::~RedlinData() @@ -97,7 +97,7 @@ SvxRedlinEntry::~SvxRedlinEntry() DBG_NAME(SvLBoxColorString); -SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr, +SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol) : SvLBoxString( pEntry, nFlags, rStr ) @@ -125,7 +125,7 @@ SvLBoxItem* SvLBoxColorString::Create() const } void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev, - USHORT nFlags, SvLBoxEntry* pEntry ) + sal_uInt16 nFlags, SvLBoxEntry* pEntry ) /* [Description] Paint function of the SvLBoxColorString class. The relevant text with the @@ -150,10 +150,10 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev, SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ): SvxSimpleTable(pParent,nBits ) { - bAuthor=FALSE; - bDate=FALSE; - bIsCalc=FALSE; - bComment=FALSE; + bAuthor=sal_False; + bDate=sal_False; + bIsCalc=sal_False; + bComment=sal_False; nDatePos=WRITER_DATE; pCommentSearcher=NULL; SetNodeDefaultImages(); @@ -162,10 +162,10 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ): SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId): SvxSimpleTable(pParent,rResId) { - bAuthor=FALSE; - bDate=FALSE; - bIsCalc=FALSE; - bComment=FALSE; + bAuthor=sal_False; + bDate=sal_False; + bIsCalc=sal_False; + bComment=sal_False; nDatePos=WRITER_DATE; pCommentSearcher=NULL; SetNodeDefaultImages(); @@ -218,7 +218,7 @@ StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) return eCompare; } -void SvxRedlinTable::SetCalcView(BOOL bFlag) +void SvxRedlinTable::SetCalcView(sal_Bool bFlag) { bIsCalc=bFlag; if(bFlag) @@ -235,7 +235,7 @@ void SvxRedlinTable::SetCalcView(BOOL bFlag) void SvxRedlinTable::UpdateFilterTest() { Date aDateMax; - USHORT nYEAR=aDateMax.GetYear()+100; + sal_uInt16 nYEAR=aDateMax.GetYear()+100; aDateMax.SetYear(nYEAR); Date aDateMin(1,1,1989); Time aTMin(0); @@ -276,12 +276,12 @@ void SvxRedlinTable::UpdateFilterTest() } -void SvxRedlinTable::SetFilterDate(BOOL bFlag) +void SvxRedlinTable::SetFilterDate(sal_Bool bFlag) { bDate=bFlag; } -void SvxRedlinTable::SetDateTimeMode(USHORT nMode) +void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode) { nDaTiMode=nMode; } @@ -306,7 +306,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime) aDaTiLast.SetTime(aTime.GetTime()); } -void SvxRedlinTable::SetFilterAuthor(BOOL bFlag) +void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag) { bAuthor=bFlag; } @@ -316,7 +316,7 @@ void SvxRedlinTable::SetAuthor(const String &aString) aAuthor=aString; } -void SvxRedlinTable::SetFilterComment(BOOL bFlag) +void SvxRedlinTable::SetFilterComment(sal_Bool bFlag) { bComment=bFlag; } @@ -331,18 +331,18 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara ) } } -BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData) +sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; String aString=rString.GetToken(WRITER_AUTHOR,'\t'); if(pUserData==NULL) { if(bAuthor) { if(aAuthor.CompareTo(aString)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } } else @@ -353,18 +353,18 @@ BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserD return nTheFlag; } -BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData) +sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; String aString=rString.GetToken(CALC_AUTHOR,'\t'); if(pUserData==NULL) { if(bAuthor) { if(aAuthor.CompareTo(aString)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } } else @@ -375,7 +375,7 @@ BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserDat return nTheFlag; } -BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr, +sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr, const DateTime *pDateTime,const String* pCommentStr) { bool nTheFlag=true; @@ -404,15 +404,15 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr, return nTheFlag; } -BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime) +sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; if(bAuthor) { if(aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } if(bDate && nTheFlag) { @@ -428,7 +428,7 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDate return nTheFlag; } -BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr) +sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr) { bool nTheFlag=true; @@ -443,7 +443,7 @@ BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr) } SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData, - SvLBoxEntry* pParent,ULONG nPos) + SvLBoxEntry* pParent,sal_uIntPtr nPos) { aEntryColor=GetTextColor(); if(pUserData!=NULL) @@ -465,12 +465,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat else aCurEntry.Erase(); - return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData ); + return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor, - SvLBoxEntry* pParent,ULONG nPos) + SvLBoxEntry* pParent,sal_uIntPtr nPos) { aEntryColor=aColor; @@ -487,7 +487,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat else aCurEntry.Erase(); - return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData ); + return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } SvLBoxEntry* SvxRedlinTable::CreateEntry() const @@ -518,11 +518,11 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr, XubString aToken; xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer(); - USHORT nCurTokenLen; + sal_uInt16 nCurTokenLen; xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen ); - USHORT nCount = TabCount(); nCount--; + sal_uInt16 nCount = TabCount(); nCount--; - for( USHORT nToken = 0; nToken < nCount; nToken++ ) + for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) aToken = XubString( pCurToken, nCurTokenLen ); @@ -562,6 +562,7 @@ SvxTPView::SvxTPView( Window * pParent) aTitle5 ( SVX_RES( STR_TITLE5 ) ), aStrMyName ( SVX_RES( STR_VIEW) ) { + aViewData.SetAccessibleName(String(SVX_RES(STR_TREE))); FreeResource(); aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); @@ -646,32 +647,32 @@ void SvxTPView::InsertCalcHeader() aViewData.InsertHeaderEntry(aString); } -void SvxTPView::EnableAccept(BOOL nFlag) +void SvxTPView::EnableAccept(sal_Bool nFlag) { PbAccept.Enable(nFlag); } -void SvxTPView::EnableAcceptAll(BOOL nFlag) +void SvxTPView::EnableAcceptAll(sal_Bool nFlag) { PbAcceptAll.Enable(nFlag); } -void SvxTPView::EnableReject(BOOL nFlag) +void SvxTPView::EnableReject(sal_Bool nFlag) { PbReject.Enable(nFlag); } -void SvxTPView::EnableRejectAll(BOOL nFlag) +void SvxTPView::EnableRejectAll(sal_Bool nFlag) { PbRejectAll.Enable(nFlag); } -void SvxTPView::ShowUndo(BOOL nFlag) +void SvxTPView::ShowUndo(sal_Bool nFlag) { PbUndo.Show(nFlag); } -void SvxTPView::EnableUndo(BOOL nFlag) +void SvxTPView::EnableUndo(sal_Bool nFlag) { PbUndo.Enable(nFlag); } @@ -681,7 +682,7 @@ Size SvxTPView::GetMinSizePixel() Size aSize=aMinSize; if(PbUndo.IsVisible()) { - ULONG nSize=PbUndo.GetSizePixel().Width() + sal_uIntPtr nSize=PbUndo.GetSizePixel().Width() +PbUndo.GetPosPixel().X() +PbAccept.GetPosPixel().X(); @@ -752,12 +753,20 @@ SvxTPFilter::SvxTPFilter( Window * pParent) aEdComment ( this, SVX_RES( ED_COMMENT) ), aActionStr ( SVX_RES( STR_ACTION) ), aStrMyName ( SVX_RES( STR_FILTER) ), - bModified (FALSE) -{ + bModified (sal_False) +{ + aLbDate.SetAccessibleName( String( SVX_RES( STR_DATE_COMBOX) ) ); + aDfDate.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN) ) ); + aTfDate.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN) ) ); + aDfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN1) ) ); + aTfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN1) ) ); + aLbAuthor.SetAccessibleName(aCbAuthor.GetText()); + aLbAction.SetAccessibleName( String( SVX_RES( STR_ACTION) ) ); + aEdComment.SetAccessibleName(aCbComment.GetText()); FreeResource(); - aDfDate.SetShowDateCentury( TRUE ); - aDfDate2.SetShowDateCentury( TRUE ); + aDfDate.SetShowDateCentury( sal_True ); + aDfDate2.SetShowDateCentury( sal_True ); aRangeStr=aCbRange.GetText(); aLbDate.SelectEntryPos(0); @@ -797,7 +806,16 @@ SvxTPFilter::SvxTPFilter( Window * pParent) aTfDate2.SetTime(aTime); HideRange(); ShowAction(); - bModified=FALSE; + bModified=sal_False; + + aLbDate.SetAccessibleRelationLabeledBy(&aCbDate); + aLbAuthor.SetAccessibleRelationLabeledBy(&aCbAuthor); + aLbAction.SetAccessibleRelationLabeledBy(&aCbRange); + aEdRange.SetAccessibleRelationLabeledBy(&aCbRange); + aBtnRange.SetAccessibleRelationLabeledBy(&aCbRange); + aEdComment.SetAccessibleRelationLabeledBy(&aCbComment); + aDfDate2.SetAccessibleRelationLabeledBy(&aDfDate2); + aTfDate2.SetAccessibleRelationLabeledBy(&aTfDate2); } void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable) @@ -810,7 +828,7 @@ String SvxTPFilter::GetMyName() const return aStrMyName; } -void SvxTPFilter::DisableRange(BOOL bFlag) +void SvxTPFilter::DisableRange(sal_Bool bFlag) { if(bFlag) { @@ -826,43 +844,43 @@ void SvxTPFilter::DisableRange(BOOL bFlag) } } -void SvxTPFilter::ShowDateFields(USHORT nKind) +void SvxTPFilter::ShowDateFields(sal_uInt16 nKind) { String aEmpty; switch(nKind) { case FLT_DATE_BEFORE: - EnableDateLine1(TRUE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_False); break; case FLT_DATE_SINCE: - EnableDateLine1(TRUE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_False); break; case FLT_DATE_EQUAL: - EnableDateLine1(TRUE); + EnableDateLine1(sal_True); aTfDate.Disable(); aTfDate.SetText(aEmpty); - EnableDateLine2(FALSE); + EnableDateLine2(sal_False); break; case FLT_DATE_NOTEQUAL: - EnableDateLine1(TRUE); + EnableDateLine1(sal_True); aTfDate.Disable(); aTfDate.SetText(aEmpty); - EnableDateLine2(FALSE); + EnableDateLine2(sal_False); break; case FLT_DATE_BETWEEN: - EnableDateLine1(TRUE); - EnableDateLine2(TRUE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_True); break; case FLT_DATE_SAVE: - EnableDateLine1(FALSE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_False); + EnableDateLine2(sal_False); break; } } -void SvxTPFilter::EnableDateLine1(BOOL bFlag) +void SvxTPFilter::EnableDateLine1(sal_Bool bFlag) { if(bFlag && aCbDate.IsChecked()) { @@ -877,7 +895,7 @@ void SvxTPFilter::EnableDateLine1(BOOL bFlag) aIbClock.Disable(); } } -void SvxTPFilter::EnableDateLine2(BOOL bFlag) +void SvxTPFilter::EnableDateLine2(sal_Bool bFlag) { String aEmpty; if(bFlag && aCbDate.IsChecked()) @@ -939,22 +957,22 @@ void SvxTPFilter::SetLastTime(const Time &aTime) aTfDate2.SetTime(aTime); } -void SvxTPFilter::SetDateMode(USHORT nMode) +void SvxTPFilter::SetDateMode(sal_uInt16 nMode) { aLbDate.SelectEntryPos(nMode); SelDateHdl(&aLbDate); } -USHORT SvxTPFilter::GetDateMode() +sal_uInt16 SvxTPFilter::GetDateMode() { - return (USHORT) aLbDate.GetSelectEntryPos(); + return (sal_uInt16) aLbDate.GetSelectEntryPos(); } void SvxTPFilter::ClearAuthors() { aLbAuthor.Clear(); } -void SvxTPFilter::InsertAuthor( const String& rString, USHORT nPos) +void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos) { aLbAuthor.InsertEntry(rString,nPos); } @@ -964,17 +982,17 @@ String SvxTPFilter::GetSelectedAuthor() const return aLbAuthor.GetSelectEntry(); } -USHORT SvxTPFilter::GetSelectedAuthorPos() +sal_uInt16 SvxTPFilter::GetSelectedAuthorPos() { - return (USHORT) aLbAuthor.GetSelectEntryPos(); + return (sal_uInt16) aLbAuthor.GetSelectEntryPos(); } -void SvxTPFilter::SelectedAuthorPos(USHORT nPos) +void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos) { aLbAuthor.SelectEntryPos(nPos); } -USHORT SvxTPFilter::SelectAuthor(const String& aString) +sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString) { aLbAuthor.SelectEntry(aString); return aLbAuthor.GetSelectEntryPos(); @@ -995,7 +1013,7 @@ void SvxTPFilter::SetFocusToRange() aEdRange.GrabFocus(); } -void SvxTPFilter::HideRange(BOOL bHide) +void SvxTPFilter::HideRange(sal_Bool bHide) { if(bHide) { @@ -1005,7 +1023,7 @@ void SvxTPFilter::HideRange(BOOL bHide) } else { - ShowAction(FALSE); + ShowAction(sal_False); aCbRange.SetText(aRangeStr); aCbRange.Show(); aEdRange.Show(); @@ -1013,7 +1031,7 @@ void SvxTPFilter::HideRange(BOOL bHide) } } -void SvxTPFilter::HideClocks(BOOL bHide) +void SvxTPFilter::HideClocks(sal_Bool bHide) { if(bHide) { @@ -1036,66 +1054,66 @@ String SvxTPFilter::GetComment()const return aEdComment.GetText(); } -BOOL SvxTPFilter::IsDate() +sal_Bool SvxTPFilter::IsDate() { return aCbDate.IsChecked(); } -BOOL SvxTPFilter::IsAuthor() +sal_Bool SvxTPFilter::IsAuthor() { return aCbAuthor.IsChecked(); } -BOOL SvxTPFilter::IsRange() +sal_Bool SvxTPFilter::IsRange() { return aCbRange.IsChecked(); } -BOOL SvxTPFilter::IsAction() +sal_Bool SvxTPFilter::IsAction() { return aCbRange.IsChecked(); } -BOOL SvxTPFilter::IsComment() +sal_Bool SvxTPFilter::IsComment() { return aCbComment.IsChecked(); } -void SvxTPFilter::CheckDate(BOOL bFlag) +void SvxTPFilter::CheckDate(sal_Bool bFlag) { aCbDate.Check(bFlag); RowEnableHdl(&aCbDate); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckAuthor(BOOL bFlag) +void SvxTPFilter::CheckAuthor(sal_Bool bFlag) { aCbAuthor.Check(bFlag); RowEnableHdl(&aCbAuthor); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckRange(BOOL bFlag) +void SvxTPFilter::CheckRange(sal_Bool bFlag) { aCbRange.Check(bFlag); RowEnableHdl(&aCbRange); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckAction(BOOL bFlag) +void SvxTPFilter::CheckAction(sal_Bool bFlag) { aCbRange.Check(bFlag); RowEnableHdl(&aCbRange); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckComment(BOOL bFlag) +void SvxTPFilter::CheckComment(sal_Bool bFlag) { aCbComment.Check(bFlag); RowEnableHdl(&aCbComment); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::ShowAction(BOOL bShow) +void SvxTPFilter::ShowAction(sal_Bool bShow) { if(!bShow) { @@ -1121,7 +1139,7 @@ ListBox* SvxTPFilter::GetLbAction() IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb ) { - ShowDateFields((USHORT)aLbDate.GetSelectEntryPos()); + ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos()); ModifyHdl(pLb); return 0; } @@ -1132,8 +1150,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) { aLbDate.Enable(aCbDate.IsChecked()); aLbDate.Invalidate(); - EnableDateLine1(FALSE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_False); + EnableDateLine2(sal_False); if(aCbDate.IsChecked()) SelDateHdl(&aLbDate); } else if(pCB==&aCbAuthor) @@ -1202,7 +1220,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr) aModifyComLink.Call(this); } - bModified=TRUE; + bModified=sal_True; aModifyLink.Call(this); } return 0; @@ -1226,7 +1244,7 @@ void SvxTPFilter::DeactivatePage() pRedlinTable->SetFilterComment(IsComment()); utl::SearchParam aSearchParam( aEdComment.GetText(), - utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE ); + utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False ); pRedlinTable->SetCommentParams(&aSearchParam); @@ -1235,7 +1253,7 @@ void SvxTPFilter::DeactivatePage() aReadyLink.Call(this); } - bModified=FALSE; + bModified=sal_False; TabPage::DeactivatePage(); } @@ -1378,17 +1396,17 @@ void SvxAcceptChgCtr::Resize() { aMinSize=pTPView->GetMinSizePixel(); Size aSize=GetOutputSizePixel(); - BOOL bFlag=FALSE; + sal_Bool bFlag=sal_False; if(aMinSize.Height()>aSize.Height()) { aSize.Height()=aMinSize.Height(); - bFlag=TRUE; + bFlag=sal_True; } if(aMinSize.Width()>aSize.Width()) { aSize.Width()=aMinSize.Width(); - bFlag=TRUE; + bFlag=sal_True; } if(bFlag) @@ -1420,12 +1438,12 @@ void SvxAcceptChgCtr::ShowViewPage() aTCAccept.SetCurPageId(TP_VIEW); } -BOOL SvxAcceptChgCtr::IsFilterPageVisible() +sal_Bool SvxAcceptChgCtr::IsFilterPageVisible() { return (aTCAccept.GetCurPageId()==TP_FILTER); } -BOOL SvxAcceptChgCtr::IsViewPageVisible() +sal_Bool SvxAcceptChgCtr::IsViewPageVisible() { return (aTCAccept.GetCurPageId()==TP_VIEW); } diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc index 6bc98ee702b0..cfbc70294a49 100644..100755 --- a/svx/source/dialog/ctredlin.hrc +++ b/svx/source/dialog/ctredlin.hrc @@ -65,3 +65,11 @@ #define STR_TITLE3 3 #define STR_TITLE4 4 #define STR_TITLE5 5 +//IAccessibility2 Implementation 2009----- +#define STR_DATE_COMBOX 6 +#define STR_DATE_SPIN 7 +#define STR_DATE_SPIN1 8 +#define STR_DATE_TIME_SPIN 9 +#define STR_DATE_TIME_SPIN1 10 +#define STR_TREE 11 +//-----IAccessibility2 Implementation 2009 diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src index 6b97b66e3f0e..7bce5d474e18 100644..100755 --- a/svx/source/dialog/ctredlin.src +++ b/svx/source/dialog/ctredlin.src @@ -114,7 +114,10 @@ TabPage SID_REDLIN_FILTER_PAGE ImageBitmap = Bitmap { File = "time.bmp" ; }; MASKCOLOR }; - QuickHelpText [ en-US ] = "Set Date/Time" ; + // IAccessibility2 implementation 2009. ------ + //QuickHelpText [ en-US ] = "Set Date/Time" ; + QuickHelpText [ en-US ] = "Set Start Date/Time" ; + // ------ IAccessibility2 implementation 2009. }; FixedText FT_DATE2 { @@ -170,7 +173,10 @@ TabPage SID_REDLIN_FILTER_PAGE ImageBitmap = Bitmap { File = "time.bmp" ; }; MASKCOLOR }; - QuickHelpText [ en-US ] = "Set Date/Time" ; + // IAccessibility2 implementation 2009. ------ + //QuickHelpText [ en-US ] = "Set Date/Time" ; + QuickHelpText [ en-US ] = "Set End Date/Time" ; + // ------ IAccessibility2 implementation 2009. }; CheckBox CB_AUTOR { @@ -249,6 +255,32 @@ TabPage SID_REDLIN_FILTER_PAGE Size = MAP_APPFONT ( 178 , 12 ) ; TabStop = TRUE ; }; + /*IAccessibility2 Implementation 2009-----*/ + String STR_DATE_COMBOX + { + Text [ en-US ] = "Date Condition" ; + }; + String STR_DATE_SPIN + { + Text [ en-US ] = "Start Date" ; + }; + String STR_DATE_SPIN1 + { + Text [ en-US ] = "End Date" ; + }; + String STR_DATE_TIME_SPIN + { + Text [ en-US ] = "Start Time" ; + }; + String STR_DATE_TIME_SPIN1 + { + Text [ en-US ] = "End Time" ; + }; + String STR_TREE + { + Text [ en-US ] = "Changes" ; + }; + /*-----IAccessibility2 Implementation 2009*/ }; TabPage SID_REDLIN_VIEW_PAGE { diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 28223f837e47..91d33d367961 100644..100755 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" // === includes (declaration) ============================================ -#include "databaseregistrationui.hxx" +#include "svx/databaseregistrationui.hxx" // === includes (project) ================================================ #include <svx/svxdlg.hxx> @@ -44,9 +44,9 @@ namespace svx { - USHORT administrateDatabaseRegistration( Window* _parentWindow ) + sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow ) { - USHORT nResult = RET_CANCEL; + sal_uInt16 nResult = RET_CANCEL; SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 522da52ed282..ff98511135bf 100644..100755 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" #include <math.h> #include <vcl/virdev.hxx> @@ -81,7 +81,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) : mnCenterY(0), mbEnabled( true ) { - EnableRTL( FALSE ); + EnableRTL( sal_False ); } void DialControlBmp::InitBitmap( const Size& rSize, const Font& rFont ) @@ -186,7 +186,7 @@ void DialControlBmp::DrawBackground() SetFillColor(); Erase(); - EnableRTL( TRUE ); // draw 3D effect in correct direction + EnableRTL( sal_True ); // draw 3D effect in correct direction sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10; Color aColor; @@ -213,7 +213,7 @@ void DialControlBmp::DrawBackground() SetFillColor( aColor ); DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() ); - EnableRTL( FALSE ); + EnableRTL( sal_False ); // *** calibration *** @@ -282,7 +282,7 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont ) mnCenterX = maWinSize.Width() / 2; mnCenterY = maWinSize.Height() / 2; - maWinFont.SetTransparent( TRUE ); + maWinFont.SetTransparent( sal_True ); maBmpEnabled.DrawBackground( maWinSize, true ); maBmpDisabled.DrawBackground( maWinSize, false ); @@ -456,7 +456,7 @@ const Link& DialControl::GetModifyHdl() const void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); - EnableRTL( FALSE ); // don't mirror mouse handling + EnableRTL( sal_False ); // don't mirror mouse handling SetOutputSizePixel( mpImpl->maWinSize ); SetBackground(); } diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index 9fdd4104be00..9fdd4104be00 100644..100755 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index d866c1065789..143b67091f10 100644..100755 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -46,6 +46,7 @@ #include <svx/xlnwtit.hxx> #include "helpid.hrc" #include <algorithm> +#include <svx/dialmgr.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -91,7 +92,7 @@ void Svx3DPreviewControl::Construct() { // Do never mirror the preview window. This explicitly includes right // to left writing environments. - EnableRTL (FALSE); + EnableRTL (sal_False); SetMapMode( MAP_100TH_MM ); // Model @@ -120,7 +121,7 @@ void Svx3DPreviewControl::Construct() double fH = rVolume.getHeight(); double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0); - rCamera.SetAutoAdjustProjection(FALSE); + rCamera.SetAutoAdjustProjection(sal_False); rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ(); @@ -388,7 +389,7 @@ void Svx3DLightControl::Construct2() double fH = rVolume.getHeight(); double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0); - rCamera.SetAutoAdjustProjection(FALSE); + rCamera.SetAutoAdjustProjection(sal_False); rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ(); @@ -1012,6 +1013,7 @@ void SvxLightCtl3D::Init() maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); + maSwitcher.SetAccessibleName(String(SVX_RES(STR_SWITCH))); // Light preview maLightControl.Show(); @@ -1095,8 +1097,8 @@ void SvxLightCtl3D::CheckSelection() { double fHor, fVer; maLightControl.GetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); } } @@ -1115,8 +1117,8 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer ) return; maLightControl.SetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); if(maUserInteractiveChangeCallback.IsSet()) { @@ -1296,8 +1298,8 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG) double fHor, fVer; maLightControl.GetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); if(maUserInteractiveChangeCallback.IsSet()) { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2e8ff576c4aa..c9e3373f08ed 100644..100755 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -77,7 +77,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void ) } SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt, - USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) : + sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) : Control( pParent, rResId ), @@ -150,7 +150,7 @@ void SvxRectCtl::Resize_Impl() break; } Reset(); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); } // ----------------------------------------------------------------------- @@ -183,18 +183,18 @@ void SvxRectCtl::InitRectBitmap( void ) aColorAry2[6] = rStyles.GetDialogColor(); #ifdef DBG_UTIL - static BOOL bModify = FALSE; - BOOL& rModify = bModify; + static sal_Bool bModify = sal_False; + sal_Bool& rModify = bModify; if( rModify ) { static int n = 0; - static UINT8 r = 0xFF; - static UINT8 g = 0x00; - static UINT8 b = 0xFF; + static sal_uInt8 r = 0xFF; + static sal_uInt8 g = 0x00; + static sal_uInt8 b = 0xFF; int& rn = n; - UINT8& rr = r; - UINT8& rg = g; - UINT8& rb = b; + sal_uInt8& rr = r; + sal_uInt8& rg = g; + sal_uInt8& rb = b; aColorAry2[ rn ] = Color( rr, rg, rb ); } #endif @@ -204,7 +204,7 @@ void SvxRectCtl::InitRectBitmap( void ) // ----------------------------------------------------------------------- -void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -271,7 +271,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) if(!IsCompletelyDisabled()) { RECT_POINT eNewRP = eRP; - BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE); + sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE); switch( rKeyEvt.GetKeyCode().GetCode() ) { @@ -356,9 +356,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) void SvxRectCtl::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Window::StateChanged( nType ); } @@ -368,7 +368,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Window::DataChanged( rDCEvt ); } @@ -449,8 +449,8 @@ void SvxRectCtl::Paint( const Rectangle& ) Point aBtnPnt2( 11,0 ); Point aBtnPnt3( 22,0 ); - BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0; - BOOL bNoVert = (m_nState & CS_NOVERT) != 0; + sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0; + sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0; Bitmap& rBitmap = GetRectBitmap(); @@ -661,7 +661,7 @@ void SvxRectCtl::SetState( CTL_STATE nState ) ( (SvxTabPage*) GetParent() )->PointChanged( this, eRP ); } -UINT8 SvxRectCtl::GetNumOfChilds( void ) const +sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const { return ( eCS == CS_ANGLE )? 8 : 9; } @@ -750,11 +750,11 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) : void SvxAngleCtl::Initialize() { - bPositive = TRUE; + bPositive = sal_True; aFont.SetSize( aFontSize ); aFont.SetWeight( WEIGHT_NORMAL ); - aFont.SetTransparent( FALSE ); + aFont.SetTransparent( sal_False ); SetFont( aFont ); } @@ -813,10 +813,10 @@ void SvxAngleCtl::Paint( const Rectangle& ) // Control for editing bitmaps -SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) : +SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) : Control ( pParent, rResId ), nLines ( nNumber ), - bPaintable ( TRUE ) + bPaintable ( sal_True ) { aRectSize = GetOutputSize(); @@ -825,8 +825,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); nSquares = nLines * nLines; - pPixel = new USHORT[ nSquares ]; - rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + pPixel = new sal_uInt16[ nSquares ]; + rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); } // Destructor dealocating the dynamic array @@ -838,7 +838,7 @@ SvxPixelCtl::~SvxPixelCtl( ) // Changes the foreground or Background color -void SvxPixelCtl::ChangePixel( USHORT nPixel ) +void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel ) { if( *( pPixel + nPixel) == 0 ) *( pPixel + nPixel) = 1; // could be extended to more colors @@ -852,10 +852,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPt = PixelToLogic( rMEvt.GetPosPixel() ); Point aPtTl, aPtBr; - USHORT nX, nY; + sal_uInt16 nX, nY; - nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() ); - nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() ); + nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() ); + nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() ); ChangePixel( nX + nY * nLines ); @@ -874,7 +874,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) void SvxPixelCtl::Paint( const Rectangle& ) { - USHORT i, j, nTmp; + sal_uInt16 i, j, nTmp; Point aPtTl, aPtBr; if( bPaintable ) @@ -884,16 +884,16 @@ void SvxPixelCtl::Paint( const Rectangle& ) for( i = 1; i < nLines; i++) { // horizontal - nTmp = (USHORT) ( aRectSize.Height() * i / nLines ); + nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines ); DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) ); // vertically - nTmp = (USHORT) ( aRectSize.Width() * i / nLines ); + nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines ); DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) ); } //Draw Rectangles (squares) Control::SetLineColor(); - USHORT nLastPixel = *pPixel ? 0 : 1; + sal_uInt16 nLastPixel = *pPixel ? 0 : 1; for( i = 0; i < nLines; i++) { @@ -931,16 +931,16 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) aPixelColor = rXBmp.GetPixelColor(); aBackgroundColor = rXBmp.GetBackgroundColor(); - USHORT* pArray = rXBmp.GetPixelArray(); + sal_uInt16* pArray = rXBmp.GetPixelArray(); - for( USHORT i = 0; i < nSquares; i++ ) + for( sal_uInt16 i = 0; i < nSquares; i++ ) *( pPixel + i ) = *( pArray + i ); } } // Returns a specific pixel -USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel ) +sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel ) { return( *( pPixel + nPixel ) ); } @@ -950,7 +950,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel ) void SvxPixelCtl::Reset() { // clear pixel area - rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); Invalidate(); } @@ -980,14 +980,14 @@ void ColorLB::Fill( const XColorTable* pColorTab ) { long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { pEntry = pColorTab->GetColor( i ); InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } /************************************************************************/ @@ -999,7 +999,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* ) /************************************************************************/ -void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* ) +void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* ) { RemoveEntry( nPos ); InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos ); @@ -1011,19 +1011,19 @@ void FillAttrLB::Fill( const XColorTable* pColorTab ) { long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { pEntry = pColorTab->GetColor( i ); InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings -HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList ( NULL ), mbUserDraw( bUserDraw ) @@ -1031,7 +1031,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) EnableUserDraw( mbUserDraw ); } -HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ ) +HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, aWB ), mpList ( NULL ), mbUserDraw( bUserDraw ) @@ -1045,7 +1045,7 @@ void HatchingLB::Fill( const XHatchList* pList ) XHatchEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1065,7 +1065,7 @@ void HatchingLB::Fill( const XHatchList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1081,7 +1081,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt ) { OutputDevice* pDevice = rUDEvt.GetDevice(); - ULONG nOldDrawMode = pDevice->GetDrawMode(); + sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode(); pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch(); @@ -1118,7 +1118,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1131,11 +1131,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rHatch, USHORT nDist ) + const XHatch& rHatch, sal_uInt16 nDist ) { long nCount = pList->Count(); XHatchEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; long i; @@ -1146,10 +1146,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, aStr = pEntry->GetName(); if( rStr == aStr && rHatch == pEntry->GetHatch() ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings @@ -1158,7 +1158,7 @@ void FillAttrLB::Fill( const XHatchList* pList ) { long nCount = pList->Count(); XHatchEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1169,12 +1169,12 @@ void FillAttrLB::Fill( const XHatchList* pList ) else InsertEntry( pEntry->GetName() ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings -GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList(NULL), mbUserDraw( bUserDraw ) @@ -1182,7 +1182,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) EnableUserDraw( mbUserDraw); } -GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ ) +GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, aWB ), mpList(NULL), mbUserDraw( bUserDraw ) @@ -1196,7 +1196,7 @@ void GradientLB::Fill( const XGradientList* pList ) XGradientEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1216,7 +1216,7 @@ void GradientLB::Fill( const XGradientList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1234,7 +1234,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient(); Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() ); - aGradient.SetAngle( (USHORT)rXGrad.GetAngle() ); + aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() ); aGradient.SetBorder( rXGrad.GetBorder() ); aGradient.SetOfsX( rXGrad.GetXOffset() ); aGradient.SetOfsY( rXGrad.GetYOffset() ); @@ -1248,14 +1248,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) { long nWidth = pDevice->GetOutputSize().Width(); - pWin->EnableRTL( FALSE ); + pWin->EnableRTL( sal_False ); Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ), aRect.GetSize() ); pDevice->DrawGradient( aMirrorRect, aGradient ); - pWin->EnableRTL( TRUE ); + pWin->EnableRTL( sal_True ); } else pDevice->DrawGradient( aRect, aGradient ); @@ -1282,7 +1282,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1295,11 +1295,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr, - const XGradient& rGradient, USHORT nDist ) + const XGradient& rGradient, sal_uInt16 nDist ) { long nCount = pList->Count(); XGradientEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; long i; @@ -1310,10 +1310,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS aStr = pEntry->GetName(); if( rStr == aStr && rGradient == pEntry->GetGradient() ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings @@ -1322,7 +1322,7 @@ void FillAttrLB::Fill( const XGradientList* pList ) { long nCount = pList->Count(); XGradientEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1333,12 +1333,12 @@ void FillAttrLB::Fill( const XGradientList* pList ) else InsertEntry( pEntry->GetName() ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } // BitmapLB Constructor -BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList( NULL ), mbUserDraw( bUserDraw ) @@ -1377,7 +1377,7 @@ void BitmapLB::Fill( const XBitmapList* pList ) XBitmapEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1397,7 +1397,7 @@ void BitmapLB::Fill( const XBitmapList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1462,7 +1462,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1484,7 +1484,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, { long nCount = pList->Count(); XBitmapEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; long i; for( i = 0; i < nCount && !bFound; i++ ) @@ -1495,11 +1495,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, if( rStr == aStr ) { - bFound = TRUE; + bFound = sal_True; } } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } // FillAttrLB Constructor @@ -1546,7 +1546,7 @@ void FillAttrLB::Fill( const XBitmapList* pList ) { long nCount = pList->Count(); XBitmapEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1557,7 +1557,7 @@ void FillAttrLB::Fill( const XBitmapList* pList ) ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } /************************************************************************/ @@ -1567,7 +1567,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr { long nCount = pList->Count(); XBitmapEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; long i; for( i = 0; i < nCount && !bFound; i++ ) @@ -1578,24 +1578,24 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr if( rStr == aStr ) { - bFound = TRUE; + bFound = sal_True; } } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } // Fills the listbox (provisional) with strings void FillTypeLB::Fill() { - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) ); - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings @@ -1604,7 +1604,7 @@ void LineLB::Fill( const XDashList* pList ) { long nCount = pList->Count(); XDashEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1618,7 +1618,7 @@ void LineLB::Fill( const XDashList* pList ) else InsertEntry( pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void LineLB::FillStyles() @@ -1657,7 +1657,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1670,11 +1670,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, USHORT nDist ) + const XDash& rDash, sal_uInt16 nDist ) { long nCount = pList->Count(); XDashEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; XDash aDash; @@ -1687,20 +1687,20 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, aDash = pEntry->GetDash(); if( rStr == aStr && rDash == aDash ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings -void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) +void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart ) { long nCount = pList->Count(); XLineEndEntry* pEntry; VirtualDevice aVD; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1709,7 +1709,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) if( pBitmap ) { Size aBmpSize( pBitmap->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBitmap ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1720,20 +1720,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) else InsertEntry( pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } /************************************************************************/ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp, - BOOL bStart ) + sal_Bool bStart ) { if( pBmp ) { VirtualDevice aVD; Size aBmpSize( pBmp->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBmp ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1745,8 +1745,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp, /************************************************************************/ -void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp, - BOOL bStart ) +void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp, + sal_Bool bStart ) { RemoveEntry( nPos ); @@ -1755,7 +1755,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp, VirtualDevice aVD; Size aBmpSize( pBmp->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBmp ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1894,7 +1894,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) mbWithSymbol( sal_False ) { const Size aOutputSize(GetOutputSize()); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); const sal_Int32 nDistance(500L); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src index 2da544673c65..e5962dcef059 100644..100755 --- a/svx/source/dialog/dlgctrl.src +++ b/svx/source/dialog/dlgctrl.src @@ -31,4 +31,9 @@ Bitmap RID_SVXCTRL_RECTBTNS { File = "rectbtns.bmp" ; }; - +/*IAccessibility2 Implementation 2009-----*/ +String STR_SWITCH +{ + Text [ en-US ] = "Switch" ; +}; +/*-----IAccessibility2 Implementation 2009*/ diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index f0e0999823ba..93c93e9ef586 100644..100755 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> @@ -46,7 +46,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else { diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index d15c5aefe8b6..be38cda0c48b 100644..100755 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -894,7 +894,7 @@ void SaveProgressDialog::end() //=============================================== RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, - USHORT nFlags, + sal_uInt16 nFlags, const String& sText ) : SvLBoxString( pEntry, nFlags, sText ) { @@ -903,7 +903,7 @@ RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, //=============================================== void RecovDocListEntry::Paint(const Point& aPos , SvLBox& aDevice, - USHORT /*nFlags */, + sal_uInt16 /*nFlags */, SvLBoxEntry* pEntry ) { const Image* pImg = 0; @@ -1071,7 +1071,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent, m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() ); - m_aNextBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) ); m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) ); @@ -1114,8 +1114,8 @@ short RecoveryDialog::execute() // Dialog was started first time ... // wait for user decision ("start" or "cancel" recovery) // This decision will be made inside the NextBtn handler. - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_True); m_bWaitForUser = sal_True; while(m_bWaitForUser) Application::Yield(); @@ -1133,8 +1133,8 @@ short RecoveryDialog::execute() // do it asynchronous (to allow repaints) // and wait for this asynchronous operation. m_aDescrFT.SetText( m_aTitleRecoveryInProgress ); - m_aNextBtn.Enable(FALSE); - m_aCancelBtn.Enable(FALSE); + m_aNextBtn.Enable(sal_False); + m_aCancelBtn.Enable(sal_False); m_pCore->setProgressHandler(m_xProgress); m_pCore->setUpdateListener(this); m_pCore->doRecovery(); @@ -1156,15 +1156,15 @@ short RecoveryDialog::execute() { m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr); m_aNextBtn.SetText(m_aRecoveryOnlyFinish); - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(FALSE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_False); } else { m_aDescrFT.SetText(m_aTitleRecoveryReport); m_aNextBtn.SetText(m_aNextStr); - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_True); } m_bWaitForUser = sal_True; @@ -1341,8 +1341,8 @@ void RecoveryDialog::start() //=============================================== void RecoveryDialog::updateItems() { - ULONG c = m_aFileListLB.GetEntryCount(); - ULONG i = 0; + sal_uIntPtr c = m_aFileListLB.GetEntryCount(); + sal_uIntPtr i = 0; for ( i=0; i<c; ++i ) { SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); @@ -1365,8 +1365,8 @@ void RecoveryDialog::updateItems() //=============================================== void RecoveryDialog::stepNext(TURLInfo* pItem) { - ULONG c = m_aFileListLB.GetEntryCount(); - ULONG i = 0; + sal_uIntPtr c = m_aFileListLB.GetEntryCount(); + sal_uIntPtr i = 0; for (i=0; i<c; ++i) { SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); @@ -1516,7 +1516,7 @@ void BrokenRecoveryDialog::impl_refresh() m_bExecutionNeeded = sal_True; - USHORT nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); + sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_aFileListLB.SetEntryData( nPos, (void*)&rInfo ); } m_sSavePath = ::rtl::OUString(); @@ -1568,7 +1568,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker( m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL(m_sSavePath, INET_PROT_FILE); xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE)); @@ -1681,13 +1680,13 @@ void BrokenRecoveryDialog::impl_askForSavePath() ExtTextEngine* pTextEngine = GetTextEngine(); DBG_ASSERT( pTextEngine, "no text engine" ); - ULONG i, nParaCount = pTextEngine->GetParagraphCount(); - USHORT nLineCount = 0; + sal_uIntPtr i, nParaCount = pTextEngine->GetParagraphCount(); + sal_uInt16 nLineCount = 0; for ( i = 0; i < nParaCount; ++i ) nLineCount = nLineCount + pTextEngine->GetLineCount(i); - USHORT nVisCols = 0, nVisLines = 0; + sal_uInt16 nVisCols = 0, nVisLines = 0; GetMaxVisColumnsAndLines( nVisCols, nVisLines ); GetVScrollBar()->Show( nLineCount > nVisLines ); @@ -1928,14 +1927,14 @@ void BrokenRecoveryDialog::impl_askForSavePath() default: #ifdef WNT case 0: - maSystemBtn.Check( TRUE ); + maSystemBtn.Check( sal_True ); break; #endif case 1: - maDirectBtn.Check( TRUE ); + maDirectBtn.Check( sal_True ); break; case 2: - maManualBtn.Check( TRUE ); + maManualBtn.Check( sal_True ); break; } @@ -1997,7 +1996,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() GetTextEngine()->SetFont( aFont ); // no blinking cursor and a little left margin - EnableCursor( FALSE ); + EnableCursor( sal_False ); SetLeftMargin( 4 ); } diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 534edf625fa9..3944ac3e0438 100644..100755 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -36,7 +36,7 @@ // TabDialog #define TABDLG_WIDTH 290 -#define TABDLG_HEIGHT 278 +#define TABDLG_HEIGHT 238 // TabPage CrashSave @@ -52,7 +52,7 @@ #define SAVE_WIDTH 290 -#define SAVE_HEIGHT 278 +#define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 #define SAVE_DESCRHEIGHT 48 #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 2da85bc8c591..1279d8b7facf 100644..100755 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE }; ListBox LB_SAVE_FILELIST { + HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST"; Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 ); Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT ); Border = TRUE; @@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER }; PushButton BTN_RECOV_NEXT { + HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Start Recovery >"; @@ -288,6 +290,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; ListBox LB_BROKEN_FILELIST { + HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 ); Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) ); Border = TRUE; @@ -301,12 +304,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; Edit ED_BROKEN_SAVEDIR { + HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; }; PushButton BTN_BROKEN_SAVEDIR { + HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Chan~ge..."; @@ -367,6 +372,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -425,6 +431,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_DOCTYPE { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -437,6 +444,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; MultiLineEdit ML_ERRSEND_USING { + HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) ); VScroll = TRUE; @@ -445,18 +453,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_ERRSEND_SHOWREP { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "Show ~Report"; }; PushButton BTN_ERRSEND_OPT { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Options..."; }; CheckBox CB_ERRSEND_CONTACT { + HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT ); Check = FALSE; @@ -470,6 +481,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_EMAILADDR { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR"; Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -481,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV"; Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -518,6 +531,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_SYSTEM { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~system settings"; @@ -525,6 +539,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_DIRECT { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~direct connection to the Internet"; @@ -532,6 +547,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_MANUAL { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~manual settings"; @@ -546,6 +562,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYSERVER { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER"; Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -560,6 +577,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYPORT { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT"; Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -606,6 +624,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW MultiLineEdit ML_ERRPREVIEW_CONTENT { + HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT"; Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 ); Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 ); VScroll = TRUE; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 1296071fd59d..14eb6dd78272 100644..100755 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -71,7 +71,7 @@ namespace // ----------------------------------------------------------------------- void initFont(Font& _rFont) { - _rFont.SetTransparent(TRUE); + _rFont.SetTransparent(sal_True); _rFont.SetAlign(ALIGN_BASELINE); } // ----------------------------------------------------------------------- @@ -97,7 +97,7 @@ namespace void setFont( const SvxFont& rNewFont, SvxFont& rImplFont ) { rImplFont = rNewFont; - rImplFont.SetTransparent( TRUE ); + rImplFont.SetTransparent( sal_True ); rImplFont.SetAlign( ALIGN_BASELINE ); } @@ -113,7 +113,7 @@ class FontPrevWin_Impl SvxFont aFont; Printer* pPrinter; - BOOL bDelPrinter; + sal_Bool bDelPrinter; Reference < XBreakIterator > xBreak; SvULongs aTextWidth; @@ -132,9 +132,9 @@ class FontPrevWin_Impl long n100PercentFontWidth; // initial -1 -> not set yet long n100PercentFontWidthCJK; long n100PercentFontWidthCTL; - UINT16 nFontWidthScale; + sal_uInt16 nFontWidthScale; - BOOL bSelection : 1, + sal_Bool bSelection : 1, bGetSelection : 1, bUseResText : 1, bTwoLines : 1, @@ -146,13 +146,13 @@ class FontPrevWin_Impl void _CheckScript(); public: inline FontPrevWin_Impl() : - pPrinter( NULL ), bDelPrinter( FALSE ), + pPrinter( NULL ), bDelPrinter( sal_False ), pColor( NULL ), pBackColor( 0 ), nAscent( 0 ), cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ), - bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ), - bTwoLines( FALSE ), - bIsCJKUI( FALSE ), bIsCTLUI( FALSE ), - bUseFontNameAsText( FALSE ), bTextInited( FALSE ) + bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ), + bTwoLines( sal_False ), + bIsCJKUI( sal_False ), bIsCTLUI( sal_False ), + bUseFontNameAsText( sal_False ), bTextInited( sal_False ) { Invalidate100PercentFontWidth(); } @@ -169,9 +169,9 @@ public: Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont ); void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont ); - BOOL SetFontWidthScale( UINT16 nScaleInPercent ); + sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent ); inline void Invalidate100PercentFontWidth(); - inline BOOL Is100PercentFontWidthValid() const; + inline sal_Bool Is100PercentFontWidthValid() const; void ScaleFontWidth( const OutputDevice& rOutDev ); // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and // sets the 100%-Font-Widths @@ -188,7 +188,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth() n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1; } -inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const +inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const { DBG_ASSERT( ( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) || ( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) || @@ -211,10 +211,10 @@ inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const void FontPrevWin_Impl::_CheckScript() { aScriptText = aText; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { - aScriptChg.Remove( 0, nCnt ); + aScriptChg.clear(); aScriptType.Remove( 0, nCnt ); aTextWidth.Remove( 0, nCnt ); nCnt = 0; @@ -227,8 +227,8 @@ void FontPrevWin_Impl::_CheckScript() } if( xBreak.is() ) { - USHORT nScript = xBreak->getScriptType( aText, 0 ); - USHORT nChg = 0; + sal_uInt16 nScript = xBreak->getScriptType( aText, 0 ); + sal_uInt16 nChg = 0; if( com::sun::star::i18n::ScriptType::WEAK == nScript ) { nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript ); @@ -249,25 +249,25 @@ void FontPrevWin_Impl::_CheckScript() if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK || nType == U_COMBINING_SPACING_MARK ) { - aScriptChg.Insert( nChg - 1, nCnt ); + aScriptChg.push_back( nChg - 1 ); } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } aScriptType.Insert( nScript, nCnt ); - aTextWidth.Insert( ULONG(0), nCnt++ ); + aTextWidth.Insert( sal_uIntPtr(0), nCnt++ ); if( nChg < aText.Len() ) nScript = xBreak->getScriptType( aText, nChg ); else break; - } while( TRUE ); + } while( sal_True ); } } @@ -284,11 +284,11 @@ void FontPrevWin_Impl::_CheckScript() Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter, SvxFont &rFont ) { - USHORT nScript; - USHORT nIdx = 0; + sal_uInt16 nScript; + sal_uInt16 nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; @@ -309,7 +309,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter do { SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont); - ULONG nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ). + sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ). Width(); aTextWidth[ nIdx++ ] = nWidth; nTxtWidth += nWidth; @@ -334,7 +334,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter else break; } - while( TRUE ); + while( sal_True ); nHeight -= nAscent; nCJKHeight -= nCJKAscent; nCTLHeight -= nCTLAscent; @@ -363,11 +363,11 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, Point &rPt, SvxFont &rFont ) { Font aOldFont = _pPrinter->GetFont(); - USHORT nScript; - USHORT nIdx = 0; + sal_uInt16 nScript; + sal_uInt16 nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; @@ -395,21 +395,21 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, else break; } - while( TRUE ); + while( sal_True ); _pPrinter->SetFont( aOldFont ); } // ----------------------------------------------------------------------- -BOOL FontPrevWin_Impl::SetFontWidthScale( UINT16 nScale ) +sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale ) { if( nFontWidthScale != nScale ) { nFontWidthScale = nScale; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } @@ -431,7 +431,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev ) // class SvxFontPrevWindow ----------------------------------------------- -void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -470,13 +470,13 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : if ( !pImpl->pPrinter ) { pImpl->pPrinter = new Printer; - pImpl->bDelPrinter = TRUE; + pImpl->bDelPrinter = sal_True; } SetMapMode( MapMode( MAP_TWIP ) ); initFont(pImpl->aFont); initFont(pImpl->aCJKFont); initFont(pImpl->aCTLFont); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); SetBorderStyle( WINDOW_BORDER_MONO ); LanguageType eLanguage = Application::GetSettings().GetUILanguage(); @@ -527,9 +527,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont() void SvxFontPrevWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Window::StateChanged( nType ); } @@ -539,7 +539,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType ) void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Window::DataChanged( rDCEvt ); } @@ -560,14 +560,14 @@ const SvxFont& SvxFontPrevWindow::GetFont() const void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString ) { pImpl->aText = rString; - pImpl->bTextInited = TRUE; + pImpl->bTextInited = sal_True; } // ----------------------------------------------------------------------- void SvxFontPrevWindow::SetFontNameAsPreviewText() { - pImpl->bUseFontNameAsText = TRUE; + pImpl->bUseFontNameAsText = sal_True; } // ----------------------------------------------------------------------- @@ -639,7 +639,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::UseResourceText( BOOL bUse ) +void SvxFontPrevWindow::UseResourceText( sal_Bool bUse ) { pImpl->bUseResText = bUse; } @@ -662,7 +662,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText ) { pImpl->aText = pSh->GetSelectionText(); - pImpl->bGetSelection = TRUE; + pImpl->bGetSelection = sal_True; pImpl->bSelection = pImpl->aText.Len() != 0; } @@ -803,12 +803,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) } } -BOOL SvxFontPrevWindow::IsTwoLines() const +sal_Bool SvxFontPrevWindow::IsTwoLines() const { return pImpl->bTwoLines; } -void SvxFontPrevWindow::SetTwoLines(BOOL bSet) +void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet) { pImpl->bTwoLines = bSet;} @@ -821,7 +821,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetFontWidthScale( UINT16 n ) +void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) { if( pImpl->SetFontWidthScale( n ) ) Invalidate(); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index f3e080dc7475..4b3db2257ae4 100644..100755 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fontlb.hxx" +#include "svx/fontlb.hxx" #include <vcl/svapp.hxx> // ============================================================================ @@ -100,7 +100,7 @@ SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) : maStdFont( GetFont() ), mbUseFont( false ) { - maStdFont.SetTransparent( TRUE ); + maStdFont.SetTransparent( sal_True ); maEntryFont = maStdFont; } @@ -125,10 +125,10 @@ void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect ) void SvxFontListBox::SetNoSelection() { - SelectAll( FALSE, TRUE ); + SelectAll( sal_False, sal_True ); } -ULONG SvxFontListBox::GetSelectEntryPos() const +sal_uLong SvxFontListBox::GetSelectEntryPos() const { SvLBoxEntry* pSvLBoxEntry = FirstSelected(); return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index ef7677ca65da..e7dfd58f8037 100644..100755 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -42,7 +42,7 @@ #include <svx/xtextit.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialogs.hrc> #include "fontwork.hrc" @@ -57,7 +57,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK ); SvxFontWorkControllerItem::SvxFontWorkControllerItem ( - USHORT _nId, + sal_uInt16 _nId, SvxFontWorkDialog& rDlg, SfxBindings& rBindings ) : @@ -70,7 +70,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem // StateChanged method for FontWork items -void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, +void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { switch ( GetId() ) @@ -179,7 +179,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS SvxFontWorkChildWindow::SvxFontWorkChildWindow ( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -274,10 +274,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, // Set System metric const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); - SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True ); if( eDlgUnit == FUNIT_MM ) { aMtrFldDistance.SetSpinSize( 50 ); @@ -309,7 +309,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, SvxFontWorkDialog::~SvxFontWorkDialog() { - for (USHORT i = 0; i < CONTROLLER_COUNT; i++) + for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++) DELETEZ(pCtrlItems[i]); } @@ -363,7 +363,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) { if ( pItem ) { - USHORT nId = TBI_STYLE_OFF; + sal_uInt16 nId = TBI_STYLE_OFF; switch ( pItem->GetValue() ) { @@ -378,16 +378,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) // Make sure that there is allways exactly one checked toolbox item. if ( pItem->GetValue() == XFT_NONE ) { - aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE); + aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False); - aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE); + aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True); } else { - aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE); + aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False); aTbxStyle.CheckItem(nId); } @@ -403,7 +403,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) { if ( pItem ) { - USHORT nId; + sal_uInt16 nId; aTbxAdjust.Enable(); aMtrFldDistance.Enable(); @@ -476,7 +476,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem) if ( pItem->GetValue() != XFTFORM_NONE ) aFormSet.SelectItem( - sal::static_int_cast< USHORT >(pItem->GetValue())); + sal::static_int_cast< sal_uInt16 >(pItem->GetValue())); } else aFormSet.Disable(); @@ -501,11 +501,11 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem) // Set shadow buttons void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, - BOOL bRestoreValues) + sal_Bool bRestoreValues) { if ( pItem ) { - USHORT nId; + sal_uInt16 nId; aTbxShadow.Enable(); @@ -622,7 +622,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) if ( pItem && !aMtrFldShadowX.HasChildPathFocus() ) { // #i19251# - // INT32 nValue = pItem->GetValue(); + // sal_Int32 nValue = pItem->GetValue(); // #i19251# // The two involved fields/items are used double and contain/give different @@ -669,7 +669,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxStyle.GetCurItemId(); + sal_uInt16 nId = aTbxStyle.GetCurItemId(); // Execute this block when a different toolbox item has been clicked or // when the off item has been clicked. The later is necessary to @@ -697,7 +697,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxAdjust.GetCurItemId(); + sal_uInt16 nId = aTbxAdjust.GetCurItemId(); if ( nId == TBI_ADJUST_MIRROR ) { @@ -724,7 +724,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxShadow.GetCurItemId(); + sal_uInt16 nId = aTbxShadow.GetCurItemId(); if ( nId == TBI_SHOWFORM ) { @@ -757,7 +757,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) XFormTextShadowItem aItem(eShadow); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L ); - SetShadow_Impl(&aItem, TRUE); + SetShadow_Impl(&aItem, sal_True); } return 0; } @@ -777,16 +777,16 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); if( eDlgUnit != aMtrFldDistance.GetUnit() ) { - SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True ); aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); } if( eDlgUnit != aMtrFldShadowX.GetUnit() && aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) ) { - SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True ); aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); } @@ -854,7 +854,7 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) } } -void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/) +void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/) { } @@ -953,8 +953,8 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, basegfx::B2DPolyPolygon aPolyPolygon; basegfx::B2DPolygon aLine; long nR = aRect.GetWidth() / 2; - basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon()); - basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon()); + basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon()); // Close Polygon aTopArc.setClosed(true); @@ -984,7 +984,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, if ( eForm == XFTFORM_BUTTON4 ) { - basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon()); aNewArc.setClosed(true); aPolyPolygon.append(aNewArc); eAdjust = XFT_CENTER; @@ -1007,7 +1007,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, if ( eForm == XFTFORM_BUTTON4 ) { - basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon()); aNewArc.setClosed(true); aPolyPolygon.append(aNewArc); } @@ -1041,7 +1041,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) ); OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject(); - BOOL bHide = TRUE; + sal_Bool bHide = sal_True; if ( pPara != NULL ) { @@ -1049,9 +1049,9 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, pNewObj->SetOutlinerParaObject(pPara); } else - bHide = FALSE; + bHide = sal_False; - rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, TRUE); + rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True); pNewObj->SetLayer(rOldObj.GetLayer()); aAttr.Put(XFormTextHideFormItem(bHide)); aAttr.Put(XFormTextAdjustItem(eAdjust)); @@ -1091,11 +1091,11 @@ void SvxFontWorkDialog::ApplyImageList() ResMgr* _pMgr = &DIALOG_MGR(); USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; - USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1; + sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1; bool bInit = aFormSet.GetItemCount() == 0; - USHORT i; + sal_uInt16 i; for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ ) { if( bInit ) diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc index 3c696d41da9d..3c696d41da9d 100644..100755 --- a/svx/source/dialog/fontwork.hrc +++ b/svx/source/dialog/fontwork.hrc diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index a8aec80e52bb..960a3b176512 100644..100755 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -34,7 +34,7 @@ // RID_SVXDLG_FONTWORK --------------------------------------------------- DockingWindow RID_SVXDLG_FONTWORK { - HelpId = SID_FONTWORK ; + HelpId = CMD_SID_FONTWORK ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_DISTANCE { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 85 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_TEXTSTART { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 100 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_X { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 144 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_Y { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 159 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; ListBox CLB_SHADOW_COLOR { + HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 174 ) ; Size = MAP_APPFONT ( 71 , 60 ) ; diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 9a7f9b09e25e..e9ae076dde1f 100644..100755 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -715,7 +715,7 @@ inline Point lclToMapUnit( long nSubXPos, long nSubYPos ) /** Returns a polygon constructed from a vector of points. */ inline Polygon lclCreatePolygon( const PointVec& rPoints ) { - return Polygon( static_cast< USHORT >( rPoints.size() ), &rPoints[ 0 ] ); + return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] ); } /** Returns a polygon constructed from the four passed points. */ @@ -1133,9 +1133,9 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid { maColor = rBorder.GetColor(); - USHORT nPrim = rBorder.GetOutWidth(); - USHORT nDist = rBorder.GetDistance(); - USHORT nSecn = rBorder.GetInWidth(); + sal_uInt16 nPrim = rBorder.GetOutWidth(); + sal_uInt16 nDist = rBorder.GetDistance(); + sal_uInt16 nSecn = rBorder.GetInWidth(); if( !nSecn ) // no or single frame border { diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index af82d4d6695c..af82d4d6695c 100644..100755 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 965ff2cc24ac..965ff2cc24ac 100644..100755 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index cc26be12c90d..bedb2cc61b9c 100644..100755 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -108,7 +108,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder ) } /** Converts an SvxBorderLine line width (in twips) to a pixel line width. */ -inline sal_uInt16 lclGetPixel( USHORT nWidth ) +inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth ) { // convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0; @@ -216,7 +216,7 @@ void FrameBorder::SetKeyboardNeighbors( meKeyBottom = eBottom; } -FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const +FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const { FrameBorderType eBorder = FRAMEBORDER_NONE; switch( nKeyCode ) @@ -423,7 +423,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); aFocusVec.clear(); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) ); @@ -432,7 +432,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); } } @@ -574,7 +574,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) long nTLPos = 0; long nBRPos = mnCtrlSize - mnArrowSize; Point aPos1, aPos2; - USHORT nImgId1 = 0, nImgId2 = 0; + sal_uInt16 nImgId1 = 0, nImgId2 = 0; switch( rBorder.GetType() ) { case FRAMEBORDER_LEFT: @@ -603,7 +603,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) } // Arrow or marker? Do not draw arrows into disabled control. - USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; + sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) ); maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) ); } @@ -697,7 +697,7 @@ void FrameSelectorImpl::DrawAllTrackingRects() aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) ); aPPoly.Optimize( POLY_OPTIMIZE_CLOSE ); - for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) + for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } @@ -879,7 +879,7 @@ void FrameSelector::HideAllBorders() mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE ); } -bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn, +bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn, SvxBorderStyle& rnStyle ) const { VisFrameBorderCIter aIt( mxImpl->maEnabBorders ); @@ -961,7 +961,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) mxImpl->SelectBorder( **aIt, bSelect ); } -void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn, +void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn, SvxBorderStyle nStyle ) { mxImpl->maCurrStyle.SetOutWidth( nPrim ); @@ -1133,7 +1133,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt ) KeyCode aKeyCode = rKEvt.GetKeyCode(); if( !aKeyCode.GetModifier() ) { - USHORT nCode = aKeyCode.GetCode(); + sal_uInt16 nCode = aKeyCode.GetCode(); switch( nCode ) { case KEY_SPACE: diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src index 754e0b962b29..754e0b962b29 100644..100755 --- a/svx/source/dialog/frmsel.src +++ b/svx/source/dialog/frmsel.src diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index d4300f5cbdde..f4b98e26fcfb 100644..100755 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -40,12 +40,12 @@ #include <svx/graphctl.hxx> #include "GraphCtlAccessibleContext.hxx" -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/svxids.hrc> #include <svx/svdpage.hxx> // #i72889# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ ) { @@ -70,8 +70,8 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : aMap100 ( MAP_100TH_MM ), eObjKind ( OBJ_NONE ), nPolyEdit ( 0 ), - bEditMode ( FALSE ), - bSdrMode ( FALSE ), + bEditMode ( sal_False ), + bSdrMode ( sal_False ), mpAccContext ( NULL ), pModel ( NULL ), pView ( NULL ) @@ -83,7 +83,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : SetWinStyle( nWinBits ); - EnableRTL( FALSE ); + EnableRTL( sal_False ); } GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : @@ -92,9 +92,9 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : nWinStyle ( 0 ), eObjKind ( OBJ_NONE ), nPolyEdit ( 0 ), - bEditMode ( FALSE ), - bSdrMode ( FALSE ), - bAnim ( FALSE ), + bEditMode ( sal_False ), + bSdrMode ( sal_False ), + bAnim ( sal_False ), mpAccContext ( NULL ), pModel ( NULL ), pView ( NULL ) @@ -103,7 +103,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : aUpdateTimer.SetTimeout( 500 ); aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) ); aUpdateTimer.Start(); - EnableRTL( FALSE ); + EnableRTL( sal_False ); } GraphCtrl::~GraphCtrl() @@ -165,11 +165,11 @@ void GraphCtrl::InitSdrModel() // Creating a View pView = new GraphCtrlView( pModel, this ); pView->SetWorkArea( Rectangle( Point(), aGraphSize ) ); - pView->EnableExtendedMouseEventDispatcher( TRUE ); + pView->EnableExtendedMouseEventDispatcher( sal_True ); pView->ShowSdrPage(pView->GetModel()->GetPage(0)); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC ); - pView->SetEditMode( TRUE ); + pView->SetEditMode( sal_True ); // #i72889# set neeeded flags pView->SetPagePaintingAllowed(false); @@ -181,7 +181,7 @@ void GraphCtrl::InitSdrModel() mpAccContext->setModelAndView (pModel, pView); } -void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel ) +void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel ) { // If possible we dither bitmaps for the display if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP ) ) @@ -310,7 +310,7 @@ void GraphCtrl::MarkListHasChanged() void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { KeyCode aCode( rKEvt.GetKeyCode() ); - BOOL bProc = FALSE; + sal_Bool bProc = sal_False; switch ( aCode.GetCode() ) { @@ -320,7 +320,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( bSdrMode ) { pView->DeleteMarked(); - bProc = TRUE; + bProc = sal_True; if( !pView->AreObjectsMarked() ) ((Dialog*)GetParent())->GrabFocusToFirstControl(); } @@ -353,7 +353,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { ((Dialog*)GetParent())->GrabFocusToFirstControl(); } - bProc = TRUE; + bProc = sal_True; } } break; @@ -374,7 +374,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) pView->UnmarkAllObj(); pView->MarkNextObj (bForward); } - bProc = TRUE; + bProc = sal_True; } else if(aCode.IsMod1()) { @@ -397,7 +397,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { // mark last object pView->UnmarkAllObj(); - pView->MarkNextObj(FALSE); + pView->MarkNextObj(sal_False); bProc = true; } @@ -409,7 +409,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( aCode.IsMod1() ) { pView->UnmarkAllObj(); - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); bProc = true; } @@ -525,13 +525,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if(pView->IsDragObj()) { bool bWasNoSnap = rDragStat.IsNoSnap(); - BOOL bWasSnapEnabled = pView->IsSnapEnabled(); + sal_Bool bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(TRUE); + ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); if(bWasSnapEnabled) - pView->SetSnapEnabled(FALSE); + pView->SetSnapEnabled(sal_False); pView->MovAction(aEndPoint); pView->EndDragObj(); @@ -604,7 +604,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) } } - bProc = TRUE; + bProc = sal_True; } } } @@ -721,20 +721,20 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const return pSdrObj; } -void GraphCtrl::SetEditMode( const BOOL _bEditMode ) +void GraphCtrl::SetEditMode( const sal_Bool _bEditMode ) { if ( bSdrMode ) { bEditMode = _bEditMode; pView->SetEditMode( bEditMode ); eObjKind = OBJ_NONE; - pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); + pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) ); } else - bEditMode = FALSE; + bEditMode = sal_False; } -void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit ) +void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) { if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) ) { @@ -749,10 +749,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) { if ( bSdrMode ) { - bEditMode = FALSE; + bEditMode = sal_False; pView->SetEditMode( bEditMode ); eObjKind = _eObjKind; - pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); + pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) ); } else eObjKind = OBJ_NONE; diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 92d0ffe93d0b..53d67f116030 100644..100755 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -44,10 +44,10 @@ // - SvxGraphicFilter - // -------------------- -ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) +sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) { const Graphic& rGraphic = rFilterObject.GetGraphic(); - ULONG nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; + sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; if( rGraphic.GetType() == GRAPHIC_BITMAP ) { @@ -61,7 +61,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r case( SID_GRFFILTER_INVERT ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -79,14 +79,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SMOOTH ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -104,14 +104,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SHARPEN ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -129,14 +129,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_REMOVENOISE ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -154,14 +154,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SOBEL ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -179,7 +179,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; @@ -188,7 +188,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC); DBG_ASSERT(aDlg, "Dialogdiet fail!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); @@ -228,7 +228,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r case( SID_GRFFILTER_POPART ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -246,7 +246,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; @@ -269,7 +269,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, FALSE, RID_SVX_GRFFILTER_DLG_SOLARIZE ); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE ); DBG_ASSERT(aDlg, "Dialogdiet fail!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index c5c38ade741a..90438e867974 100644..100755 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -49,9 +49,9 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <editeng/brshitem.hxx> #include <editeng/lrspitem.hxx> @@ -71,7 +71,7 @@ static const long MINBODY = 56; // 1mm in twips rounded static const long DEF_DIST_WRITER = 500; // 5mm (Writer) static const long DEF_DIST_CALC = 250; // 2.5mm (Calc) -static USHORT pRanges[] = +static sal_uInt16 pRanges[] = { SID_ATTR_BRUSH, SID_ATTR_BRUSH, SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, @@ -92,7 +92,7 @@ static USHORT pRanges[] = // returns the Which values to the range -USHORT* SvxHeaderPage::GetRanges() +sal_uInt16* SvxHeaderPage::GetRanges() { return pRanges; } @@ -106,7 +106,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet ) //------------------------------------------------------------------------ -USHORT* SvxFooterPage::GetRanges() +sal_uInt16* SvxFooterPage::GetRanges() { return pRanges; } @@ -138,10 +138,11 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : // ----------------------------------------------------------------------- -SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) : +SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) : SfxTabPage( pParent, SVX_RES( nResId ), rAttr ), + aFrm ( this, SVX_RES( FL_FRAME ) ), aTurnOnBox ( this, SVX_RES( CB_TURNON ) ), aCntSharedBox ( this, SVX_RES( CB_SHARED ) ), aLMLbl ( this, SVX_RES( FT_LMARGIN ) ), @@ -154,18 +155,17 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U aHeightFT ( this, SVX_RES( FT_HEIGHT ) ), aHeightEdit ( this, SVX_RES( ED_HEIGHT ) ), aHeightDynBtn ( this, SVX_RES( CB_HEIGHT_DYN ) ), - aFrm ( this, SVX_RES( FL_FRAME ) ), aBspWin ( this, SVX_RES( WN_BSP ) ), aBackgroundBtn ( this, SVX_RES( BTN_EXTRAS ) ), nId ( nSetId ), pBBSet ( NULL ), - bDisableQueryBox ( FALSE ), - bEnableBackgroundSelector ( TRUE ) + bDisableQueryBox ( sal_False ), + bEnableBackgroundSelector ( sal_True ) { InitHandler(); - aBspWin.EnableRTL( FALSE ); + aBspWin.EnableRTL( sal_False ); // This Page needs ExchangeSupport SetExchangeSupport(); @@ -178,6 +178,20 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U SetFieldUnit( aHeightEdit, eFUnit ); SetFieldUnit( aLMEdit, eFUnit ); SetFieldUnit( aRMEdit, eFUnit ); + + aTurnOnBox.SetAccessibleRelationMemberOf( &aFrm ); + aCntSharedBox.SetAccessibleRelationMemberOf( &aFrm ); + aLMLbl.SetAccessibleRelationMemberOf( &aFrm ); + aLMEdit.SetAccessibleRelationMemberOf( &aFrm ); + aRMLbl.SetAccessibleRelationMemberOf( &aFrm ); + aRMEdit.SetAccessibleRelationMemberOf( &aFrm ); + aDistFT.SetAccessibleRelationMemberOf( &aFrm ); + aDistEdit.SetAccessibleRelationMemberOf( &aFrm ); + aDynSpacingCB.SetAccessibleRelationMemberOf( &aFrm ); + aHeightFT.SetAccessibleRelationMemberOf( &aFrm ); + aHeightEdit.SetAccessibleRelationMemberOf( &aFrm ); + aHeightDynBtn.SetAccessibleRelationMemberOf( &aFrm ); + aBackgroundBtn.SetAccessibleRelationMemberOf(&aFrm); } // ----------------------------------------------------------------------- @@ -189,20 +203,20 @@ SvxHFPage::~SvxHFPage() // ----------------------------------------------------------------------- -BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) { - const USHORT nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); - const USHORT nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); - const USHORT nWULSpace = GetWhich( SID_ATTR_ULSPACE ); - const USHORT nWOn = GetWhich( SID_ATTR_PAGE_ON ); - const USHORT nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC ); - const USHORT nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING ); - const USHORT nWShared = GetWhich( SID_ATTR_PAGE_SHARED ); - const USHORT nWBrush = GetWhich( SID_ATTR_BRUSH ); - const USHORT nWBox = GetWhich( SID_ATTR_BORDER_OUTER ); - const USHORT nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER ); - const USHORT nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); - const USHORT aWhichTab[] = { nWSize, nWSize, + const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); + const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); + const sal_uInt16 nWULSpace = GetWhich( SID_ATTR_ULSPACE ); + const sal_uInt16 nWOn = GetWhich( SID_ATTR_PAGE_ON ); + const sal_uInt16 nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC ); + const sal_uInt16 nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING ); + const sal_uInt16 nWShared = GetWhich( SID_ATTR_PAGE_SHARED ); + const sal_uInt16 nWBrush = GetWhich( SID_ATTR_BRUSH ); + const sal_uInt16 nWBox = GetWhich( SID_ATTR_BORDER_OUTER ); + const sal_uInt16 nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER ); + const sal_uInt16 nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); + const sal_uInt16 aWhichTab[] = { nWSize, nWSize, nWLRSpace, nWLRSpace, nWULSpace, nWULSpace, nWOn, nWOn, @@ -246,15 +260,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) // Margins SvxLRSpaceItem aLR( nWLRSpace ); - aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) ); - aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) ); + aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) ); + aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) ); aSet.Put( aLR ); SvxULSpaceItem aUL( nWULSpace ); if ( nId == SID_ATTR_PAGE_HEADERSET ) - aUL.SetLower( (USHORT)nDist ); + aUL.SetLower( (sal_uInt16)nDist ); else - aUL.SetUpper( (USHORT)nDist ); + aUL.SetUpper( (sal_uInt16)nDist ); aSet.Put( aUL ); // Background and border? @@ -266,7 +280,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == - GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) ) + GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) ) { _pSet = &( (SvxSetItem*)pItem )->GetItemSet(); @@ -285,7 +299,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) SvxSetItem aSetItem( GetWhich( nId ), aSet ); rSet.Put( aSetItem ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- @@ -301,7 +315,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) // Evaluate header-/footer- attributes const SvxSetItem* pSetItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE, + if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -365,9 +379,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) if ( !pSetItem ) { - aTurnOnBox.Check( FALSE ); - aHeightDynBtn.Check( TRUE ); - aCntSharedBox.Check( TRUE ); + aTurnOnBox.Check( sal_False ); + aHeightDynBtn.Check( sal_True ); + aCntSharedBox.Check( sal_True ); } TurnOnHdl(0); @@ -383,11 +397,11 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) || + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { - USHORT nHtmlMode = 0; + sal_uInt16 nHtmlMode = 0; nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue(); if(nHtmlMode && HTMLMODE_ON) { @@ -429,7 +443,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) aRMLbl.Enable(); aRMEdit.Enable(); - USHORT nUsage = aBspWin.GetUsage(); + sal_uInt16 nUsage = aBspWin.GetUsage(); if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT ) aCntSharedBox.Disable(); @@ -439,16 +453,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) } else { - BOOL bDelete = TRUE; + sal_Bool bDelete = sal_True; - if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE ) + if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True ) bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES ); if ( bDelete ) { aDistFT.Disable(); aDistEdit.Disable(); - aDynSpacingCB.Enable(FALSE); + aDynSpacingCB.Enable(sal_False); aHeightFT.Disable(); aHeightEdit.Disable(); aHeightDynBtn.Disable(); @@ -495,10 +509,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) if ( !pBBSet ) { // Use only the necessary items for border and background - USHORT nBrush = GetWhich( SID_ATTR_BRUSH ); - USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER ); - USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); - USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); + sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH ); + sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER ); + sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); + sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); // Create an empty set pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush, @@ -507,12 +521,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == - GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) ) + GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) ) // if there is one that is already set, then use this pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() ); if ( SFX_ITEM_SET == - GetItemSet().GetItemState( nInner, FALSE, &pItem ) ) + GetItemSet().GetItemState( nInner, sal_False, &pItem ) ) // The set InfoItem is always required pBBSet->Put( *pItem ); } @@ -536,7 +550,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) //---------------------------------------------------------------- - USHORT nWhich = GetWhich( SID_ATTR_BRUSH ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH ); if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET ) { @@ -591,12 +605,12 @@ void SvxHFPage::UpdateExample() void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { - USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET ); - if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, FALSE ); + (const SvxSetItem&)rSet.Get( nWhich, sal_False ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -623,10 +637,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET ); - if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, FALSE ); + (const SvxSetItem&)rSet.Get( nWhich, sal_False ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -709,7 +723,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetBottom( 0 ); } - USHORT nUsage = SVX_PAGE_ALL; + sal_uInt16 nUsage = SVX_PAGE_ALL; pItem = GetItem( rSet, SID_ATTR_PAGE ); if ( pItem ) @@ -735,7 +749,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) const SvxSetItem* pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), - FALSE, + sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -756,7 +770,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetHdDist( nDist ); aBspWin.SetHdLeft( rLR.GetLeft() ); aBspWin.SetHdRight( rLR.GetRight() ); - aBspWin.SetHeader( TRUE ); + aBspWin.SetHeader( sal_True ); } else pSetItem = 0; @@ -764,7 +778,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - aBspWin.SetHeader( FALSE ); + aBspWin.SetHeader( sal_False ); if ( SID_ATTR_PAGE_HEADERSET == nId ) aCntSharedBox.Disable(); @@ -772,7 +786,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), - FALSE, + sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rFooterSet = pSetItem->GetItemSet(); @@ -793,7 +807,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetFtDist( nDist ); aBspWin.SetFtLeft( rLR.GetLeft() ); aBspWin.SetFtRight( rLR.GetRight() ); - aBspWin.SetFooter( TRUE ); + aBspWin.SetFooter( sal_True ); } else pSetItem = 0; @@ -801,7 +815,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - aBspWin.SetFooter( FALSE ); + aBspWin.SetFooter( sal_False ); if ( SID_ATTR_PAGE_FOOTERSET == nId ) aCntSharedBox.Disable(); @@ -811,7 +825,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - aBspWin.SetTable( TRUE ); + aBspWin.SetTable( sal_True ); aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() ); } @@ -819,7 +833,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - aBspWin.SetTable( TRUE ); + aBspWin.SetTable( sal_True ); aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() ); } ResetBackground_Impl( rSet ); diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc index e9c72c38b45f..e9c72c38b45f 100644..100755 --- a/svx/source/dialog/hdft.hrc +++ b/svx/source/dialog/hdft.hrc diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src index e93d18ff351f..1cd402611dc8 100644..100755 --- a/svx/source/dialog/hdft.src +++ b/svx/source/dialog/hdft.src @@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Hea~der on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; @@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~Footer on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 18efc393ae19..4bc6afe67405 100644..100755 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> -#include "hyperdlg.hxx" +#include "svx/hyperdlg.hxx" #include <svx/svxdlg.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> @@ -58,7 +58,7 @@ struct MyStruct SfxWorkWindow* pWorkWin; }; -SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, +SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ), @@ -71,7 +71,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG ); DBG_ASSERT(mpDlg, "Dialogdiet fail!"); pWindow = mpDlg->GetWindow(); - ((MyStruct*)pImp)->bVisible = FALSE; + ((MyStruct*)pImp)->bVisible = sal_False; Window* pTopWindow = 0; if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && @@ -92,7 +92,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, eChildAlignment = SFX_ALIGN_NOALIGNMENT; - SetHideNotDelete( TRUE ); + SetHideNotDelete( sal_True ); } SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx new file mode 100755 index 000000000000..d29a4f5969e1 --- /dev/null +++ b/svx/source/dialog/hyprdlg.hxx @@ -0,0 +1,143 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_DLG_HYPERDLG_HXX +#define _SVX_DLG_HYPERDLG_HXX + +#include <vcl/combobox.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/menu.hxx> +#include <svtools/stdctrl.hxx> +#include <sfx2/ctrlitem.hxx> +#include <svl/srchcfg.hxx> +#include <sfx2/tbxctrl.hxx> + +class SvxHyperlinkDlg; +class SfxViewFrame; + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +class HyperCombo : public ComboBox +{ + SvxHyperlinkDlg *pDlg; + long nMaxWidth; + long nMinWidth; + long nRatio; + + virtual long Notify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); + +public: + HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ); + + inline void SetRatio( long nR ) { nRatio = nR; } + inline long GetRatio() { return nRatio; } + long CalcResizeWidth( long nW ); + inline long GetResizeWidth() { return (nMaxWidth - nMinWidth); } + void DoResize( long nW ); +}; + +class HyperFixedText : public FixedInfo +{ + SvxHyperlinkDlg *pDlg; + +public: + HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ); + +}; + +/*-------------------------------------------------------------------- + Beschreibung: Dialog zum Einfgen/ndern eines Hyperlink + --------------------------------------------------------------------*/ + +class SvxHyperlinkDlg : public ToolBox, public SfxControllerItem +{ + friend class HyperCombo; + friend class HyperFixedText; + using ToolBox::StateChanged; + +private: + SfxStatusForwarder aForwarder; + SfxStatusForwarder aHyperlinkDlgForward; + HyperCombo aNameCB; + HyperFixedText aUrlFT; + HyperCombo aUrlCB; + + SvxSearchConfig aSearchConfig; + + String sAddress; + String sExplorer; + String sOldName; + String sSearchTitle; + PopupMenu aLinkPopup; + PopupMenu *pTargetMenu; + sal_Bool bNoDoc; + sal_Bool bSend; + sal_Bool bHasOldName; + long nMaxWidth; + long nMinWidth; + long nMaxHeight; + sal_Bool bHtmlMode; + + SfxImageManager* mpManager; + + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + // DockingWindow + virtual void Resize(); + virtual void Resizing(Size& rSize); + + // Drag&Drop + sal_Bool GetDragData(sal_uInt16 nItem, sal_uIntPtr nDDFormatId, String& rBuffer); + + DECL_LINK(TBClickHdl, ToolBox *); + DECL_LINK(TBSelectHdl, ToolBox *); + DECL_LINK(DropdownClick, ToolBox * ); + DECL_LINK(LinkPopupSelectHdl, Menu *); + DECL_LINK(SearchPopupSelectHdl, Menu *); + DECL_LINK(ComboSelectHdl, ComboBox *); + DECL_LINK(ComboModifyHdl, ComboBox *); + DECL_LINK(BookmarkFoundHdl, String *); + + void OpenDoc( const String& rURL, SfxViewFrame* pViewFrame ); + void EnableLink(); + void SendToApp(sal_uInt16 nType); + void AddToHistory(const String& rName, const String& rURL); + void TargetMenu(const String& rSelEntry, sal_Bool bExecute); + String GetSelTarget(); + + void SetImages(); +public: + SvxHyperlinkDlg(SfxBindings *pBindings, Window* pWindow); + ~SvxHyperlinkDlg(); +}; + + +#endif // _SVX_DLG_HYPERDLG_HXX + diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx new file mode 100755 index 000000000000..dc7b438db0af --- /dev/null +++ b/svx/source/dialog/hyprlink.cxx @@ -0,0 +1,999 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svx.hxx" +#include <tools/urlobj.hxx> +#include <vcl/msgbox.hxx> +#include <unotools/configitem.hxx> +#include <unotools/cmdoptions.hxx> +#include <svtools/inetimg.hxx> +#include <svl/urlbmk.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/docfile.hxx> +#include <sfx2/imgmgr.hxx> +#include <sfx2/dispatch.hxx> +#include <svl/urihelper.hxx> +#include <sfx2/objsh.hxx> +#include <comphelper/processfactory.hxx> + +#include "svx/hlnkitem.hxx" +#include <svx/dialogs.hrc> +#include "hyprlink.hrc" +#include <svx/dialmgr.hxx> +#include "svx/hyprlink.hxx" +#include "hyprdlg.hxx" + +using namespace ::rtl; +using namespace ::com::sun::star; + +// ----------------------------------------------------------------------- + +class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem +{ + OUString sDefaultEngine; +public: + SearchDefaultConfigItem_Impl(); + ~SearchDefaultConfigItem_Impl(); + + const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); +}; + +/*-- 11.11.2003 14:20:59--------------------------------------------------- + + -----------------------------------------------------------------------*/ +SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : + ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) +{ + uno::Sequence<OUString> aNames(1); + aNames.getArray()[0] = OUString::createFromAscii("Name"); + uno::Sequence< uno::Any > aValues = GetProperties(aNames); + aValues.getConstArray()[0] >>= sDefaultEngine; +} +/*-- 11.11.2003 14:21:00--------------------------------------------------- + + -----------------------------------------------------------------------*/ +SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() +{ +} + +void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SearchDefaultConfigItem_Impl::Commit() +{ +} + +/************************************************************************* +|* +|* Dialog zum Einf"ugen/"Andern eines Hyperlink +|* +\************************************************************************/ + +SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : + + ToolBox ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ), + SfxControllerItem ( SID_HYPERLINK_SETLINK, *_pBindings ), + + aForwarder ( SID_HYPERLINK_GETLINK, *this ), + aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this), + + aNameCB ( this, SVX_RES( CB_NAME ) ), + aUrlFT ( this, SVX_RES( FT_URL ) ), + aUrlCB ( this, SVX_RES( CB_URL ) ), + aSearchConfig (sal_True), + sAddress ( SVX_RES( STR_ADDRESS ) ), + sExplorer ( SVX_RES( STR_EXPLORER ) ), + sSearchTitle ( SVX_RES( STR_BOOKMARK_SEARCH ) ), + aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ), + pTargetMenu ( NULL ), + + bNoDoc ( sal_True ), + bSend ( sal_False ), + bHasOldName ( sal_False ), + bHtmlMode ( sal_False ) + +{ + FreeResource(); + + mpManager = SfxImageManager::GetImageManager( 0 ); + mpManager->RegisterToolBox( this ); + + SetImages(); + + // save initial size + nMaxWidth = GetSizePixel().Width(); + nMaxHeight = GetSizePixel().Height(); + + + InsertSeparator( 0 ); + InsertWindow( CB_URL, &aUrlCB, 0, 0 ); + // we need an item text for accessibility + String sItemText = aUrlCB.GetText(); + if ( sItemText.Len() == 0 ) + sItemText = aUrlCB.GetQuickHelpText(); + if ( sItemText.Len() > 0 ) + { + SetItemText( CB_URL, sItemText ); + sItemText.Erase(); + } + InsertWindow( FT_URL, &aUrlFT, 0, 0 ); + InsertSeparator( 0 ); + InsertWindow( CB_NAME, &aNameCB, 0, 0 ); + sItemText = aNameCB.GetText(); + if ( sItemText.Len() == 0 ) + sItemText = aNameCB.GetQuickHelpText(); + if ( sItemText.Len() > 0 ) + SetItemText( CB_NAME, sItemText ); + + SetSizePixel(CalcWindowSizePixel()); // Groesse initialisieren + + nMaxHeight = GetSizePixel().Height(); // Hoehe nochmal merken, da sie veraendert wurde + // SetSizePixel ruft Resize-Handler! + + Show(); + Resize(); + + long nUrlWidth = aUrlCB.GetResizeWidth(); + long nNameWidth = aNameCB.GetResizeWidth(); + long nSum = nUrlWidth + nNameWidth; + + aUrlCB.SetRatio((nUrlWidth * 100L) / nSum); + aNameCB.SetRatio((nNameWidth * 100L) / nSum); + + SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) ); + SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) ); + SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) ); + + SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); + SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN ); + SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); + + aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl)); + + Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl); + aNameCB.SetSelectHdl(aLk); + aUrlCB.SetSelectHdl(aLk); + + aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl); + aNameCB.SetModifyHdl(aLk); + aUrlCB.SetModifyHdl(aLk); + + // Accessibility: Set the quick help text as accessible name for the + // drop down lists. + aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText()); + aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText()); + + // Hide button according to config item. + SvtCommandOptions aCmdOpts; + if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "InternetSearch" ) ) ) ) + HideItem( BTN_INET_SEARCH ); +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +SvxHyperlinkDlg::~SvxHyperlinkDlg() +{ + SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this); + + if (pTargetMenu != NULL) + delete pTargetMenu; +} + +/*-------------------------------------------------------------------- + Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit + verkleinert werden + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::Resize() +{ + long nWidth = GetSizePixel().Width(); + + ToolBox::Resize(); + + if (nWidth) // nWidth ist manchmal 0 + { + long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1; + + long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW); + long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW); + + if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren + { + SetUpdateMode(sal_False); + + // Comboboxen resizen + aUrlCB.DoResize(nNewUrlWidth); + aNameCB.DoResize(nNewNameWidth); + RecalcItems(); // Alle Elemente neu anordnen + + SetUpdateMode(sal_True); + } + } +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::Resizing(Size& rSize) +{ + if (rSize.Height() > nMaxHeight) + rSize.Height() = nMaxHeight; + + if (rSize.Width() > nMaxWidth) + rSize.Width() = nMaxWidth; + + ToolBox::Resizing(rSize); +} + +/*-------------------------------------------------------------------- + Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState ) +{ + if ( nSID == SID_HYPERLINK_DIALOG ) + { + if( eState != SFX_ITEM_DISABLED) + { + EnableItem( BTN_OPENDIALOG, sal_True ); + + sal_Bool bItem = sal_False; + if ( pState && eState == SFX_ITEM_AVAILABLE ) + bItem = ((SfxBoolItem*)pState)->GetValue(); + SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK ); + } + else + { + SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK ); + EnableItem( BTN_OPENDIALOG, sal_False ); + } + } + + if (nSID == SID_HYPERLINK_SETLINK) + { + if (eState == SFX_ITEM_DISABLED) + bNoDoc = sal_True; + else + bNoDoc = sal_False; + EnableItem(BTN_TARGET, !bNoDoc); + EnableLink(); + } + + if (nSID == SID_HYPERLINK_GETLINK) + { + if (eState == SFX_ITEM_AVAILABLE) + { + const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState); + + sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText()); + sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText()); + sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND; + + if (!bHasOldName && + (nNamePos == nNotFound || nUrlPos == nNotFound)) + { + sOldName = aNameCB.GetText(); + bHasOldName = sal_True; + } + if (rHLnkItem.GetName().Len()) + { + aNameCB.SetText(rHLnkItem.GetName()); + ComboModifyHdl(&aNameCB); + } + if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len()) + { + String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass(); + aUrlCB.SetText(sUrl); + } + else if (aUrlCB.GetEntryCount()) + { // Letzten Eintrag wieder selektieren + aNameCB.SetText(aNameCB.GetEntry(0)); + aUrlCB.SetText(aUrlCB.GetEntry(0)); + } + + TargetMenu(rHLnkItem.GetTargetFrame(), sal_False); + bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0; + } + else + return; + + ComboModifyHdl(&aUrlCB); + } +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox ) +{ + switch (pBox->GetCurItemId()) + { + case BTN_LINK: + { + if (!bSend) // Link ins Dokument einfuegen + SendToApp(HLINK_DEFAULT); + } + break; + + case BTN_OPENDIALOG: + { + GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG ); + } + break; + } + + return sal_True; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox ) +{ + switch (pBox->GetCurItemId()) + { + // Link als Bookmark im Explorer eintragen + // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl + case BTN_INSERT_BOOKMARK: + { + String sName = aNameCB.GetText(); + if ( !sName.Len() ) + sName = aUrlCB.GetText(); + + String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); + SfxStringItem aName( SID_BOOKMARK_TITLE, sName ); + SfxStringItem aURL( SID_BOOKMARK_URL, + URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(), URIHelper::GetMaybeFileHdl(), true, false, + INetURLObject::WAS_ENCODED, + INetURLObject::DECODE_UNAMBIGUOUS ) ); + GetBindings().GetDispatcher()->Execute( + SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L ); + } + break; + } + + return sal_True; +} + +IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) +{ + switch (pBox->GetCurItemId()) + { + case BTN_LINK: + { + // Link-Popup anstossen + EndSelection(); // Vor dem Execute, damit Popup den Focus bekommt + aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode); + aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN ); + } + break; + + case BTN_INET_SEARCH: + { + // Search-Engines per Popup auswaehlen + PopupMenu *pMenu = new PopupMenu; + pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl)); + SearchDefaultConfigItem_Impl aDefaultEngine; + String sDefault(aDefaultEngine.GetDefaultSearchEngine()); + sDefault.ToLowerAscii(); + const bool bHasDefault = sDefault.Len() > 0; + + sal_uInt16 nCount = aSearchConfig.Count(); + String sFound; + for (sal_uInt16 i = 0; i < nCount; i++) + { + const SvxSearchEngineData& rData = aSearchConfig.GetData(i); + //check if it's the configured default search engine + String sTest(rData.sEngineName); + sTest.ToLowerAscii(); + bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault ); + //then put it at the top + if(i && bIsDefaultEngine) + { + pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0); + pMenu->InsertSeparator(1); + } + else + { + if (i) + pMenu->InsertSeparator(); + pMenu->InsertItem( i + 1, rData.sEngineName); + } + } + pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True); + pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN ); + pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True); + EndSelection(); + delete pMenu; + } + break; + + case BTN_TARGET: + { + // Target Frame einstellen + TargetMenu(GetSelTarget(), sal_True); + EndSelection(); + } + break; + } + + return sal_True; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute) +{ + if (pTargetMenu && !bExecute) + { + for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) + { + if (pTargetMenu->GetItemText(i) == rSelEntry) + { + pTargetMenu->CheckItem(i); + return; + } + } + } + + SfxViewFrame* pVwFrm = SfxViewFrame::Current(); + + if (pVwFrm) // Alle moeglichen Target Frames zusammensammeln und anzeigen + { + TargetList aList; + pVwFrm->GetTopFrame().GetTargetList(aList); + + sal_uInt16 nCount = (sal_uInt16)aList.Count(); + if( nCount ) + { + sal_Bool bChecked = sal_False; + + if (pTargetMenu != NULL) + delete pTargetMenu; + + pTargetMenu = new PopupMenu; + pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() | + MENU_FLAG_NOAUTOMNEMONICS ); + sal_uInt16 i; + for ( i = 0; i < nCount; i++ ) + { + String sEntry(*aList.GetObject(i)); + pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK); + + if (sEntry == rSelEntry) + { + pTargetMenu->CheckItem(i + 1); + bChecked = sal_True; + } + } + for ( i = nCount; i; i-- ) + delete aList.GetObject( i - 1 ); + + if (!bChecked) + pTargetMenu->CheckItem(1); + + if (bExecute) + { + sal_uInt16 nEntry = pTargetMenu->Execute( + this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN ); + if ( nEntry ) + pTargetMenu->CheckItem( nEntry ); + } + } + } +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu ) +{ + switch (pMenu->GetCurItemId()) + { + case MN_FIELD: // URL als Hyperlink ins Dok einfuegen + SendToApp(HLINK_FIELD); + break; + case MN_BUTTON: // URL als Button ins Dok einfuegen + SendToApp(HLINK_BUTTON); + break; + } + + return sal_True; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu ) +{ + const SvxSearchEngineData& rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1); + String sText(aNameCB.GetText()); + sText.EraseLeadingChars().EraseTrailingChars(); + + rtl::OUString sPrefix; + rtl::OUString sSuffix; + rtl::OUString sSeparator; + sal_Int32 nCaseMatch; + sal_Unicode cToken = 0; + + if (sText.Search(' ') != STRING_NOTFOUND) + { + sPrefix = rData.sExactPrefix; + sSuffix = rData.sExactSuffix; + sSeparator = rData.sExactSeparator; + nCaseMatch = rData.nExactCaseMatch; + cToken = ' '; + } + else if (sText.Search('+') != STRING_NOTFOUND) + { + sPrefix = rData.sAndPrefix; + sSuffix = rData.sAndSuffix; + sSeparator = rData.sAndSeparator; + nCaseMatch = rData.nAndCaseMatch; + cToken = '+'; + } + else if (sText.Search(',') != STRING_NOTFOUND) + { + sPrefix = rData.sOrPrefix; + sSuffix = rData.sOrSuffix; + sSeparator = rData.sOrSeparator; + nCaseMatch = rData.nOrCaseMatch; + cToken = ','; + } + else + { + sPrefix = rData.sExactPrefix; + sSuffix = rData.sExactSuffix; + nCaseMatch = rData.nExactCaseMatch; + cToken = 0; + } + + String sURL = sPrefix; + xub_StrLen nTok; + + if(1 == nCaseMatch) + sText.ToUpperAscii(); + else if(2 == nCaseMatch) + sText.ToLowerAscii(); + + if ((nTok = sText.GetTokenCount(cToken)) > 1) + { + for (sal_uInt16 i = 0; i < nTok; i++) + { + sURL += sText.GetToken(i, cToken); + if(i < nTok -1) + sURL += (String)sSeparator; + } + sURL += (String)sSuffix; + } + else + { + sURL += sText; + sURL += (String)sSuffix; + } + sURL.EraseAllChars(); // remove all spaces + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if ( pViewFrame ) + pViewFrame = pViewFrame->GetTopViewFrame(); + OpenDoc( sURL, pViewFrame ); + + return sal_True; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl ) +{ + if (pUrl && pUrl->Len()) + { + aUrlCB.SetText(*pUrl); + ComboModifyHdl(&aUrlCB); + } + + return sal_True; +} +/*-------------------------------------------------------------------- + Beschreibung: Link-Button enablen/disablen + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::EnableLink() +{ + sal_Bool bEnable = aUrlCB.GetText().Len() != 0; + + EnableItem(BTN_LINK, (!bNoDoc) & bEnable); +} + +/*-------------------------------------------------------------------- + Beschreibung: URL im Dokument einfuegen + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType) +{ + sal_Bool bIsFile = sal_False; + bSend = sal_True; + String sURL( aUrlCB.GetText() ); + + if ( !sURL.Len() ) + return; + + String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); + INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, URIHelper::GetMaybeFileHdl(), true, false, + INetURLObject::WAS_ENCODED, + INetURLObject::DECODE_UNAMBIGUOUS ) ); + sURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); + if ( aObj.GetProtocol() == INET_PROT_FILE ) + bIsFile = sal_True; + + if ( bIsFile ) + { + EnterWait(); + SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True ); + if ( aMedium.Exists( sal_False ) == sal_False ) + { + LeaveWait(); + QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) ); + if ( aBox.Execute() == RET_NO ) + return; + } + else + LeaveWait(); + } + + SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK ); + + if (aNameCB.GetText().Len()) + aItem.SetName( aNameCB.GetText() ); + else + aItem.SetName( sURL ); + + sOldName = aNameCB.GetText(); + + aItem.SetURL(sURL); + aItem.SetInsertMode( (SvxLinkInsertMode)nType ); + aItem.SetTargetFrame( GetSelTarget() ); + + GetBindings().GetDispatcher()->Execute( + SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + + AddToHistory( aNameCB.GetText(), sURL ); + + if ( sURL != aUrlCB.GetText() ) + aUrlCB.SetText( sURL ); +} + +/*-------------------------------------------------------------------- + Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln + --------------------------------------------------------------------*/ + +String SvxHyperlinkDlg::GetSelTarget() +{ + String sTarget; + + if (pTargetMenu != NULL) + { + for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) + { + if (pTargetMenu->IsItemChecked(i)) + { + sTarget = pTargetMenu->GetItemText(i); + break; + } + } + } + + return sTarget; +} + +/*-------------------------------------------------------------------- + Beschreibung: URL in History der Leiste aufnehmen + --------------------------------------------------------------------*/ + +void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL) +{ + String sName(rName); + + if (bHasOldName && sOldName.Len()) + { + sName = sOldName; + bHasOldName = sal_False; + } + + if (!sName.Len()) + sName = rURL; + + if (rURL.Len()) + { + sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName); + sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL); + sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND; + + if (nNamePos != COMBOBOX_ENTRY_NOTFOUND) + nPos = nNamePos; + else + nPos = nUrlPos; + + // Alten Eintrag durch neuen Eintrag ersetzen + if (nPos != COMBOBOX_ENTRY_NOTFOUND) + { + aNameCB.RemoveEntry(nPos); + aUrlCB.RemoveEntry(nPos); + aNameCB.SetText(rName); + aUrlCB.SetText(rURL); + } + + aNameCB.InsertEntry(sName, 0); + aUrlCB.InsertEntry(rURL, 0); + } +} + +/*-------------------------------------------------------------------- + Beschreibung: Bookmark und Search-Button enablen/disablen + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo ) +{ + sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText()); + + if (nPos != COMBOBOX_ENTRY_NOTFOUND) + { + aNameCB.SetText(aNameCB.GetEntry(nPos)); + aUrlCB.SetText(aUrlCB.GetEntry(nPos)); + + EnableLink(); + EnableItem(BTN_INSERT_BOOKMARK, sal_True); + EnableItem(BTN_INET_SEARCH, sal_True); + } + return sal_True; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo ) +{ + sal_Bool bEnable = sal_True; + + if (!pCombo->GetText().Len()) + bEnable = sal_False; + + if (pCombo == &aNameCB) + { + if (IsItemEnabled(BTN_INET_SEARCH) != bEnable) + EnableItem(BTN_INET_SEARCH, bEnable); + } + + EnableLink(); + + if (aUrlCB.GetText().Len()) + bEnable = sal_True; + else + bEnable = sal_False; + + if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable) + EnableItem(BTN_INSERT_BOOKMARK, bEnable); + + return sal_True; +} + +// -------------------------------------------------------------------- + +void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt ) +{ + ToolBox::DataChanged( rDCEvt ); + + if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) + SetImages(); +} + +// -------------------------------------------------------------------- + +void SvxHyperlinkDlg::SetImages() +{ + bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + + SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) ); + SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) ); + SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) ); + SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) ); + SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); +} + +/*-------------------------------------------------------------------- + Beschreibung: Comboboxen + --------------------------------------------------------------------*/ + +HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : + ComboBox( (Window *)pDialog, rResId ) +{ + pDlg = pDialog; + + nMaxWidth = GetSizePixel().Width(); + if (this == &pDlg->aUrlCB) + nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww")); + else + nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww")); +} + +/*-------------------------------------------------------------------- + Beschreibung: Comboboxen KeyInput + --------------------------------------------------------------------*/ + +long HyperCombo::Notify( NotifyEvent& rNEvt ) +{ + long nHandled = 0; + static sal_Bool bLocked = sal_False; + + if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!) + return nHandled; + + bLocked = sal_True; + + if ( rNEvt.GetType() == EVENT_KEYINPUT ) + { + const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); + const KeyCode aKeyCode = pKEvt->GetKeyCode(); + + if (aKeyCode.GetCode() == KEY_RETURN) + { + pDlg->SendToApp(HLINK_DEFAULT); + nHandled = 1; + } + } + if (this == &pDlg->aNameCB) + pDlg->sOldName = GetText(); + + if (!nHandled) + nHandled = ComboBox::Notify( rNEvt ); + + bLocked = sal_False; + + return nHandled; +} + +/*-------------------------------------------------------------------- + Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten + --------------------------------------------------------------------*/ + +long HyperCombo::PreNotify( NotifyEvent& rNEvt ) +{ + long nHandled = 0; + + nHandled = ComboBox::PreNotify( rNEvt ); + + return nHandled; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +long HyperCombo::CalcResizeWidth( long nW ) +{ + long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth); + + if (nNewWidth > nMaxWidth) + nNewWidth = nMaxWidth; + + if (nNewWidth != GetSizePixel().Width()) + return nNewWidth; + else + return 0; // Kein Resize notwendig +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +void HyperCombo::DoResize( long nNewWidth ) +{ + SetSizePixel(Size(nNewWidth, GetSizePixel().Height())); +} + +/*-------------------------------------------------------------------- + Beschreibung: FixedText + --------------------------------------------------------------------*/ + +HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : + FixedInfo( (Window *)pDialog, rResId ) +{ + pDlg = pDialog; +} + +/*-------------------------------------------------------------------- + Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen + --------------------------------------------------------------------*/ +void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame ) +{ + SfxStringItem aName( SID_FILE_NAME, rURL ); + SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); + SfxBoolItem aSilent( SID_SILENT, sal_True ); + SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); + SfxBoolItem aExternal( SID_BROWSE, sal_True ); + SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL; + + if ( pViewFrame ) + { + SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL ); + if ( pDisp ) + pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer, &aExternal, 0L ); + } + else if ( pDisp ) + pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L ); +} +// class SvxHyperlinkDialogWrapper ------------------------------------------ + +SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT) + +/*-------------------------------------------------------------------- + Beschreibung: Wrapper fuer Hyperlinkleiste + --------------------------------------------------------------------*/ + +SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, + SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) : + + SfxChildWindow( _pParent, nId ) + +{ + pWindow = new SvxHyperlinkDlg( _pBindings, _pParent ); + eChildAlignment = SFX_ALIGN_TOP; +} + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const +{ + SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); + return aInfo; +} + diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src new file mode 100755 index 000000000000..c59a2f8eb52a --- /dev/null +++ b/svx/source/dialog/hyprlink.src @@ -0,0 +1,167 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + // include ------------------------------------------------------------------ +#include <svx/dialogs.hrc> +#include "hyprlink.hrc" +#include "helpid.hrc" +#include <svx/svxids.hrc> + + // pragma ------------------------------------------------------------------- + + // RID_SVXDLG_HYPERLINK ------------------------------------------------------ +ToolBox RID_SVXDLG_HYPERLINK +{ + OutputSize = TRUE ; + Hide = TRUE; + + // Dockable = TRUE ; + // Closeable = TRUE ; + // Moveable = TRUE ; + // Sizeable = TRUE ; + // EnableResizing = TRUE ; + + SVLook = TRUE ; + Border = TRUE ; + Size = MAP_APPFONT ( 410 , 17 ) ; + Scroll = TRUE ; + HelpID = HID_OFA_HYPERLINK_DLG ; + + Text [ en-US ] = "Insert Hyperlink" ; + + ComboBox CB_NAME + { + HelpID = HID_OFA_HYPERLINK_NAME ; + Pos = MAP_APPFONT ( 2 , 3 ) ; + Size = MAP_APPFONT ( 100 , 60 ) ; + TabStop = TRUE ; + DropDown = TRUE ; + AutoSize = TRUE ; + AutoHScroll = TRUE ; + DDExtraWidth = TRUE ; + QuickHelpText [ en-US ] = "URL Name" ; + }; + FixedText FT_URL + { + HelpID = HID_OFA_HYPERLINK_URL_TXT ; + Pos = MAP_APPFONT ( 105 , 5 ) ; + Size = MAP_APPFONT ( 16 , 10 ) ; + Text [ en-US ] = "URL:" ; + }; + ComboBox CB_URL + { + HelpID = HID_OFA_HYPERLINK_URL ; + Pos = MAP_APPFONT ( 121 , 3 ) ; + Size = MAP_APPFONT ( 204 , 60 ) ; + TabStop = TRUE ; + DropDown = TRUE ; + AutoSize = TRUE ; + AutoHScroll = TRUE ; + DDExtraWidth = TRUE ; + QuickHelpText [ en-US ] = "Internet URLs" ; + }; + ItemList = + { + ToolBoxItem + { + HelpID = HID_OFA_HYPERLINK_TARGET ; + Identifier = BTN_TARGET ; + DropDown = TRUE ; + Text [ en-US ] = "Target Frame" ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + HelpID = CMD_SID_HYPERLINK_SETLINK ; + Identifier = BTN_LINK ; + Disable = TRUE ; + DropDown = TRUE ; + Text [ en-US ] = "Hyperlink" ; + }; + ToolBoxItem + { + HelpID = CMD_SID_CREATELINK ; + Identifier = BTN_INSERT_BOOKMARK ; + Disable = TRUE ; + Hide = TRUE; + Text [ en-US ] = "Link" ; + }; + ToolBoxItem + { + HelpID = HID_OFA_HYPERLINK_SEARCH ; + Identifier = BTN_INET_SEARCH ; + Disable = TRUE ; + DropDown = TRUE ; + Text [ en-US ] = "Find" ; + }; + }; + String STR_ADDRESS + { + Text [ en-US ] = "Address Book" ; + }; + String STR_EXPLORER + { + Text [ en-US ] = "Bookmark folder" ; + }; + String STR_BOOKMARK_SEARCH + { + Text [ en-US ] = "Search in bookmarks"; + }; +}; + // PopupMenu ------------------------------------------------------------- +Menu RID_SVXMN_HYPERLINK +{ + ItemList = + { + MenuItem + { + Identifier = MN_FIELD ; + Text [ en-US ] = "As Text" ; + }; + MenuItem + { + Identifier = MN_BUTTON ; + Text [ en-US ] = "As Button" ; + }; + }; +}; +QueryBox RID_SVXQB_DONTEXIST +{ + BUTTONS = WB_YES_NO ; + DEFBUTTON = WB_DEF_YES ; + Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ; +}; + + + + + + + + diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 7e351e3ac306..633c8a236c74 100644..100755 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -63,7 +63,7 @@ #include <comphelper/processfactory.hxx> #define _IMAPDLG_PRIVATE -#include "imapdlg.hxx" +#include "svx/imapdlg.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -71,7 +71,7 @@ #include "imapdlg.hrc" #include "imapwnd.hxx" #include "imapimp.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> @@ -111,13 +111,13 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS // ControllerItem -SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : +SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rIMap ( rIMapDlg ) { } -void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, +void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_IMAP_EXEC ) && pItem ) @@ -131,7 +131,7 @@ void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, } } -SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, USHORT nId, +SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -196,7 +196,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() ); aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) ); - aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); TbxClickHdl( &aTbxIMapDlg1 ); SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); @@ -211,16 +211,16 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aEdtText.Disable(); maFtTarget.Disable(); maCbbTarget.Disable(); - pOwnData->bExecState = FALSE; + pOwnData->bExecState = sal_False; Resize(); pOwnData->aTimer.SetTimeout( 100 ); pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); } SvxIMapDlg::~SvxIMapDlg() @@ -255,9 +255,9 @@ void SvxIMapDlg::Resize() } } -BOOL SvxIMapDlg::Close() +sal_Bool SvxIMapDlg::Close() { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) ) { @@ -267,12 +267,12 @@ BOOL SvxIMapDlg::Close() if( nRet == RET_YES ) { - SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } else if( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } else if( pIMapWnd->IsChanged() ) { @@ -283,15 +283,15 @@ BOOL SvxIMapDlg::Close() if( nRet == RET_YES ) bRet = DoSave(); else if( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } - return( bRet ? SfxModelessDialog::Close() : FALSE ); + return( bRet ? SfxModelessDialog::Close() : sal_False ); } // Enabled or disable all Controls -void SvxIMapDlg::SetExecState( BOOL bEnable ) +void SvxIMapDlg::SetExecState( sal_Bool bEnable ) { pOwnData->bExecState = bEnable; } @@ -370,14 +370,14 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) { - USHORT nNewItemId = pTbx->GetCurItemId(); + sal_uInt16 nNewItemId = pTbx->GetCurItemId(); switch( pTbx->GetCurItemId() ) { case( TBI_APPLY ): { URLLoseFocusHdl( NULL ); - SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } @@ -393,8 +393,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); - pIMapWnd->SetEditMode( TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); + pIMapWnd->SetEditMode( sal_True ); if( pTbx->IsKeyEvent() ) { if((pTbx->GetKeyModifier() & KEY_MOD1) != 0) @@ -407,7 +407,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_RECT ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -419,7 +419,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_CIRC ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -431,7 +431,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_POLY ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -443,7 +443,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_FREEFILL ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -456,7 +456,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_ACTIVE ): { URLLoseFocusHdl( NULL ); - BOOL bNewState = !pTbx->IsItemChecked( TBI_ACTIVE ); + sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE ); pTbx->CheckItem( TBI_ACTIVE, bNewState ); pIMapWnd->SetCurrentObjState( !bNewState ); } @@ -550,7 +550,7 @@ void SvxIMapDlg::DoOpen() } } -BOOL SvxIMapDlg::DoSave() +sal_Bool SvxIMapDlg::DoSave() { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -560,7 +560,7 @@ BOOL SvxIMapDlg::DoSave() const String aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) ); SdrModel* pModel = pIMapWnd->GetSdrModel(); const sal_Bool bChanged = pModel->IsChanged(); - BOOL bRet = false; + sal_Bool bRet = false; aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) ); aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) ); @@ -573,7 +573,7 @@ BOOL SvxIMapDlg::DoSave() { const String aFilter( aDlg.GetCurrentFilter() ); String aExt; - ULONG nFormat; + sal_uIntPtr nFormat; if ( aFilter == aBinFilter ) { @@ -592,7 +592,7 @@ BOOL SvxIMapDlg::DoSave() } else { - return FALSE; + return sal_False; } INetURLObject aURL( aDlg.GetPath() ); @@ -616,7 +616,7 @@ BOOL SvxIMapDlg::DoSave() delete pOStm; pModel->SetChanged( bChanged ); - bRet = TRUE; + bRet = sal_True; } } } @@ -645,10 +645,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) if ( !rInfo.bOneMarked ) { - aTbxIMapDlg1.CheckItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE ); + aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); aStbStatus.SetItemText( 1, aStr ); aFtURL.Disable(); @@ -663,10 +663,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) } else { - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, TRUE ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True ); aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, TRUE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, TRUE ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True ); aFtURL.Enable(); maURLBox.Enable(); @@ -786,8 +786,8 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG ) SetEditingObject( pOwnData->pUpdateEditingObject ); // After changes => default selection - aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE ); - pIMapWnd->SetEditMode( TRUE ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); + pIMapWnd->SetEditMode( sal_True ); } // Delete the copied list again in the Update method @@ -805,8 +805,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); const SdrView* pView = pWnd->GetSdrView(); - const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); - const BOOL bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) ); + const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); + const sal_Bool bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) ); aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() ); @@ -828,7 +828,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) if ( bPolyEdit ) { - USHORT nId = 0; + sal_uInt16 nId = 0; switch( pWnd->GetPolyEditMode() ) { @@ -839,13 +839,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) break; } - aTbxIMapDlg1.CheckItem( nId, TRUE ); + aTbxIMapDlg1.CheckItem( nId, sal_True ); } else { - aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, FALSE ); - aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, TRUE ); - aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, FALSE ); + aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False ); + aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True ); + aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False ); pWnd->SetPolyEditMode( 0 ); } diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 07cdf696eea1..07cdf696eea1 100644..100755 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index 8775acdaaaa2..8ceebdefbb7d 100644..100755 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -32,6 +32,7 @@ // RID_SVXDLG_IMAP ---------------------------------------------------- ModelessDialog RID_SVXDLG_IMAP { + HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP }; ComboBox CBB_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL"; Pos = MAP_APPFONT ( 39 , 23 ) ; Size = MAP_APPFONT ( 225 , 69 ) ; TabStop = TRUE ; @@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP }; Edit EDT_TEXT { + HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 39 , 41 ) ; @@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP // nur temporaer ComboBox RID_SVXCTL_CBB_TARGET { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 213 , 41 ) ; diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 810ef612d97f..9838caa8ad7f 100644..100755 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -48,7 +48,7 @@ public: ImageMap aUpdateImageMap; TargetList aUpdateTargetList; void* pUpdateEditingObject; - BOOL bExecState; + sal_Bool bExecState; IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ), pUpdateEditingObject( NULL ) {} }; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 5a483012277a..5393ef8fd085 100644..100755 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include <svtools/imappoly.hxx> #include <svl/urlbmk.hxx> -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> @@ -93,10 +93,10 @@ IMapWindow::~IMapWindow() void IMapWindow::SetImageMap( const ImageMap& rImageMap ) { - ReplaceImageMap( rImageMap, FALSE ); + ReplaceImageMap( rImageMap, sal_False ); } -void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGraphic*/ ) +void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ ) { SdrPage* pPage = 0; aIMap = rImageMap; @@ -120,9 +120,9 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap } // create new drawing objects - const USHORT nCount(rImageMap.GetIMapObjectCount()); + const sal_uInt16 nCount(rImageMap.GetIMapObjectCount()); - for ( USHORT i(nCount); i > 0; i-- ) + for ( sal_uInt16 i(nCount); i > 0; i-- ) { SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( i - 1 ) ); @@ -133,11 +133,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap } } -BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) +sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) { const SdrObject* pSdrObj = GetSelectedSdrObject(); IMapObject* pIMapObj; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) ) { @@ -145,9 +145,9 @@ BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) pIMapObj->SetAltText( rNewInfo.aMarkAltText ); pIMapObj->SetTarget( rNewInfo.aMarkTarget ); pModel->SetChanged( sal_True ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -201,7 +201,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) case( IMAP_OBJ_RECTANGLE ): { IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*) pIMapObj; - Rectangle aDrawRect( pIMapRectObj->GetRectangle( FALSE ) ); + Rectangle aDrawRect( pIMapRectObj->GetRectangle( sal_False ) ); // clipped on CanvasPane aDrawRect.Intersection( aClipRect ); @@ -214,8 +214,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) case( IMAP_OBJ_CIRCLE ): { IMapCircleObject* pIMapCircleObj = (IMapCircleObject*) pIMapObj; - const Point aCenter( pIMapCircleObj->GetCenter( FALSE ) ); - const long nRadius = pIMapCircleObj->GetRadius( FALSE ); + const Point aCenter( pIMapCircleObj->GetCenter( sal_False ) ); + const long nRadius = pIMapCircleObj->GetRadius( sal_False ); const Point aOffset( nRadius, nRadius ); Rectangle aCircle( aCenter - aOffset, aCenter + aOffset ); @@ -243,7 +243,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) } else { - const Polygon& rPoly = pIMapPolyObj->GetPolygon( FALSE ); + const Polygon& rPoly = pIMapPolyObj->GetPolygon( sal_False ); Polygon aDrawPoly( rPoly ); // clipped on CanvasPane @@ -298,7 +298,7 @@ void IMapWindow::InitSdrModel() aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); } void IMapWindow::SdrObjCreated( const SdrObject& rObj ) @@ -309,7 +309,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) { SdrRectObj* pRectObj = (SdrRectObj*) &rObj; IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), - String(), String(), String(), String(), String(), TRUE, FALSE ); + String(), String(), String(), String(), String(), sal_True, sal_False ); pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } @@ -318,11 +318,11 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) case( OBJ_CIRC ): { SdrCircObj* pCircObj = (SdrCircObj*) &rObj; - SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( FALSE, FALSE ); + SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False ); Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L)); delete pPathObj; - IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), TRUE, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), sal_True, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } @@ -339,7 +339,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) if ( rXPolyPoly.count() ) { Polygon aPoly(rXPolyPoly.getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), TRUE, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), sal_True, sal_False ); pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } } @@ -361,7 +361,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) String aDesc; String aTarget; IMapObjectPtr pIMapObj = pUserData->GetObject(); - BOOL bActive = TRUE; + sal_Bool bActive = sal_True; if ( pIMapObj.get() ) { @@ -377,17 +377,17 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) case( OBJ_RECT ): { pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(), - aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ) ) ); + aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) ); } break; case( OBJ_CIRC ): { const SdrCircObj& rCircObj = (const SdrCircObj&) rObj; - SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( FALSE, FALSE ); + SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False ); Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); // was only created by us temporarily @@ -407,7 +407,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) if ( rXPolyPoly.count() ) { Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ); pUserData->ReplaceObject( IMapObjectPtr(pObj) ); } } @@ -422,13 +422,13 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt) { GraphCtrl::MouseButtonUp( rMEvt ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); } void IMapWindow::MarkListHasChanged() { GraphCtrl::MarkListHasChanged(); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const @@ -439,7 +439,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - ULONG nCount; + sal_uIntPtr nCount; if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) ) { @@ -479,11 +479,11 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const { SdrObject* pSdrObj = NULL; SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - ULONG nCount; + sal_uIntPtr nCount; if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) ) { - for ( ULONG i = 0; i < nCount; i++ ) + for ( sal_uIntPtr i = 0; i < nCount; i++ ) { SdrObject* pTestObj = pPage->GetObj( i ); @@ -506,21 +506,21 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { PopupMenu aMenu( SVX_RES( RID_SVXMN_IMAP ) ); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarked = rMarkList.GetMarkCount(); + sal_uIntPtr nMarked = rMarkList.GetMarkCount(); - aMenu.EnableItem( MN_URL, FALSE ); - aMenu.EnableItem( MN_ACTIVATE, FALSE ); - aMenu.EnableItem( MN_MACRO, FALSE ); + aMenu.EnableItem( MN_URL, sal_False ); + aMenu.EnableItem( MN_ACTIVATE, sal_False ); + aMenu.EnableItem( MN_MACRO, sal_False ); aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() ); if ( !nMarked ) { - aMenu.EnableItem( MN_POSITION, FALSE ); - aMenu.EnableItem( MN_FRAME_TO_TOP, FALSE ); - aMenu.EnableItem( MN_MOREFRONT, FALSE ); - aMenu.EnableItem( MN_MOREBACK, FALSE ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, FALSE ); - aMenu.EnableItem( MN_DELETE1, FALSE ); + aMenu.EnableItem( MN_POSITION, sal_False ); + aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False ); + aMenu.EnableItem( MN_MOREFRONT, sal_False ); + aMenu.EnableItem( MN_MOREBACK, sal_False ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False ); + aMenu.EnableItem( MN_DELETE1, sal_False ); } else { @@ -528,18 +528,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { SdrObject* pSdrObj = GetSelectedSdrObject(); - aMenu.EnableItem( MN_URL, TRUE ); - aMenu.EnableItem( MN_ACTIVATE, TRUE ); - aMenu.EnableItem( MN_MACRO, TRUE ); + aMenu.EnableItem( MN_URL, sal_True ); + aMenu.EnableItem( MN_ACTIVATE, sal_True ); + aMenu.EnableItem( MN_MACRO, sal_True ); aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() ); } - aMenu.EnableItem( MN_POSITION, TRUE ); - aMenu.EnableItem( MN_FRAME_TO_TOP, TRUE ); - aMenu.EnableItem( MN_MOREFRONT, TRUE ); - aMenu.EnableItem( MN_MOREBACK, TRUE ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, TRUE ); - aMenu.EnableItem( MN_DELETE1, TRUE ); + aMenu.EnableItem( MN_POSITION, sal_True ); + aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True ); + aMenu.EnableItem( MN_MOREFRONT, sal_True ); + aMenu.EnableItem( MN_MOREBACK, sal_True ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True ); + aMenu.EnableItem( MN_DELETE1, sal_True ); } aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) ); @@ -573,7 +573,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) pModel->SetChanged( sal_True ); pView->UnmarkAll(); pView->MarkObj( pSdrObj, pView->GetSdrPageView() ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); nRet = rEvt.mnAction; } } @@ -612,7 +612,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt ) } } -void IMapWindow::SetCurrentObjState( BOOL bActive ) +void IMapWindow::SetCurrentObjState( sal_Bool bActive ) { SdrObject* pObj = GetSelectedSdrObject(); @@ -635,11 +635,11 @@ void IMapWindow::SetCurrentObjState( BOOL bActive ) aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) ); } - pView->SetAttributes( aSet, FALSE ); + pView->SetAttributes( aSet, sal_False ); } } -void IMapWindow::UpdateInfo( BOOL bNewObj ) +void IMapWindow::UpdateInfo( sal_Bool bNewObj ) { if ( aInfoLink.IsSet() ) { @@ -650,7 +650,7 @@ void IMapWindow::UpdateInfo( BOOL bNewObj ) if ( pIMapObj ) { - aInfo.bOneMarked = TRUE; + aInfo.bOneMarked = sal_True; aInfo.aMarkURL = pIMapObj->GetURL(); aInfo.aMarkAltText = pIMapObj->GetAltText(); aInfo.aMarkTarget = pIMapObj->GetTarget(); @@ -660,8 +660,8 @@ void IMapWindow::UpdateInfo( BOOL bNewObj ) else { aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String(); - aInfo.bOneMarked = FALSE; - aInfo.bActivated = FALSE; + aInfo.bOneMarked = sal_False; + aInfo.bActivated = sal_False; } aInfoLink.Call( this ); @@ -694,7 +694,7 @@ void IMapWindow::DoMacroAssign() const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() ); pModel->SetChanged( sal_True ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } delete pMacroDlg; @@ -732,7 +732,7 @@ void IMapWindow::DoPropertyDialog() pIMapObj->SetTarget( aDlg->GetTarget() ); pIMapObj->SetName( aDlg->GetName() ); pModel->SetChanged( sal_True ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); } delete aDlg; } @@ -743,7 +743,7 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu ) { if (pMenu) { - USHORT nId = pMenu->GetCurItemId(); + sal_uInt16 nId = pMenu->GetCurItemId(); switch(nId) { @@ -757,11 +757,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu ) case( MN_ACTIVATE ): { - const BOOL bNewState = !pMenu->IsItemChecked( MN_ACTIVATE ); + const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE ); pMenu->CheckItem( MN_ACTIVATE, bNewState ); SetCurrentObjState( bNewState ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } case( MN_FRAME_TO_TOP ): @@ -860,7 +860,7 @@ void IMapWindow::SelectFirstObject() { GrabFocus(); pView->UnmarkAllObj(); - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); } } @@ -869,7 +869,7 @@ void IMapWindow::StartPolyEdit() GrabFocus(); if( !pView->AreObjectsMarked() ) - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 108c489229e5..d5eba52dfaa4 100644..100755 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -46,9 +46,9 @@ struct NotifyInfo String aMarkURL; String aMarkAltText; String aMarkTarget; - BOOL bNewObj; - BOOL bOneMarked; - BOOL bActivated; + sal_Bool bNewObj; + sal_Bool bOneMarked; + sal_Bool bActivated; }; @@ -56,16 +56,16 @@ struct NotifyPosSize { Size aPictureSize; Point aMousePos; - BOOL bPictureSize; - BOOL bMousePos; + sal_Bool bPictureSize; + sal_Bool bMousePos; }; #define SVD_IMAP_USERDATA 0x0001 -const UINT32 IMapInventor = UINT32('I') * 0x00000001+ - UINT32('M') * 0x00000100+ - UINT32('A') * 0x00010000+ - UINT32('P') * 0x01000000; +const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+ + sal_uInt32('M') * 0x00000100+ + sal_uInt32('A') * 0x00010000+ + sal_uInt32('P') * 0x01000000; typedef boost::shared_ptr< IMapObject > IMapObjectPtr; @@ -128,7 +128,7 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); void CreateImageMap(); - void ReplaceImageMap( const ImageMap& rNewImageMap, BOOL bScaleToGraphic ); + void ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic ); void ClearTargetList(); @@ -137,19 +137,19 @@ protected: SdrObject* GetSdrObj( const IMapObject* pIMapObj ) const; SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; - void UpdateInfo( BOOL bNewObj ); + void UpdateInfo( sal_Bool bNewObj ); public: IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); ~IMapWindow(); - BOOL ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); + sal_Bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); void SetImageMap( const ImageMap& rImageMap ); const ImageMap& GetImageMap(); - void SetCurrentObjState( BOOL bActive ); + void SetCurrentObjState( sal_Bool bActive ); void DoMacroAssign(); void DoPropertyDialog(); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 531f2eb6b650..418e9b42ca3f 100644..100755 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------- -String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ) +String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg ) { INetURLObject aURLObj; aURLObj.SetSmartProtocol( INET_PROT_FILE ); @@ -85,14 +85,14 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ) // misc local helper functions //======================================================================== -static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) +static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) { const Locale *pLocale = rSeq.getConstArray(); - INT32 nCount = rSeq.getLength(); + sal_Int32 nCount = rSeq.getLength(); - Sequence< INT16 > aLangs( nCount ); - INT16 *pLang = aLangs.getArray(); - for (INT32 i = 0; i < nCount; ++i) + Sequence< sal_Int16 > aLangs( nCount ); + sal_Int16 *pLang = aLangs.getArray(); + for (sal_Int32 i = 0; i < nCount; ++i) { pLang[i] = SvxLocaleToLanguage( pLocale[i] ); @@ -102,13 +102,13 @@ static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) } -static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang ) +static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang ) { - INT32 i = -1; - INT32 nLen = rLangSeq.getLength(); + sal_Int32 i = -1; + sal_Int32 nLen = rLangSeq.getLength(); if (nLen) { - const INT16 *pLang = rLangSeq.getConstArray(); + const sal_Int16 *pLang = rLangSeq.getConstArray(); for (i = 0; i < nLen; ++i) { if (nLang == pLang[i]) @@ -122,20 +122,20 @@ static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang ) // class SvxLanguageBox //======================================================================== -USHORT TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) +sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; - USHORT nCount = rLb.GetEntryCount(); + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nCount = rLb.GetEntryCount(); - for ( USHORT i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ ) - if ( eType == LanguageType((ULONG)rLb.GetEntryData(i)) ) + for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ ) + if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) ) nPos = i; return nPos; } //----------------------------------------------------------------------- -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck ) : +SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) : ListBox( pParent, nWinStyle ), m_pSpellUsedLang( NULL ), m_bWithCheckmark( bCheck ) @@ -143,7 +143,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck Init(); } //------------------------------------------------------------------------ -SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck ) : +SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) : ListBox( pParent, rResId ), m_pSpellUsedLang( NULL ), m_bWithCheckmark( bCheck ) @@ -158,8 +158,8 @@ void SvxLanguageBox::Init() m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) ); m_nLangList = LANG_LIST_EMPTY; - m_bHasLangNone = FALSE; - m_bLangNoneIsLangAll = FALSE; + m_bHasLangNone = sal_False; + m_bLangNoneIsLangAll = sal_False; // display entries sorted SetStyle( GetStyle() | WB_SORT ); @@ -172,12 +172,12 @@ void SvxLanguageBox::Init() { LanguageType nLangType = aLangTable.GetTypeAtIndex( i ); - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; if ((LANGUAGE_DONTKNOW == nLangType) || (LANGUAGE_SYSTEM == nLangType) || (LANGUAGE_USER1 <= nLangType && nLangType <= LANGUAGE_USER9)) { - bInsert = FALSE; + bInsert = sal_False; } if ( bInsert ) @@ -196,9 +196,9 @@ SvxLanguageBox::~SvxLanguageBox() //------------------------------------------------------------------------ -USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked ) +sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked ) { - USHORT nRet = 0; + sal_uInt16 nRet = 0; if( !bChecked ) nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos ); else @@ -208,8 +208,8 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo //------------------------------------------------------------------------ -void SvxLanguageBox::SetLanguageList( INT16 nLangList, - BOOL bHasLangNone, BOOL bLangNoneIsLangAll, BOOL bCheckSpellAvail ) +void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, + sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail ) { Clear(); @@ -220,12 +220,12 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, if ( LANG_LIST_EMPTY != nLangList ) { - Sequence< INT16 > aSpellAvailLang; - Sequence< INT16 > aHyphAvailLang; - Sequence< INT16 > aThesAvailLang; - Sequence< INT16 > aSpellUsedLang; - Sequence< INT16 > aHyphUsedLang; - Sequence< INT16 > aThesUsedLang; + Sequence< sal_Int16 > aSpellAvailLang; + Sequence< sal_Int16 > aHyphAvailLang; + Sequence< sal_Int16 > aThesAvailLang; + Sequence< sal_Int16 > aSpellUsedLang; + Sequence< sal_Int16 > aHyphUsedLang; + Sequence< sal_Int16 > aThesUsedLang; Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY ); if (xAvail.is()) { @@ -332,14 +332,14 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos ) { return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType ) +sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -347,7 +347,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return nAt; } @@ -366,7 +366,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); - USHORT nAt = 0; + sal_uInt16 nAt = 0; if ( m_bWithCheckmark ) { sal_Bool bFound = sal_False; @@ -375,31 +375,31 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT { Reference< XSpellChecker1 > xSpell( SvxGetSpellChecker(), UNO_QUERY ); if ( xSpell.is() ) - m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() ); + m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() ); } bFound = m_pSpellUsedLang ? - lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE; + lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False; nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound ); } else nAt = InsertEntry( aStrEntry, nPos ); - SetEntryData( nAt, (void*)(ULONG)nLangType ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nLangType ); return nAt; } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos ) { return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType ); } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, - BOOL bCheckEntry, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, + sal_Bool bCheckEntry, sal_uInt16 nPos ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -407,7 +407,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return nAt; } @@ -416,8 +416,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; - USHORT nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry ); - SetEntryData( nAt, (void*)(ULONG)nLang ); + sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nLang ); return nAt; } @@ -426,7 +426,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) { - USHORT nAt = TypeToPos_Impl( eLangType, *this ); + sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) RemoveEntry( nAt ); @@ -436,23 +436,23 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) LanguageType SvxLanguageBox::GetSelectLanguage() const { - USHORT nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return LanguageType( (ULONG)GetEntryData(nPos) ); + return LanguageType( (sal_uIntPtr)GetEntryData(nPos) ); else return LanguageType( LANGUAGE_DONTKNOW ); } //------------------------------------------------------------------------ -void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect ) +void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect ) { // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) SelectEntryPos( nAt, bSelect ); @@ -460,17 +460,17 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect //------------------------------------------------------------------------ -BOOL SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const +sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const { // Same here, work on the replacement if applicable. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nAt ); else - return FALSE; + return sal_False; } #if ENABLE_LAYOUT @@ -482,7 +482,7 @@ SvxLanguageBox::~SvxLanguageBox () { } -SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, BOOL bCheck ) +SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck ) : ListBox ( pParent, pFile, bCheck ) { } diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src index b7cc9c40fce5..b7cc9c40fce5 100644..100755 --- a/svx/source/dialog/langbox.src +++ b/svx/source/dialog/langbox.src diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src index aa2bee89d742..aa2bee89d742 100644..100755 --- a/svx/source/dialog/language.src +++ b/svx/source/dialog/language.src diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index d69ddda72b7c..d69ddda72b7c 100644..100755 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx diff --git a/svx/source/dialog/linkwarn.hrc b/svx/source/dialog/linkwarn.hrc deleted file mode 100644 index d01dc88d8e30..000000000000 --- a/svx/source/dialog/linkwarn.hrc +++ /dev/null @@ -1,60 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * Copyright 2010 Novell, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_LINKWARN_HRC -#define _SVX_LINKWARN_HRC - -#include <svtools/controldims.hrc> - -// dialog ids -#define FI_QUERY 10 -#define FT_INFOTEXT 11 -#define PB_OK 12 -#define PB_NO 13 -#define FL_OPTION 15 -#define CB_WARNING_OFF 16 - -// --------- general metrics --------- - -#define SYMBOL_EDGE 20 -#define DIALOG_WIDTH 220 -#define INFO_TEXT_LINES 11 - -#define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define AW_COL_2 (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X) -#define AW_COL_3 (AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X) -#define AW_COL_4 (DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) - -#define AW_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) -#define AW_ROW_2 (AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) -#define AW_ROW_3 (AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define AW_ROW_4 (AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y) - -#define DIALOG_HEIGHT (AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM) - -#endif diff --git a/svx/source/dialog/linkwarn.src b/svx/source/dialog/linkwarn.src index 100b53cb6e33..100b53cb6e33 100644..100755 --- a/svx/source/dialog/linkwarn.src +++ b/svx/source/dialog/linkwarn.src diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 2f1d36c85c42..2f1d36c85c42 100644..100755 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 28c803322cb4..2098b86d6846 100644..100755 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -34,9 +34,9 @@ #include <svx/svdomeas.hxx> #include <svx/svdmodel.hxx> -#include "measctrl.hxx" +#include "svx/measctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" SvxXMeasurePreview::SvxXMeasurePreview ( @@ -100,9 +100,9 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs ) void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); - BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); - BOOL bCtrl = rMEvt.IsMod1(); + sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); + sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); + sal_Bool bCtrl = rMEvt.IsMod1(); if( bZoomIn || bZoomOut ) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 363bb827f0b9..c1173560578e 100644..100755 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -39,10 +39,10 @@ #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> -#include "optgrid.hxx" +#include "svx/optgrid.hxx" #include <svx/dialogs.hrc> #include "optgrid.hrc" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" // local functions void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) @@ -185,7 +185,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : aFtBezAngle ( this, SVX_RES( FT_BEZ_ANGLE ) ), aMtrFldBezAngle ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ), - bAttrModified( FALSE ) + bAttrModified( sal_False ) { // This page requires exchange Support SetExchangeSupport(); @@ -198,11 +198,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : long nFirst, nLast, nMin, nMax; lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); @@ -219,6 +219,17 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); aNumFldDivisionY.SetModifyHdl( LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); + + ::rtl::OUString sFlResolution( aFlResolution.GetDisplayText() ); + ::rtl::OUString sFtDrawX(aFtDrawX.GetDisplayText()); + ::rtl::OUString sFtDrawY(aFtDrawY.GetDisplayText()); + aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution ); + aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution ); + ::rtl::OUString sFlDivision( aFlDivision.GetDisplayText() ); + ::rtl::OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); + ::rtl::OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); + aNumFldDivisionX.SetAccessibleName( sFtDivisionX + sFlDivision ); + aNumFldDivisionY.SetAccessibleName( sFtDivisionY + sFlDivision ); } //------------------------------------------------------------------------ @@ -230,7 +241,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet //------------------------------------------------------------------------ -BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { @@ -245,10 +256,10 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) long nX =GetCoreValue( aMtrFldDrawX, eUnit ); long nY = GetCoreValue( aMtrFldDrawY, eUnit ); - aGridItem.nFldDrawX = (UINT32) nX; - aGridItem.nFldDrawY = (UINT32) nY; - aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()); - aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()); + aGridItem.nFldDrawX = (sal_uInt32) nX; + aGridItem.nFldDrawY = (sal_uInt32) nY; + aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1); + aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1); rCoreSet.Put( aGridItem ); } @@ -261,7 +272,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr; @@ -274,12 +285,12 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); - aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX ); - aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY ); + aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 ); + aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 ); } ChangeGridsnapHdl_Impl( &aCbxUseGridsnap ); - bAttrModified = FALSE; + bAttrModified = sal_False; } // ----------------------------------------------------------------------- @@ -287,7 +298,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr; @@ -298,7 +309,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) // Metric Change if necessary (as TabPage is in the dialog, where the // metric can be set - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -312,14 +323,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP ); nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP ); @@ -337,7 +348,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) //------------------------------------------------------------------------ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(pField == &aMtrFldDrawX) @@ -363,7 +374,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(&aNumFldDivisionX == pField) @@ -377,7 +388,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG ) { - bAttrModified = TRUE; + bAttrModified = sal_True; return 0; } diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc index ced9bee740ca..ced9bee740ca 100644..100755 --- a/svx/source/dialog/optgrid.hrc +++ b/svx/source/dialog/optgrid.hrc diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src index 8db8d0b54643..0d65c63f5d2f 100644..100755 --- a/svx/source/dialog/optgrid.src +++ b/svx/source/dialog/optgrid.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_USE_GRIDSNAP { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_GRID_VISIBLE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_X { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 54 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_Y { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -129,12 +133,14 @@ TabPage RID_SVXPAGE_GRID }; NumericField NUM_FLD_DIVISION_X { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 54 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -144,16 +150,18 @@ TabPage RID_SVXPAGE_GRID { Pos = MAP_APPFONT ( 223 , 56 ) ; Size = MAP_APPFONT ( 29 , 8 ) ; - Text [ en-US ] = "point(s)" ; + Text [ en-US ] = "space(s)" ; }; NumericField NUM_FLD_DIVISION_Y { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 69 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -167,6 +175,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SYNCHRONIZE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 127 , 10 ) ; TabStop = TRUE ; @@ -182,6 +191,7 @@ TabPage RID_SVXPAGE_GRID CheckBox CBX_SNAP_HELPLINES { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -190,6 +200,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_BORDER { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER"; Hide = TRUE; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 125 ) ; @@ -198,6 +209,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_FRAME { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -206,6 +218,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_POINTS { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -221,6 +234,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_SNAP_AREA { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 167 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -252,6 +266,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -260,6 +275,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_BIGORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO"; Pos = MAP_APPFONT ( 136 , 125 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -268,6 +284,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ROTATE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE"; Pos = MAP_APPFONT ( 136 , 139 ) ; // 136, 111 Size = MAP_APPFONT ( 55 , 10 ) ; @@ -277,6 +294,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 137 ) ; // 190, 111 @@ -302,6 +320,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_BEZ_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 154 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 6bfdd1925af0..4878f350d37d 100644..100755 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "orienthelper.hxx" +#include "svx/orienthelper.hxx" #include <vector> #include <utility> #include <vcl/button.hxx> -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index b0e8dd35e39b..13ab889da4d1 100644..100755 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -54,7 +54,7 @@ struct PageWindow_Impl PageWindow_Impl() : pBorder(0), - bBitmap(FALSE), + bBitmap(sal_False), bResetBackground(sal_False), bFrameDirection(sal_False), nFrameDirection(0) {} @@ -92,11 +92,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) : nFtHeight ( 0 ), aFtColor ( COL_TRANSPARENT ), pFtBorder ( 0 ), - bFooter ( FALSE ), - bHeader ( FALSE ), - bTable ( FALSE ), - bHorz ( FALSE ), - bVert ( FALSE ), + bFooter ( sal_False ), + bHeader ( sal_False ), + bTable ( sal_False ), + bHorz ( sal_False ), + bVert ( sal_False ), eUsage ( SVX_PAGE_ALL ) { @@ -160,23 +160,23 @@ void SvxPageWindow::Paint( const Rectangle& ) aSz = PixelToLogic( GetSizePixel() ); nYPos = ( aSz.Height() - aSize.Height() ) / 2; long nXPos = ( aSz.Width() - aSize.Width() ) / 2; - DrawPage( Point( nXPos, nYPos ), TRUE, TRUE ); + DrawPage( Point( nXPos, nYPos ), sal_True, sal_True ); } else // Portrait - DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), TRUE, TRUE ); + DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True ); } else { // Left and right page are different -> draw two pages if possible - DrawPage( Point( 0, nYPos ), FALSE, (BOOL)( eUsage & SVX_PAGE_LEFT ) ); - DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), TRUE, - (BOOL)( eUsage & SVX_PAGE_RIGHT ) ); + DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) ); + DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True, + (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) ); } } // ----------------------------------------------------------------------- -void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL bEnabled ) +void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rFieldColor = rStyleSettings.GetFieldColor(); @@ -311,12 +311,12 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL break; } sText.Append(cArrow); - for(USHORT i = 0; i < sText.Len(); i++) + for(sal_uInt16 i = 0; i < sText.Len(); i++) { String sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); - BOOL bHorizontal = 0 == aMove.Y(); + sal_Bool bHorizontal = 0 == aMove.Y(); if(!bHorizontal) { nHDiff = (nAWidth - nCharWidth)/2; @@ -348,14 +348,14 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top(); Rectangle aCellRect( Point( _nLeft, _nTop ), Size( CELL_WIDTH, CELL_HEIGHT ) ); - for ( USHORT i = 0; i < 3; ++i ) + for ( sal_uInt16 i = 0; i < 3; ++i ) { aCellRect.Left() = _nLeft; aCellRect.Right() = _nLeft + CELL_WIDTH; if ( i > 0 ) aCellRect.Move( 0, CELL_HEIGHT ); - for ( USHORT j = 0; j < 3; ++j ) + for ( sal_uInt16 j = 0; j < 3; ++j ) { if ( j > 0 ) aCellRect.Move( CELL_WIDTH, 0 ); @@ -380,10 +380,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp ) if ( pBmp ) { pImpl->aBitmap = *pBmp; - pImpl->bBitmap = TRUE; + pImpl->bBitmap = sal_True; } else - pImpl->bBitmap = FALSE; + pImpl->bBitmap = sal_False; } // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 88a8f6caedc7..ab1c5411069b 100644..100755 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -72,14 +72,14 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) : void SvxParaPrevWindow::Paint( const Rectangle& ) { - DrawParagraph( TRUE ); + DrawParagraph( sal_True ); } // ----------------------------------------------------------------------- #define DEF_MARGIN 120 -void SvxParaPrevWindow::DrawParagraph( BOOL bAll ) +void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rWinColor = rStyleSettings.GetWindowColor(); @@ -98,7 +98,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll ) aPnt.X() = DEF_MARGIN / 2; SetFillColor( aGrayColor ); - for ( USHORT i = 0; i < 9; ++i ) + for ( sal_uInt16 i = 0; i < 9; ++i ) { if ( 3 == i ) { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 3a7c4e2228d0..6c8638bd4f62 100644..100755 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -35,7 +35,7 @@ #define _SVX_PASSWD_CXX -#include "passwd.hxx" +#include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "passwd.hrc" @@ -44,7 +44,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; short nRet = RET_OK; String aEmpty; @@ -54,7 +54,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) aNewPasswdED.SetText( aEmpty ); aRepeatPasswdED.SetText( aEmpty ); aNewPasswdED.GrabFocus(); - bOK = FALSE; + bOK = sal_False; } if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) ) @@ -62,7 +62,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute(); aOldPasswdED.SetText( aEmpty ); aOldPasswdED.GrabFocus(); - bOK = FALSE; + bOK = sal_False; } if ( bOK ) @@ -92,7 +92,7 @@ IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG ) // ----------------------------------------------------------------------- -SvxPasswordDialog::SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords, BOOL bDisableOldPassword ) : +SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword ) : SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_PASSWORD ) ), aOldFL ( this, SVX_RES( FL_OLD_PASSWD ) ), aOldPasswdFT ( this, SVX_RES( FT_OLD_PASSWD ) ), diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc index 337990a952e6..337990a952e6 100644..100755 --- a/svx/source/dialog/passwd.hrc +++ b/svx/source/dialog/passwd.hrc diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src index 256628a2caca..821ede7c9357 100644..100755 --- a/svx/source/dialog/passwd.src +++ b/svx/source/dialog/passwd.src @@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_OLD_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 14 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_NEW_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 43 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_REPEAT_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 59 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 9f0e85bd7d0d..d133d523197f 100644..100755 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -36,7 +36,7 @@ #include <comphelper/processfactory.hxx> -#include "pfiledlg.hxx" +#include "svx/pfiledlg.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> @@ -265,11 +265,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId ) -{ - maFileDlg.SetDialogHelpId( _nHelpId ); -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 33ef71862336..9d4173bd4707 100644..100755 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/dialogs.hrc> -#include <prtqry.hxx> +#include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src index 9ae23f6a4a05..9ae23f6a4a05 100644..100755 --- a/svx/source/dialog/prtqry.src +++ b/svx/source/dialog/prtqry.src diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index c7462c9fcf1a..79b022df9b45 100644..100755 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -32,16 +32,16 @@ // include --------------------------------------------------------------- #include <tools/ref.hxx> -#include "relfld.hxx" +#include "svx/relfld.hxx" // ----------------------------------------------------------------------- SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) : MetricField( pParent, nWinSize ) { - bNegativeEnabled = FALSE; - bRelativeMode = FALSE; - bRelative = FALSE; + bNegativeEnabled = sal_False; + bRelativeMode = sal_False; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( 0 ); @@ -53,9 +53,9 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) : SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) : MetricField( pParent, rResId ) { - bNegativeEnabled = FALSE; - bRelativeMode = FALSE; - bRelative = FALSE; + bNegativeEnabled = sal_False; + bRelativeMode = sal_False; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( 0 ); @@ -71,7 +71,7 @@ void SvxRelativeField::Modify() if ( bRelativeMode ) { String aStr = GetText(); - BOOL bNewMode = bRelative; + sal_Bool bNewMode = bRelative; if ( bRelative ) { @@ -82,7 +82,7 @@ void SvxRelativeField::Modify() if( ( ( *pStr < sal_Unicode( '0' ) ) || ( *pStr > sal_Unicode( '9' ) ) ) && ( *pStr != sal_Unicode( '%' ) ) ) { - bNewMode = FALSE; + bNewMode = sal_False; break; } pStr++; @@ -93,7 +93,7 @@ void SvxRelativeField::Modify() xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) ); if ( nPos != STRING_NOTFOUND ) - bNewMode = TRUE; + bNewMode = sal_True; } if ( bNewMode != bRelative ) @@ -105,10 +105,10 @@ void SvxRelativeField::Modify() // ----------------------------------------------------------------------- -void SvxRelativeField::EnableRelativeMode( USHORT nMin, - USHORT nMax, USHORT nStep ) +void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, + sal_uInt16 nMax, sal_uInt16 nStep ) { - bRelativeMode = TRUE; + bRelativeMode = sal_True; nRelMin = nMin; nRelMax = nMax; nRelStep = nStep; @@ -117,14 +117,14 @@ void SvxRelativeField::EnableRelativeMode( USHORT nMin, // ----------------------------------------------------------------------- -void SvxRelativeField::SetRelative( BOOL bNewRelative ) +void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) { Selection aSelection = GetSelection(); String aStr = GetText(); if ( bNewRelative ) { - bRelative = TRUE; + bRelative = sal_True; SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); @@ -133,7 +133,7 @@ void SvxRelativeField::SetRelative( BOOL bNewRelative ) } else { - bRelative = FALSE; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( bNegativeEnabled ? -9999 : 0 ); SetMax( 9999 ); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 901fa3190be6..a4ddad02d0db 100644..100755 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -45,12 +45,12 @@ #include <editeng/tstpitem.hxx> #include "editeng/protitem.hxx" #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- -SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings) +SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings) : SfxControllerItem(_nId, rBindings), rRuler(rRul) { @@ -58,7 +58,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings) // ----------------------------------------------------------------------- -void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState, +void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx index 9d8c29aa4f2d..507bf00d8e29 100644..100755 --- a/svx/source/dialog/rlrcitem.hxx +++ b/svx/source/dialog/rlrcitem.hxx @@ -40,11 +40,11 @@ private: SvxRuler& rRuler; protected: - virtual void StateChanged( USHORT, + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); public: - SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& ); + SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& ); }; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index cad88d539f03..298f9c198a16 100644..100755 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <rubydialog.hxx> +#include <svx/rubydialog.hxx> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -75,7 +75,7 @@ static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId, +SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) { @@ -234,7 +234,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, aHelpPB(this, ResId(PB_HELP,*rResId.GetResMgr() )), nLastPos(0), nCurrentEdit(0), - bModified(FALSE), + bModified(sal_False), pBindings(pBind) { xImpl = pImpl = new SvxRubyData_Impl; @@ -261,7 +261,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl)); Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl)); - for(USHORT i = 0; i < 8; i++) + for(sal_uInt16 i = 0; i < 8; i++) { aEditArr[i]->SetModifyHdl(aEditLk); aEditArr[i]->SetJumpHdl(aJumpLk); @@ -270,6 +270,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, } UpdateColors(); + + String leftLabelName = aLeftFT.GetText(), rightLabelName = aRightFT.GetText(); + aLeft2ED.SetAccessibleName(leftLabelName); + aLeft3ED.SetAccessibleName(leftLabelName); + aLeft4ED.SetAccessibleName(leftLabelName); + aRight2ED.SetAccessibleName(rightLabelName); + aRight3ED.SetAccessibleName(rightLabelName); + aRight4ED.SetAccessibleName(rightLabelName); } SvxRubyDialog::~SvxRubyDialog() @@ -281,7 +289,7 @@ SvxRubyDialog::~SvxRubyDialog() void SvxRubyDialog::ClearCharStyleList() { - for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++) + for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) { void* pData = aCharStyleLB.GetEntryData(i); delete (OUString*)pData; @@ -289,12 +297,12 @@ void SvxRubyDialog::ClearCharStyleList() aCharStyleLB.Clear(); } -BOOL SvxRubyDialog::Close() +sal_Bool SvxRubyDialog::Close() { pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - return TRUE; + return sal_True; } void SvxRubyDialog::Activate() @@ -357,7 +365,7 @@ void SvxRubyDialog::Activate() } if(sName.getLength()) { - USHORT nPos = aCharStyleLB.InsertEntry(sName); + sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName); aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) ); } @@ -388,7 +396,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) { OUString sLeft, sRight; const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); - BOOL bEnable = aRubyValues.getLength() > nPos; + sal_Bool bEnable = aRubyValues.getLength() > nPos; if(bEnable) { const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos]; @@ -402,7 +410,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) } } else if(!nPos) - bEnable = TRUE; + bEnable = sal_True; rLeft.Enable(bEnable); rRight.Enable(bEnable); rLeft.SetText(sLeft); @@ -422,7 +430,7 @@ void SvxRubyDialog::GetText() { Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" ); - SetModified(TRUE); + SetModified(sal_True); Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos]; PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) @@ -444,7 +452,7 @@ void SvxRubyDialog::Update() aScrollSB.SetRange( Range(0, nLen > 4 ? nLen - 4 : 0)); aScrollSB.SetThumbPos(0); SetLastPos(0); - SetModified(FALSE); + SetModified(sal_False); sal_Int16 nAdjust = -1; sal_Int16 nPosition = -1; @@ -502,7 +510,7 @@ void SvxRubyDialog::Update() sCharStyleName = C2U(cRubies); if(sCharStyleName.getLength()) { - for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++) + for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) { const OUString* pCoreName = (const OUString*)aCharStyleLB.GetEntryData(i); if(pCoreName && sCharStyleName == *pCoreName) @@ -609,7 +617,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust))) pProps[nProp].Value <<= nAdjust; } - SetModified(TRUE); + SetModified(sal_True); } aPreviewWin.Invalidate(); return 0; @@ -630,7 +638,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove))) pProps[nProp].Value.setValue(&bAbove, rType); } - SetModified(TRUE); + SetModified(sal_True); } aPreviewWin.Invalidate(); return 0; @@ -654,14 +662,14 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) pProps[nProp].Value <<= sStyleName; } } - SetModified(TRUE); + SetModified(sal_True); } return 0; } IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) { - for(USHORT i = 0; i < 8; i++) + for(sal_uInt16 i = 0; i < 8; i++) { if(pEdit == aEditArr[i]) { @@ -703,8 +711,8 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) { - USHORT nIndex = USHRT_MAX; - for(USHORT i = 0; i < 8; i++) + sal_uInt16 nIndex = USHRT_MAX; + for(sal_uInt16 i = 0; i < 8; i++) { if(aEditArr[i]->HasFocus()) nIndex = i; @@ -814,7 +822,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nRubyWidth = GetTextWidth(sRubyText); SetFont(aSaveFont); - USHORT nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos(); + sal_uInt16 nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos(); //use center if no adjustment is available if(nAdjust > 4) nAdjust = 1; @@ -830,7 +838,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2; //use above also if no selection is set - BOOL bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1; + sal_Bool bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1; if(!bAbove) { long nTmp = nYRuby; @@ -913,8 +921,8 @@ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const KeyCode& rKeyCode = pKEvt->GetKeyCode(); - USHORT nMod = rKeyCode.GetModifier(); - USHORT nCode = rKeyCode.GetCode(); + sal_uInt16 nMod = rKeyCode.GetModifier(); + sal_uInt16 nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod)) { sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1; diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc index f22b1da10ea7..f22b1da10ea7 100644..100755 --- a/svx/source/dialog/rubydialog.hrc +++ b/svx/source/dialog/rubydialog.hrc diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src index 6b83f01fc2ee..e10d4d0e57e2 100644..100755 --- a/svx/source/dialog/rubydialog.src +++ b/svx/source/dialog/rubydialog.src @@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY Closeable = TRUE ; CheckBox CB_AUTO_DETECT { + HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT"; Pos = MAP_APPFONT ( 6, 6 ) ; Size = MAP_APPFONT ( 186 , 12 ) ; Text [ en-US ] = "Automatic detection"; @@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_LEFT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1"; Pos = MAP_APPFONT ( 6 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Hide = False; @@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_RIGHT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1"; Pos = MAP_APPFONT ( 109 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2"; Pos = MAP_APPFONT ( 6 , 42) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2"; Pos = MAP_APPFONT ( 109 , 42 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3"; Pos = MAP_APPFONT ( 6 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3"; Pos = MAP_APPFONT ( 109 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4"; Pos = MAP_APPFONT ( 109 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; @@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_ADJUST { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST"; Pos = MAP_APPFONT ( 6 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_POSITION { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION"; Pos = MAP_APPFONT ( 43 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_CHAR_STYLE { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE"; Pos = MAP_APPFONT ( 80 , 93) ; Size = MAP_APPFONT ( 89 , 60 ) ; DropDown = TRUE; @@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_STYLIST { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST"; Pos = MAP_APPFONT ( 171 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Styles"; @@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_CLOSE { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE"; Pos = MAP_APPFONT ( 118, 175 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Close"; diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc index 91abf6fd9c44..91abf6fd9c44 100644..100755 --- a/svx/source/dialog/ruler.hrc +++ b/svx/source/dialog/ruler.hrc diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src index f076e051a664..f076e051a664 100644..100755 --- a/svx/source/dialog/ruler.src +++ b/svx/source/dialog/ruler.src diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index c8990d17671f..1826c8795738 100644..100755 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -31,7 +31,7 @@ #include <tools/string.hxx> #include <svx/dialogs.hrc> -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> @@ -64,7 +64,7 @@ String SvxLongLRSpaceItem::GetValueText() const #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) -bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -78,7 +78,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft; aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight; rVal <<= aLeftRightMargin; - return TRUE; + return sal_True; } case MID_LEFT: nVal = lLeft; break; @@ -94,7 +94,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem } // ----------------------------------------------------------------------- -bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -151,7 +151,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ -SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId) +SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId) : SfxPoolItem(nId), lLeft(lL), lRight(lR) @@ -190,7 +190,7 @@ String SvxLongULSpaceItem::GetValueText() const return String(); } -bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -220,7 +220,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem } // ----------------------------------------------------------------------- -bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -276,7 +276,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ -SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId) +SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId) : SfxPoolItem(nId), lLeft(lL), lRight(lR) @@ -308,7 +308,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight; } -bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -338,7 +338,7 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem return true; } -bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -433,7 +433,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() void SvxColumnItem::DeleteAndDestroyColumns() { - for( USHORT i = aColumns.Count(); i>0; ) + for( sal_uInt16 i = aColumns.Count(); i>0; ) { SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i]; aColumns.Remove( i ); @@ -451,19 +451,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const nRight != ((const SvxColumnItem&)rCmp).nRight || bTable != ((const SvxColumnItem&)rCmp).bTable || Count() != ((const SvxColumnItem&)rCmp).Count()) - return FALSE; + return sal_False; - const USHORT nCount = ((const SvxColumnItem&)rCmp).Count(); - for(USHORT i = 0; i < nCount;++i) { + const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count(); + for(sal_uInt16 i = 0; i < nCount;++i) { #if OSL_DEBUG_LEVEL > 1 SvxColumnDescription *p1, *p2; p1 = (SvxColumnDescription *)aColumns[i]; p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i]; #endif if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] ) - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -495,30 +495,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const //------------------------------------------------------------------------ -SvxColumnItem::SvxColumnItem( USHORT nAct ) : +SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) : SfxPoolItem( SID_RULER_BORDERS ), nLeft ( 0 ), nRight ( 0 ), nActColumn ( nAct ), - bTable ( FALSE ), - bOrtho (TRUE ) + bTable ( sal_False ), + bOrtho (sal_True ) { } //------------------------------------------------------------------------ -SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) : +SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) : SfxPoolItem( SID_RULER_BORDERS ), nLeft ( left ), nRight ( right ), nActColumn ( nActCol ), - bTable ( TRUE ), - bOrtho ( TRUE ) + bTable ( sal_True ), + bOrtho ( sal_True ) { } @@ -528,7 +528,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) : SfxPoolItem( rCopy ), - aColumns ( (BYTE)rCopy.Count() ), + aColumns ( (sal_uInt8)rCopy.Count() ), nLeft ( rCopy.nLeft ), nRight ( rCopy.nRight ), nActColumn( rCopy.nActColumn ), @@ -536,9 +536,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) : bOrtho ( rCopy.bOrtho ) { - const USHORT nCount = rCopy.Count(); + const sal_uInt16 nCount = rCopy.Count(); - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) Append( rCopy[i] ); } @@ -558,37 +558,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy) bTable = rCopy.bTable; nActColumn = rCopy.nActColumn; DeleteAndDestroyColumns(); - const USHORT nCount = rCopy.Count(); - for(USHORT i = 0; i < nCount;++i) + const sal_uInt16 nCount = rCopy.Count(); + for(sal_uInt16 i = 0; i < nCount;++i) Insert(rCopy[i], i); return *this; } //------------------------------------------------------------------------ -BOOL SvxColumnItem::CalcOrtho() const +sal_Bool SvxColumnItem::CalcOrtho() const { - const USHORT nCount = Count(); + const sal_uInt16 nCount = Count(); DBG_ASSERT(nCount >= 2, "no columns"); if(nCount < 2) - return FALSE; + return sal_False; long nColWidth = (*this)[0].GetWidth(); - for(USHORT i = 1; i < nCount; ++i) { + for(sal_uInt16 i = 1; i < nCount; ++i) { if( (*this)[i].GetWidth() != nColWidth) - return FALSE; + return sal_False; } //!! Wide divider - return TRUE; + return sal_True; } //------------------------------------------------------------------------ long SvxColumnItem::GetVisibleRight() const { - USHORT nIdx = 0; + sal_uInt16 nIdx = 0; - for ( USHORT i = 0; i < nActColumn; ++i ) + for ( sal_uInt16 i = 0; i < nActColumn; ++i ) { if ( (*this)[i].bVisible ) ++nIdx; @@ -596,7 +596,7 @@ long SvxColumnItem::GetVisibleRight() const return (*this)[nIdx].nEnd; } -bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -616,7 +616,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) return true; } -bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; sal_Int32 nVal = 0; @@ -628,9 +628,9 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember } case MID_RIGHT: rVal >>= nRight; break; case MID_LEFT: rVal >>= nLeft; break; - case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break; - case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break; - case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break; + case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break; + case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break; + case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break; default: OSL_FAIL("Wrong MemberId!"); return sal_False; } @@ -679,7 +679,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ SvxObjectItem::SvxObjectItem( long nSX, long nEX, - long nSY, long nEY, BOOL limits ) : + long nSY, long nEY, sal_Bool limits ) : SfxPoolItem( SID_RULER_OBJECT ), @@ -707,7 +707,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) : { } -bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -725,7 +725,7 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) return true; } -bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; BOOL bRet = false; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 3b3b1b6c6e7d..ebc165173ee8 100644..100755 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -1182,103 +1182,26 @@ String RID_SVXSTR_COLOR_USER Text [ en-US ] = "User" ; }; +String RID_SVXSTR_GALLERYPROPS_GALTHEME +{ + Text [ en-US ] = "Gallery Theme" ; +}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +//IAccessibility2 Implementation 2009----- +String RID_SVXSTR_GALLERY_THEMEITEMS +{ + Text [ en-US ] = "Theme Items"; +}; +String RID_SVXSTR_GALLERY_THEMENAME +{ + Text [ en-US ] = "Theme Name"; +}; +String RID_SVXSTR_GALLERY_FILESFOUND +{ + Text [ en-US ] = "Files Found"; +}; +String RID_SVXSTR_GALLERY_PREVIEW +{ + Text [ en-US ] = "Preview"; +}; +//-----IAccessibility2 Implementation 2009 diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx index 5335991f0a77..5335991f0a77 100644..100755 --- a/svx/source/dialog/sendreportgen.cxx +++ b/svx/source/dialog/sendreportgen.cxx diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index ae1de194fcf2..ae1de194fcf2 100644..100755 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index 2c879b31a4f9..a8c6cfa6ae0b 100644..100755 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -81,7 +81,7 @@ static LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, if ( ERROR_SUCCESS == lResult ) { - lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST BYTE *)lpData, cbData ); + lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST sal_uInt8 *)lpData, cbData ); RegCloseKey( hKey ); } @@ -125,14 +125,14 @@ namespace svx{ sizeof(szBuffer) ) ) maEMailAddrED.SetText( (sal_Unicode *)szBuffer ); - DWORD fAllowContact = FALSE; + DWORD fAllowContact = sal_False; RegReadValue( HKEY_CURRENT_USER, TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), TEXT("AllowContact"), &fAllowContact, sizeof(fAllowContact) ); - maContactCB.Check( (BOOL)fAllowContact ); + maContactCB.Check( (sal_Bool)fAllowContact ); DWORD uInternetConnection = 0; RegReadValue( @@ -237,7 +237,7 @@ namespace svx{ szBuffer, NULL, NULL, - FALSE, + sal_False, 0, NULL, NULL, &StartupInfo, &ProcessInfo ) ) diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 543030764cc7..93444e81a7c3 100644..100755 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -53,11 +53,11 @@ SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId): long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt ) { - long nResult = TRUE; + long nResult = sal_True; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); - USHORT nKey = aKeyCode.GetCode(); + sal_uInt16 nKey = aKeyCode.GetCode(); if ( nKey == KEY_TAB ) GetParent()->Notify( rNEvt ); else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) ) @@ -79,10 +79,10 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ): aPrivContainer(pParent,nBits|WB_DIALOGCONTROL), aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP), nHeaderItemId(1), - bResizeFlag(FALSE), - bPaintFlag(TRUE) + bResizeFlag(sal_False), + bPaintFlag(sal_True) { - bSortDirection=TRUE; + bSortDirection=sal_True; nSortCol=0xFFFF; nOldPos=0; @@ -110,11 +110,11 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId): aPrivContainer(pParent,rResId), aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP), nHeaderItemId(1), - bResizeFlag(TRUE), - bPaintFlag(TRUE) + bResizeFlag(sal_True), + bPaintFlag(sal_True) { - bSortDirection=TRUE; + bSortDirection=sal_True; nOldPos=0; nSortCol=0xFFFF; @@ -151,7 +151,6 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId): InitHeaderBar( &aHeaderBar ); aHeaderBar.Show(); - SetWindowBits(WB_CLIPCHILDREN | WB_HSCROLL); SvHeaderTabListBox::Show(); } @@ -198,18 +197,18 @@ void SvxSimpleTable::SetTabs() { SvHeaderTabListBox::SetTabs(); - USHORT nPrivTabCount = TabCount(); + sal_uInt16 nPrivTabCount = TabCount(); if ( nPrivTabCount ) { if ( nPrivTabCount > aHeaderBar.GetItemCount() ) nPrivTabCount = aHeaderBar.GetItemCount(); - USHORT i, nNewSize = static_cast< USHORT >( GetTab(0) ), nPos = 0; + sal_uInt16 i, nNewSize = static_cast< sal_uInt16 >( GetTab(0) ), nPos = 0; for ( i = 1; i < nPrivTabCount; ++i ) { - nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos; + nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos; aHeaderBar.SetItemSize( i, nNewSize ); - nPos = (USHORT)GetTab(i); + nPos = (sal_uInt16)GetTab(i); } aHeaderBar.SetItemSize( i, HEADERBAR_FULLSIZE ); // because no tab for last entry @@ -225,8 +224,8 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) { SvHeaderTabListBox::Paint(rRect ); - USHORT nPrivTabCount = TabCount(); - USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0; + sal_uInt16 nPrivTabCount = TabCount(); + sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0; long nOffset=-GetXOffset(); nOldPos=nOffset; @@ -239,17 +238,17 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - USHORT nPos = 0; - for(USHORT i=1;i<nPrivTabCount;i++) + sal_uInt16 nPos = 0; + for(sal_uInt16 i=1;i<nPrivTabCount;i++) { - nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos; + nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos; aHeaderBar.SetItemSize( i, nNewSize ); - nPos= static_cast< USHORT >( GetTab(i) ); + nPos= static_cast< sal_uInt16 >( GetTab(i) ); } } - bPaintFlag=TRUE; + bPaintFlag=sal_True; } -void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,USHORT nCol, +void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,sal_uInt16 nCol, HeaderBarItemBits nBits) { xub_StrLen nEnd = rText.Search( sal_Unicode( '\t' ) ); @@ -290,7 +289,7 @@ void SvxSimpleTable::HideTable() aPrivContainer.Hide(); } -BOOL SvxSimpleTable::IsVisible() const +sal_Bool SvxSimpleTable::IsVisible() const { return aPrivContainer.IsVisible(); } @@ -305,7 +304,7 @@ void SvxSimpleTable::DisableTable() aPrivContainer.Disable(); } -BOOL SvxSimpleTable::IsEnabled() const +sal_Bool SvxSimpleTable::IsEnabled() const { return aPrivContainer.IsEnabled(); } @@ -359,12 +358,12 @@ void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize ) UpdateViewSize(); } -USHORT SvxSimpleTable::GetSelectedCol() +sal_uInt16 SvxSimpleTable::GetSelectedCol() { return (aHeaderBar.GetCurItemId()-1); } -void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir) +void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) { bSortDirection=bDir; if(nSortCol!=0xFFFF) @@ -393,7 +392,7 @@ void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir) void SvxSimpleTable::HBarClick() { - USHORT nId=aHeaderBar.GetCurItemId(); + sal_uInt16 nId=aHeaderBar.GetCurItemId(); if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE) { @@ -441,23 +440,23 @@ void SvxSimpleTable::HBarDrag() void SvxSimpleTable::HBarEndDrag() { HideTracking(); - USHORT nPrivTabCount=TabCount(); + sal_uInt16 nPrivTabCount=TabCount(); if(nPrivTabCount) { if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - USHORT nPos=0; - USHORT nNewSize=0; - for(USHORT i=1;i<nPrivTabCount;i++) + sal_uInt16 nPos=0; + sal_uInt16 nNewSize=0; + for(sal_uInt16 i=1;i<nPrivTabCount;i++) { - nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos; + nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos; SetTab( i, nNewSize, MAP_PIXEL ); nPos = nNewSize; } } - bPaintFlag=FALSE; + bPaintFlag=sal_False; Invalidate(); Update(); } @@ -519,14 +518,14 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) return 0; } -SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const +SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); SvLBoxItem* pItem = NULL; if( pEntry ) { - USHORT nCount = pEntry->ItemCount(); + sal_uInt16 nCount = pEntry->ItemCount(); nPos++; @@ -550,8 +549,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) if(pLeftItem != NULL && pRightItem != NULL) { - USHORT nLeftKind=pLeftItem->IsA(); - USHORT nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind=pLeftItem->IsA(); + sal_uInt16 nRightKind=pRightItem->IsA(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 2ed66c49631e..85a52db251b7 100644..100755 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -41,14 +41,14 @@ #include "srchctrl.hxx" -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> // class SvxSearchFamilyControllerItem ----------------------------------- SvxSearchController::SvxSearchController ( - USHORT _nId, + sal_uInt16 _nId, SfxBindings& rBind, SvxSearchDialog& rDlg ) : @@ -60,7 +60,7 @@ SvxSearchController::SvxSearchController // ----------------------------------------------------------------------- -void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState, +void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE == eState ) @@ -75,7 +75,7 @@ void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState, else if ( SID_SEARCH_OPTIONS == nSID ) { DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" ); - USHORT nFlags = (USHORT)( (SfxUInt16Item*)pState )->GetValue(); + sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState )->GetValue(); rSrchDlg.EnableControls_Impl( nFlags ); } else if ( SID_SEARCH_ITEM == nSID ) diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx index 5dc0f5f14666..391a2a06460d 100644..100755 --- a/svx/source/dialog/srchctrl.hxx +++ b/svx/source/dialog/srchctrl.hxx @@ -41,10 +41,10 @@ class SvxSearchController : public SfxControllerItem SvxSearchDialog& rSrchDlg; protected: - virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); public: - SvxSearchController( USHORT nId, SfxBindings& rBnd, SvxSearchDialog& rDlg ); + SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg ); }; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 852e2676ec85..85b2695493ac 100644..100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -57,7 +57,7 @@ #include <toolkit/unohlp.hxx> #define _SVX_SRCHDLG_CXX -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -70,7 +70,7 @@ #include <svx/pageitem.hxx> #include "srchctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <editeng/brshitem.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> @@ -105,7 +105,7 @@ using namespace comphelper; SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem); #define GetCheckBoxValue( rBox ) \ - rBox.IsEnabled() ? rBox.IsChecked() : FALSE + rBox.IsEnabled() ? rBox.IsChecked() : sal_False #if ENABLE_LAYOUT #undef SVX_RES @@ -117,11 +117,11 @@ struct SearchDlg_Impl FixedText aSearchFormats; FixedText aReplaceFormats; - BOOL bMultiLineEdit : 1, + sal_Bool bMultiLineEdit : 1, bSaveToModule : 1, bFocusOnSearch : 1, bDeltaCalculated : 1; - USHORT* pRanges; + sal_uInt16* pRanges; Timer aSelectionTimer; uno::Reference< frame::XDispatch > xCommand1Dispatch; @@ -136,10 +136,10 @@ struct SearchDlg_Impl #endif /* !ENABLE_LAYOUT */ aSearchFormats ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ), aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ), - bMultiLineEdit ( FALSE ), - bSaveToModule ( TRUE ), - bFocusOnSearch ( TRUE ), - bDeltaCalculated( FALSE ), + bMultiLineEdit ( sal_False ), + bSaveToModule ( sal_True ), + bFocusOnSearch ( sal_True ), + bDeltaCalculated( sal_False ), pRanges ( NULL ) { aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1")); @@ -154,14 +154,14 @@ struct SearchDlg_Impl // ----------------------------------------------------------------------- -void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) +void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); List* pLst = pSrchItem ? pSrchItem->GetList() : 0; if ( pLst ) - for ( USHORT i = 0; i < pLst->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pLst->Count(); ++i ) { String* pTmp = new String( *(String*)( pLst->GetObject(i) ) ); rStrLst.Insert( pTmp, rStrLst.Count() ); @@ -171,12 +171,12 @@ void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) // ----------------------------------------------------------------------- -void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst ) +void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst ) { DBG_ASSERT( rStrLst.Count(), "check in advance"); List aLst; - for ( USHORT i = 0; i < rStrLst.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i ) aLst.Insert( rStrLst[ i ], LIST_APPEND ); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); @@ -186,13 +186,13 @@ void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst ) SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : - SrchAttrItemList( (BYTE)rList.Count() ) + SrchAttrItemList( (sal_uInt8)rList.Count() ) { SrchAttrItemList::Insert( &rList, 0 ); SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) _pData->pItem = _pData->pItem->Clone(); } @@ -215,9 +215,9 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) SfxItemIter aIter( rSet ); SearchAttrItem aItem; const SfxPoolItem* pItem = aIter.GetCurItem(); - USHORT nWhich; + sal_uInt16 nWhich; - while ( TRUE ) + while ( sal_True ) { // only test that it is available? if( IsInvalidItem( pItem ) ) @@ -247,7 +247,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) SfxItemPool* pPool = rSet.GetPool(); SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( IsInvalidItem( _pData->pItem ) ) rSet.InvalidateItem( pPool->GetWhich( _pData->nSlot ) ); else @@ -261,7 +261,7 @@ void SearchAttrItemList::Clear() { SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) delete _pData->pItem; SrchAttrItemList::Remove( 0, Count() ); @@ -270,13 +270,13 @@ void SearchAttrItemList::Clear() // ----------------------------------------------------------------------- // Deletes the pointer to the items -void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) +void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) { if ( nPos + nLen > Count() ) nLen = Count() - nPos; SearchAttrItem* _pData = (SearchAttrItem*)GetData() + nPos; - for ( USHORT n = nLen; n; --n, ++_pData ) + for ( sal_uInt16 n = nLen; n; --n, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) delete _pData->pItem; @@ -339,13 +339,13 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) aColumnsBtn ( this, SVX_RES( RB_CALC_COLUMNS ) ), \ aAllSheetsCB ( this, SVX_RES( CB_ALL_SHEETS ) ), \ rBindings ( rBind ), \ - bWriter ( FALSE ), \ - bSearch ( TRUE ), \ - bFormat ( FALSE ), \ + bWriter ( sal_False ), \ + bSearch ( sal_True ), \ + bFormat ( sal_False ), \ nOptions ( USHRT_MAX ), \ - bSet ( FALSE ), \ - bReadOnly ( FALSE ), \ - bConstruct ( TRUE ), \ + bSet ( sal_False ), \ + bReadOnly ( sal_False ), \ + bConstruct ( sal_True ), \ nModifyFlag ( 0 ), \ aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \ pImpl ( NULL ), \ @@ -425,7 +425,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) void SvxSearchDialog::Construct_Impl() { #if ENABLE_LAYOUT - SetHelpId (SID_SEARCH_DLG); + SetHelpId (".uno:SearchDialog"); #endif /* ENABLE_LAYOUT */ // temporary to avoid incompatibility @@ -484,7 +484,7 @@ void SvxSearchDialog::Construct_Impl() SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsJapaneseFindEnabled()) { - aJapOptionsCB.Check( FALSE ); + aJapOptionsCB.Check( sal_False ); aJapOptionsCB.Hide(); aJapOptionsBtn.Hide(); } @@ -492,6 +492,14 @@ void SvxSearchDialog::Construct_Impl() { aJapMatchFullHalfWidthCB.Hide(); } + + aSimilarityBtn.SetAccessibleRelationLabeledBy(&aSimilarityBox); + aSimilarityBtn.SetAccessibleRelationMemberOf(&aOptionsFL); + aJapOptionsBtn.SetAccessibleRelationLabeledBy(&aJapOptionsCB); + aJapOptionsBtn.SetAccessibleRelationMemberOf(&aOptionsFL); + aRowsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT); + aColumnsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT); + //component extension - show component search buttons if the commands // vnd.sun.star::SearchViaComponent1 and 2 are supported const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame(); @@ -610,7 +618,7 @@ void SvxSearchDialog::Construct_Impl() // ----------------------------------------------------------------------- -BOOL SvxSearchDialog::Close() +sal_Bool SvxSearchDialog::Close() { // remember strings speichern if ( aSearchStrings.Count() ) @@ -633,12 +641,12 @@ BOOL SvxSearchDialog::Close() rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs ); rBindings.Execute( SID_SEARCH_DLG ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -INT32 SvxSearchDialog::GetTransliterationFlags() const +sal_Int32 SvxSearchDialog::GetTransliterationFlags() const { if (!aMatchCaseCB.IsChecked()) nTransliterationFlags |= TransliterationModules_IGNORE_CASE; @@ -658,10 +666,10 @@ void SvxSearchDialog::SetSaveToModule(bool b) // ----------------------------------------------------------------------- -void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings ) +void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { nTransliterationFlags = nSettings; - BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); + sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); aMatchCaseCB .Check(!bVal ); bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); aJapMatchFullHalfWidthCB.Check( !bVal ); @@ -685,9 +693,9 @@ void SvxSearchDialog::Activate() void SvxSearchDialog::InitControls_Impl() { // CaseSensitives AutoComplete - aSearchLB.EnableAutocomplete( TRUE, TRUE ); + aSearchLB.EnableAutocomplete( sal_True, sal_True ); aSearchLB.Show(); - aReplaceLB.EnableAutocomplete( TRUE, TRUE ); + aReplaceLB.EnableAutocomplete( sal_True, sal_True ); aReplaceLB.Show(); aFormatBtn.Disable(); @@ -787,9 +795,9 @@ void SvxSearchDialog::CalculateDelta_Impl() if ( pImpl->bDeltaCalculated ) return; else - pImpl->bDeltaCalculated = TRUE; + pImpl->bDeltaCalculated = sal_True; - ULONG nDelta = 187, nOffset = 0; + sal_uIntPtr nDelta = 187, nOffset = 0; SvtCJKOptions aCJKOptions; pMoreBtn->AddWindow( &aOptionsFL ); @@ -955,7 +963,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER ); - pImpl->bMultiLineEdit = FALSE; + pImpl->bMultiLineEdit = sal_False; if ( !pImpl->bMultiLineEdit ) { @@ -1003,7 +1011,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) CalculateDelta_Impl(); - bool bDraw = FALSE; + bool bDraw = false; if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) { Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); @@ -1061,7 +1069,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aFormatBtn.Hide(); aNoFormatBtn.Hide(); aAttributeBtn.Hide(); - bDraw = TRUE; + bDraw = sal_True; } else { @@ -1093,23 +1101,23 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) // similarity search? if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 ) aSimilarityBox.Check( pSearchItem->IsLevenshtein() ); - bSet = TRUE; + bSet = sal_True; FlagHdl_Impl( &aSimilarityBox ); FlagHdl_Impl( &aJapOptionsCB ); - bool bDisableSearch = FALSE; + bool bDisableSearch = false; SfxViewShell* pViewShell = SfxViewShell::Current(); if ( pViewShell ) { - BOOL bText = !bSearchPattern; + sal_Bool bText = !bSearchPattern; if ( pViewShell->HasSelection( bText ) ) EnableControl_Impl( &aSelectionBtn ); else { - aSelectionBtn.Check( FALSE ); + aSelectionBtn.Check( sal_False ); aSelectionBtn.Disable(); } } @@ -1247,9 +1255,9 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( aLayoutBtn.IsChecked() ) { - pImpl->bSaveToModule = FALSE; + pImpl->bSaveToModule = sal_False; TemplateHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; } } @@ -1264,8 +1272,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, if ( !pImpl->pRanges && pSSet ) { sal_sSize nCnt = 0; - const USHORT* pPtr = pSSet->GetRanges(); - const USHORT* pTmp = pPtr; + const sal_uInt16* pPtr = pSSet->GetRanges(); + const sal_uInt16* pTmp = pPtr; while( *pPtr ) { @@ -1273,8 +1281,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pPtr += 2; } nCnt = pPtr - pTmp + 1; - pImpl->pRanges = new USHORT[nCnt]; - memcpy( pImpl->pRanges, pTmp, sizeof(USHORT) * nCnt ); + pImpl->pRanges = new sal_uInt16[nCnt]; + memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt ); } // See to it that are the texts of the attributes are correct @@ -1290,12 +1298,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pSearchList->Put( *pSSet ); if ( !pImpl->bMultiLineEdit ) - aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, TRUE ) ); + aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, sal_True ) ); else - pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, TRUE ) ); + pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, sal_True ) ); if ( aDesc.Len() ) - bFormat |= TRUE; + bFormat |= sal_True; } } @@ -1309,12 +1317,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pReplaceList->Put( *pRSet ); if ( !pImpl->bMultiLineEdit ) - aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, FALSE ) ); + aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, sal_False ) ); else - pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, FALSE ) ); + pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, sal_False ) ); if ( aDesc.Len() ) - bFormat |= TRUE; + bFormat |= sal_True; } } } @@ -1326,23 +1334,23 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( pCtrl && !bSet ) SetModifyFlag_Impl( pCtrl ); else - bSet = FALSE; + bSet = sal_False; if ( pCtrl == &aSimilarityBox ) { - BOOL bIsChecked = aSimilarityBox.IsChecked(); + sal_Bool bIsChecked = aSimilarityBox.IsChecked(); if ( bIsChecked ) { aSimilarityBtn.Enable(); - aRegExpBtn.Check( FALSE ); + aRegExpBtn.Check( sal_False ); aRegExpBtn.Disable(); EnableControl_Impl( &aWordBtn ); if ( aLayoutBtn.IsChecked() ) { EnableControl_Impl( &aMatchCaseCB ); - aLayoutBtn.Check( FALSE ); + aLayoutBtn.Check( sal_False ); } aRegExpBtn.Disable(); aLayoutBtn.Disable(); @@ -1380,11 +1388,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) { if ( aLayoutBtn.IsChecked() && !bFormat ) { - aWordBtn.Check( FALSE ); + aWordBtn.Check( sal_False ); aWordBtn.Disable(); - aRegExpBtn.Check( FALSE ); + aRegExpBtn.Check( sal_False ); aRegExpBtn.Disable(); - aMatchCaseCB.Check( FALSE ); + aMatchCaseCB.Check( sal_False ); aMatchCaseCB.Disable(); aNotesBtn.Disable(); @@ -1404,7 +1412,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( aRegExpBtn.IsChecked() ) { - aWordBtn.Check( FALSE ); + aWordBtn.Check( sal_False ); aWordBtn.Disable(); aSimilarityBox.Disable(); aSimilarityBtn.Disable(); @@ -1416,7 +1424,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) } // Search-string in place? then enable Buttons - bSet = TRUE; + bSet = sal_True; ModifyHdl_Impl( &aSearchLB ); } } @@ -1427,14 +1435,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) aSearchAllBtn.Disable(); else { - bSet = TRUE; + bSet = sal_True; ModifyHdl_Impl( &aSearchLB ); } } if ( &aJapOptionsCB == pCtrl ) { - BOOL bEnableJapOpt = aJapOptionsCB.IsChecked(); + sal_Bool bEnableJapOpt = aJapOptionsCB.IsChecked(); aMatchCaseCB .Enable(!bEnableJapOpt ); aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt ); aJapOptionsBtn .Enable( bEnableJapOpt ); @@ -1467,22 +1475,22 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->SetReplaceString( aReplaceLB.GetText() ); if ( pBtn == &aReplaceBtn ) - Remember_Impl( aReplaceLB.GetText(), FALSE ); + Remember_Impl( aReplaceLB.GetText(), sal_False ); else { - Remember_Impl( aSearchLB.GetText(), TRUE ); + Remember_Impl( aSearchLB.GetText(), sal_True ); if ( pBtn == &aReplaceAllBtn ) - Remember_Impl( aReplaceLB.GetText(), FALSE ); + Remember_Impl( aReplaceLB.GetText(), sal_False ); } } - pSearchItem->SetRegExp( FALSE ); - pSearchItem->SetLevenshtein( FALSE ); + pSearchItem->SetRegExp( sal_False ); + pSearchItem->SetLevenshtein( sal_False ); if (GetCheckBoxValue( aRegExpBtn )) - pSearchItem->SetRegExp( TRUE ); + pSearchItem->SetRegExp( sal_True ); else if (GetCheckBoxValue( aSimilarityBox )) - pSearchItem->SetLevenshtein( TRUE ); + pSearchItem->SetLevenshtein( sal_True ); pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); @@ -1491,7 +1499,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); - INT32 nFlags = GetTransliterationFlags(); + sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) nFlags &= (TransliterationModules_IGNORE_CASE | TransliterationModules_IGNORE_WIDTH ); @@ -1535,11 +1543,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) String aStr( aSearchLB.GetText() ); if ( aStr.Len() ) - Remember_Impl( aStr, TRUE ); + Remember_Impl( aStr, sal_True ); aStr = aReplaceLB.GetText(); if ( aStr.Len() ) - Remember_Impl( aStr, FALSE ); + Remember_Impl( aStr, sal_False ); } SaveToModule_Impl(); Close(); @@ -1579,7 +1587,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) int nRet = aDlg->Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true { - INT32 nFlags = aDlg->GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); pSearchItem->SetTransliterationFlags( nFlags ); ApplyTransliterationFlags_Impl( nFlags ); } @@ -1616,7 +1624,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) if ( !bSet ) SetModifyFlag_Impl( pEd ); else - bSet = FALSE; + bSet = sal_False; // Calc allows searching for empty cells. bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC); @@ -1673,7 +1681,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) { if ( !pFamilyController ) { - USHORT nId = 0; + sal_uInt16 nId = 0; // Enable templates controller switch ( pSearchItem->GetFamily() ) @@ -1740,13 +1748,13 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) if ( !pImpl->bMultiLineEdit ) { - aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, TRUE ) ); - aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, FALSE ) ); + aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, sal_True ) ); + aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, sal_False ) ); } else { - pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, TRUE ) ); - pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, FALSE ) ); + pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, sal_True ) ); + pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, sal_False ) ); } EnableControl_Impl( &aFormatBtn ); @@ -1755,16 +1763,16 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) FocusHdl_Impl( bSearch ? &aSearchLB : &aReplaceLB ); } - bSet = TRUE; - pImpl->bSaveToModule = FALSE; + bSet = sal_True; + pImpl->bSaveToModule = sal_False; FlagHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; return 0; } // ----------------------------------------------------------------------- -void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) +void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) { if ( !rStr.Len() ) return; @@ -1773,7 +1781,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB; // ignore identical strings - for ( USHORT i = 0; i < pArr->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pArr->Count(); ++i ) { if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) ) return; @@ -1785,7 +1793,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) if ( pArr->Count() >= REMEMBER_SIZE ) { pInsStr = (*pArr)[REMEMBER_SIZE - 1]; - pListBox->RemoveEntry( USHORT(REMEMBER_SIZE - 1) ); + pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) ); pArr->Remove( REMEMBER_SIZE - 1 ); *pInsStr = rStr; } @@ -1805,8 +1813,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) aSearchTmplLB .Clear(); aReplaceTmplLB.Clear(); rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL ); - aSearchTmplLB.SetUpdateMode( FALSE ); - aReplaceTmplLB.SetUpdateMode( FALSE ); + aSearchTmplLB.SetUpdateMode( sal_False ); + aReplaceTmplLB.SetUpdateMode( sal_False ); SfxStyleSheetBase* pBase = rPool.First(); while ( pBase ) @@ -1816,8 +1824,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) aReplaceTmplLB.InsertEntry( pBase->GetName() ); pBase = rPool.Next(); } - aSearchTmplLB.SetUpdateMode( TRUE ); - aReplaceTmplLB.SetUpdateMode( TRUE ); + aSearchTmplLB.SetUpdateMode( sal_True ); + aReplaceTmplLB.SetUpdateMode( sal_True ); aSearchTmplLB.SelectEntryPos(0); if ( aOldSrch.Len() ) @@ -1838,7 +1846,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) // ----------------------------------------------------------------------- -void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags ) +void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) { if ( nFlags == nOptions ) return; @@ -2073,9 +2081,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) if ( pCtrl == &aSearchLB || pCtrl == &pImpl->aSearchFormats ) { if ( pCtrl->HasChildPathFocus() ) - pImpl->bFocusOnSearch = TRUE; + pImpl->bFocusOnSearch = sal_True; pCtrl = &aSearchLB; - bSearch = TRUE; + bSearch = sal_True; if( nTxtLen ) EnableControl_Impl( &aNoFormatBtn ); @@ -2085,9 +2093,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) } else { - pImpl->bFocusOnSearch = FALSE; + pImpl->bFocusOnSearch = sal_False; pCtrl = &aReplaceLB; - bSearch = FALSE; + bSearch = sal_False; if ( ( !pImpl->bMultiLineEdit && aReplaceAttrText.GetText().Len() ) || ( pImpl->bMultiLineEdit && pImpl->aReplaceFormats.GetText().Len() ) ) @@ -2096,7 +2104,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) aNoFormatBtn.Disable(); aAttributeBtn.Disable(); } - bSet = TRUE; + bSet = sal_True; aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); @@ -2126,14 +2134,14 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) return 0; sal_sSize nCnt = 0; - const USHORT* pPtr = pImpl->pRanges; - const USHORT* pTmp = pPtr; + const sal_uInt16* pPtr = pImpl->pRanges; + const sal_uInt16* pTmp = pPtr; while( *pTmp ) pTmp++; nCnt = pTmp - pPtr + 7; - USHORT* pWhRanges = new USHORT[nCnt]; - USHORT nPos = 0; + sal_uInt16* pWhRanges = new sal_uInt16[nCnt]; + sal_uInt16 nPos = 0; while( *pPtr ) { @@ -2143,7 +2151,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) pWhRanges[nPos++] = SID_ATTR_PARA_MODEL; pWhRanges[nPos++] = SID_ATTR_PARA_MODEL; - USHORT nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH); + sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH); pWhRanges[nPos++] = nBrushWhich; pWhRanges[nPos++] = nBrushWhich; pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION; @@ -2189,10 +2197,10 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) SearchAttrItem* pAItem; const SfxPoolItem* pItem; - for( USHORT n = 0; n < pList->Count(); ++n ) + for( sal_uInt16 n = 0; n < pList->Count(); ++n ) if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) && SFX_ITEM_SET == aOutSet.GetItemState( - pAItem->pItem->Which(), FALSE, &pItem ) ) + pAItem->pItem->Which(), sal_False, &pItem ) ) { delete pAItem->pItem; pAItem->pItem = pItem->Clone(); @@ -2215,8 +2223,8 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) { aLayoutBtn.SetText( aStylesStr ); - bFormat = FALSE; - aLayoutBtn.Check( FALSE ); + bFormat = sal_False; + aLayoutBtn.Check( sal_False ); if ( bSearch ) { @@ -2234,9 +2242,9 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) pImpl->aReplaceFormats.SetText( String() ); pReplaceList->Clear(); } - pImpl->bSaveToModule = FALSE; + pImpl->bSaveToModule = sal_False; TemplateHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; aNoFormatBtn.Disable(); return 0; } @@ -2272,7 +2280,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) EnableControl_Impl( &aSelectionBtn ); else { - aSelectionBtn.Check( FALSE ); + aSelectionBtn.Check( sal_False ); aSelectionBtn.Disable(); } } @@ -2314,7 +2322,7 @@ void SvxSearchDialog::GetReplaceItems( SfxItemSet& rSet ) // ----------------------------------------------------------------------- String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, - BOOL bSrchFlag ) const + sal_Bool bSrchFlag ) const { if ( rStr.Len() ) rStr.Erase(); @@ -2352,7 +2360,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); - for ( USHORT i = 0; i < pList->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pList->Count(); ++i ) { const SearchAttrItem& rItem = pList->GetObject(i); @@ -2390,7 +2398,7 @@ void SvxSearchDialog::PaintAttrText_Impl() BuildAttrText_Impl( aDesc, bSearch ); if ( !bFormat && aDesc.Len() ) - bFormat = TRUE; + bFormat = sal_True; if ( bSearch ) { @@ -2464,15 +2472,15 @@ void SvxSearchDialog::SaveToModule_Impl() { pSearchItem->SetSearchString ( aSearchLB.GetText() ); pSearchItem->SetReplaceString( aReplaceLB.GetText() ); - Remember_Impl( aSearchLB.GetText(), TRUE ); + Remember_Impl( aSearchLB.GetText(), sal_True ); } - pSearchItem->SetRegExp( FALSE ); - pSearchItem->SetLevenshtein( FALSE ); + pSearchItem->SetRegExp( sal_False ); + pSearchItem->SetLevenshtein( sal_False ); if (GetCheckBoxValue( aRegExpBtn )) - pSearchItem->SetRegExp( TRUE ); + pSearchItem->SetRegExp( sal_True ); else if (GetCheckBoxValue( aSimilarityBox )) - pSearchItem->SetLevenshtein( TRUE ); + pSearchItem->SetLevenshtein( sal_True ); pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); @@ -2481,7 +2489,7 @@ void SvxSearchDialog::SaveToModule_Impl() pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); - INT32 nFlags = GetTransliterationFlags(); + sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) nFlags &= (TransliterationModules_IGNORE_CASE | TransliterationModules_IGNORE_WIDTH ); @@ -2508,7 +2516,7 @@ SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG); // ----------------------------------------------------------------------- -SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId, +SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -2522,7 +2530,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId, pBindings->Update( SID_SEARCH_SEARCHSET ); pBindings->Update( SID_SEARCH_REPLACESET ); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - dialog->bConstruct = FALSE; + dialog->bConstruct = sal_False; } SvxSearchDialogWrapper::~SvxSearchDialogWrapper () diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index 6632b11fd7c8..6632b11fd7c8 100644..100755 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index 52c91d17587d..f82d4f06cb88 100644..100755 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -29,6 +29,7 @@ #include <svx/dialogs.hrc> #include "srchdlg.hrc" +#include <sfx2/sfxcommands.h> #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; @@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE ModelessDialog RID_SVXDLG_SEARCH { - HelpId = SID_SEARCH_DLG ; + HelpId = CMD_SID_SEARCH_DLG ; OutputSize = TRUE ; Hide = TRUE ; SvLook = TRUE ; @@ -66,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_SEARCH { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH"; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -73,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_SEARCH { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -103,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_REPLACE { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE"; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -110,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -134,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH"; Pos = MAP_APPFONT ( 144 , 9 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find" ; @@ -142,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL"; Pos = MAP_APPFONT ( 144 , 26 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Find ~All" ; @@ -154,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE"; Pos = MAP_APPFONT ( 144 , 56 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -161,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL"; Pos = MAP_APPFONT ( 144 , 73 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Replace A~ll" ; @@ -174,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_1 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_2 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_MATCH_CASE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -195,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_WHOLE_WORDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Whole wor~ds only" ; @@ -207,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; MoreButton BTN_MORE { + HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE"; Pos = MAP_APPFONT ( 6 , 135 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -235,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SELECTIONS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS"; Pos = MAP_APPFONT ( 12 , 163 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "C~urrent selection only" ; @@ -243,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_BACKWARDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS"; Pos = MAP_APPFONT ( 12 , 176 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Bac~kwards" ; @@ -251,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_REGEXP { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP"; Pos = MAP_APPFONT ( 12 , 189 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Regular e~xpressions" ; @@ -259,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SIMILARITY { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY"; Pos = MAP_APPFONT ( 12 , 204 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "S~imilarity search" ; @@ -267,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_SIMILARITY { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY"; Pos = MAP_APPFONT ( 124 , 202 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -275,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_LAYOUTS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS"; Pos = MAP_APPFONT ( 12 , 219 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search for St~yles" ; @@ -283,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_NOTES { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -290,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH"; Pos = MAP_APPFONT ( 12 , 247 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -298,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_SOUNDS_LIKE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE"; Pos = MAP_APPFONT ( 12 , 260 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; TabStop = TRUE ; @@ -306,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_JAP_OPTIONS { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS"; Pos = MAP_APPFONT ( 124 , 258 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "..." ; @@ -314,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_ATTRIBUTE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE"; Pos = MAP_APPFONT ( 144 , 163 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Attri~butes..." ; @@ -322,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_FORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT"; Pos = MAP_APPFONT ( 144 , 180 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "For~mat..." ; @@ -330,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_NOFORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT"; Pos = MAP_APPFONT ( 144 , 197 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~No Format" ; @@ -351,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_CALC_SEARCHIN { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 283 ) ; Size = MAP_APPFONT ( 63 , 48 ) ; @@ -373,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_ROWS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS"; Pos = MAP_APPFONT ( 75 , 300 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Ro~ws" ; @@ -380,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_COLUMNS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS"; Pos = MAP_APPFONT ( 75 , 313 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Colu~mns" ; @@ -387,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_ALL_SHEETS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 326 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search in all sheets" ; diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index fa3ce019074e..fa3ce019074e 100644..100755 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 10b4f0750210..10b4f0750210 100644..100755 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 58208e9c98cd..20b3b62c8676 100644..100755 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -38,7 +38,7 @@ #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #include <svl/urihelper.hxx> #include <editeng/brshitem.hxx> #include <svl/intitem.hxx> @@ -46,14 +46,14 @@ #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> #include <editeng/flstitem.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #ifndef _XTABLE_HXX //autogen #include <svx/xtable.hxx> #endif -#include <drawitem.hxx> -#include <numvset.hxx> -#include <htmlmode.hxx> +#include <svx/drawitem.hxx> +#include <svx/numvset.hxx> +#include <svx/htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <editeng/unolingu.hxx> @@ -115,7 +115,7 @@ static const sal_Unicode aBulletTypes[] = static Font& lcl_GetDefaultBulletFont() { - static BOOL bInit = 0; + static sal_Bool bInit = 0; static Font aDefBulletFont( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ), String(), Size( 0, 14 ) ); @@ -125,8 +125,8 @@ static Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetFamily( FAMILY_DONTKNOW ); aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); - aDefBulletFont.SetTransparent( TRUE ); - bInit = TRUE; + aDefBulletFont.SetTransparent( sal_True ); + bInit = sal_True; } return aDefBulletFont; } @@ -152,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { - static USHORT const aLinesArr[] = + static sal_uInt16 aLinesArr[] = { 15, 10, 20, 30, @@ -172,7 +172,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) OutputDevice* pDev = rUDEvt.GetDevice(); Rectangle aRect = rUDEvt.GetRect(); - USHORT nItemId = rUDEvt.GetItemId(); + sal_uInt16 nItemId = rUDEvt.GetItemId(); long nRectWidth = aRect.GetWidth(); long nRectHeight = aRect.GetHeight(); Size aRectSize(nRectWidth, aRect.GetHeight()); @@ -221,7 +221,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Point aStart(aBLPos.X() + nRectWidth *25 / 100,0); Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0); - for( USHORT i = 11; i < 100; i += 33) + for( sal_uInt16 i = 11; i < 100; i += 33) { aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight * i / 100; pVDev->DrawLine(aStart, aEnd); @@ -239,9 +239,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) NUM_PAGETYPE_BULLET == nPageType ) { Point aStart(aBLPos.X() + nRectWidth / 9,0); - for( USHORT i = 0; i < 3; i++ ) + for( sal_uInt16 i = 0; i < 3; i++ ) { - USHORT nY = 11 + i * 33; + sal_uInt16 nY = 11 + i * 33; aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100; String sText; if(nPageType == NUM_PAGETYPE_BULLET) @@ -394,7 +394,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) #ifdef DBG_UTIL catch(Exception&) { - static sal_Bool bAssert = FALSE; + static sal_Bool bAssert = sal_False; if(!bAssert) { OSL_FAIL("exception in ::UserDraw"); @@ -416,13 +416,13 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ) : +SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) : ValueSet( pParent, rResId ), aLineColor ( COL_LIGHTGRAY ), nPageType ( nType ), - bHTMLMode ( FALSE ), + bHTMLMode ( sal_False ), pVDev ( NULL ) { SetColCount( 4 ); @@ -430,7 +430,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER ); if(NUM_PAGETYPE_BULLET == nType) { - for ( USHORT i = 0; i < 8; i++ ) + for ( sal_uInt16 i = 0; i < 8; i++ ) { InsertItem( i + 1, i ); SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) ); @@ -453,7 +453,7 @@ void SvxNumValueSet::SetNumberingSettings( aLocale = rLocale; if(aNum.getLength() > 8) SetStyle( GetStyle()|WB_VSCROLL); - for ( USHORT i = 0; i < aNum.getLength(); i++ ) + for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ ) { InsertItem( i + 1, i ); if( i < 8 ) @@ -482,7 +482,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings( SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), - bGrfNotFound( FALSE ) + bGrfNotFound( sal_False ) { GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); @@ -504,7 +504,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Rectangle aRect = rUDEvt.GetRect(); OutputDevice* pDev = rUDEvt.GetDevice(); - USHORT nItemId = rUDEvt.GetItemId(); + sal_uInt16 nItemId = rUDEvt.GetItemId(); Point aBLPos = aRect.TopLeft(); int nRectHeight = aRect.GetHeight(); @@ -514,14 +514,14 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, &aGraphic, NULL)) { - bGrfNotFound = TRUE; + bGrfNotFound = sal_True; } else { Point aPos(aBLPos.X() + 5, 0); - for( USHORT i = 0; i < 3; i++ ) + for( sal_uInt16 i = 0; i < 3; i++ ) { - USHORT nY = 11 + i * 33; + sal_uInt16 nY = 11 + i * 33; aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; aGraphic.Draw( pDev, aPos, aSize ); } @@ -533,7 +533,7 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) // only when a graphics was not there, it needs to be formatted if(bGrfNotFound) { - bGrfNotFound = FALSE; + bGrfNotFound = sal_False; Format(); } Invalidate(); diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src index aa01932e359b..aa01932e359b 100644..100755 --- a/svx/source/dialog/svxbmpnumvalueset.src +++ b/svx/source/dialog/svxbmpnumvalueset.src diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx index aba11a2eb35c..aba11a2eb35c 100644..100755 --- a/svx/source/dialog/svxdlg.cxx +++ b/svx/source/dialog/svxdlg.cxx diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index c77929aab1ec..247e3f94e0b1 100644..100755 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxgrahicitem.hxx" +#include "svx/svxgrahicitem.hxx" TYPEINIT1(SvxGraphicItem,SfxPoolItem); -SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic ) +SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic ) : SfxPoolItem( _nWhich ), aGraphic( rGraphic ) { diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 80f4e7c1da51..2e52f2c58379 100644..100755 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -49,15 +49,37 @@ #include <svx/dialmgr.hxx> #include <svx/ruler.hxx> #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" #include <vcl/svapp.hxx> #ifndef RULER_TAB_RTL -#define RULER_TAB_RTL ((USHORT)0x0010) +#define RULER_TAB_RTL ((sal_uInt16)0x0010) #endif +#include <comphelper/uieventslogger.hxx> + +namespace +{ + void lcl_logRulerUse(const ::rtl::OUString& sURL) //#i99729# + { + using namespace ::com::sun::star; + util::URL aTargetURL; + aTargetURL.Complete = sURL; + aTargetURL.Main = sURL; + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# + { + ::rtl::OUString sAppName; + uno::Sequence<beans::PropertyValue> source; + ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler")); + ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source); + } + } +} + + + // STATIC DATA ----------------------------------------------------------- #define CTRL_ITEM_COUNT 14 @@ -89,7 +111,7 @@ void Debug_Impl(Window *pWin, SvxColumnItem& rColItem) aTmp += String(ToMM(pWin, rColItem.GetLeft())); aTmp += " ColRight: "; aTmp += String(ToMM(pWin, rColItem.GetRight())); - for(USHORT i = 0; i < rColItem.Count(); ++i) { + for(sal_uInt16 i = 0; i < rColItem.Count(); ++i) { aTmp += " Start: "; aTmp += String(ToMM(pWin, rColItem[i].nStart)); aTmp += " End: "; @@ -123,7 +145,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs) String aTmp("Tabs: "); // Delete Def Tabs - for(USHORT i = 0; i < rTabs.Count(); ++i) + for(sal_uInt16 i = 0; i < rTabs.Count(); ++i) { aTmp += String(rTabs[i].GetTabPos() / 56); aTmp += " : "; @@ -187,7 +209,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri } String sContent(String::CreateFromAscii(pDescription)); sContent += rText; - USHORT nPos = pDebugWindow->GetLBox().InsertEntry(sContent); + sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent); pDebugWindow->GetLBox().SelectEntryPos(nPos); pDebugWindow->GrabFocus(); } @@ -205,9 +227,9 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri #endif struct SvxRuler_Impl { - USHORT *pPercBuf; - USHORT *pBlockBuf; - USHORT nPercSize; + sal_uInt16 *pPercBuf; + sal_uInt16 *pBlockBuf; + sal_uInt16 nPercSize; long nTotalDist; long lOldWinPos; long lMaxLeftLogic; @@ -216,15 +238,15 @@ struct SvxRuler_Impl { long lLastRMargin; SvxProtectItem aProtectItem; SfxBoolItem* pTextRTLItem; - USHORT nControlerItems; - USHORT nIdx; - USHORT nColLeftPix, nColRightPix; // Pixel values for left / right edge + sal_uInt16 nControlerItems; + sal_uInt16 nIdx; + sal_uInt16 nColLeftPix, nColRightPix; // Pixel values for left / right edge // For columns; buffered to prevent // recalculation errors // May be has to be widen for future values - BOOL bIsTableRows : 1; // pColumnItem contains table rows instead of columns + sal_Bool bIsTableRows : 1; // pColumnItem contains table rows instead of columns //#i24363# tab stops relative to indent - BOOL bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? + sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? SvxRuler_Impl() : pPercBuf(0), pBlockBuf(0), nPercSize(0), nTotalDist(0), @@ -236,8 +258,8 @@ struct SvxRuler_Impl { nIdx(0), nColLeftPix(0), nColRightPix(0), - bIsTableRows(FALSE), - bIsTabsRelativeToIndent(TRUE) + bIsTableRows(sal_False), + bIsTabsRelativeToIndent(sal_True) { } ~SvxRuler_Impl() @@ -246,22 +268,22 @@ struct SvxRuler_Impl { delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0; delete pTextRTLItem; } - void SetPercSize(USHORT nSize); + void SetPercSize(sal_uInt16 nSize); }; -void SvxRuler_Impl::SetPercSize(USHORT nSize) +void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize) { if(nSize > nPercSize) { delete[] pPercBuf; delete[] pBlockBuf; - pPercBuf = new USHORT[nPercSize = nSize]; - pBlockBuf = new USHORT[nPercSize = nSize]; + pPercBuf = new sal_uInt16[nPercSize = nSize]; + pBlockBuf = new sal_uInt16[nPercSize = nSize]; } - size_t nSize2 = sizeof(USHORT) * nPercSize; + size_t nSize2 = sizeof(sal_uInt16) * nPercSize; memset(pPercBuf, 0, nSize2); memset(pBlockBuf, 0, nSize2); } @@ -297,7 +319,7 @@ SvxRuler::SvxRuler Window* pParent, // StarView Parent Window* pWin, // Output window: is used for conversion // logical units <-> pixels - USHORT flags, // Display flags, see ruler.hxx + sal_uInt16 flags, // Display flags, see ruler.hxx SfxBindings &rBindings, // associated Bindings WinBits nWinStyle // StarView WinBits ) @@ -314,7 +336,7 @@ SvxRuler::SvxRuler pObjectItem(0), pEditWin(pWin), pRuler_Imp(new SvxRuler_Impl), - bAppSetNullOffset(FALSE), // Is the 0-offset of the ruler set by the application? + bAppSetNullOffset(sal_False), // Is the 0-offset of the ruler set by the application? lLogicNullOffset(0), lAppNullOffset(LONG_MAX), lMinFrame(5), @@ -335,9 +357,9 @@ SvxRuler::SvxRuler nDragOffset(0), nMaxLeft(0), nMaxRight(0), - bValid(FALSE), - bListening(FALSE), - bActive(TRUE) + bValid(sal_False), + bListening(sal_False), + bActive(sal_True) /* [Description] @@ -349,18 +371,18 @@ SvxRuler::SvxRuler rBindings.EnterRegistrations(); // Create Supported Items - USHORT i = 0; + sal_uInt16 i = 0; // Page edges pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings); if((nWinStyle & WB_VSCROLL) == WB_VSCROLL) { - bHorz = FALSE; + bHorz = sal_False; pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_ULSPACE, *this, rBindings); } else { - bHorz = TRUE; + bHorz = sal_True; pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings); } @@ -369,7 +391,7 @@ SvxRuler::SvxRuler if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) { - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pCtrlItem[i++] = new SvxRulerItem(nTabStopId, *this, rBindings); SetExtraType(RULER_EXTRA_TAB, nDefTabType); } @@ -390,7 +412,7 @@ SvxRuler::SvxRuler pIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM; pIndents[INDENT_LEFT_BORDER].nStyle = RULER_INDENT_BORDER; pIndents[INDENT_RIGHT_BORDER].nStyle = RULER_INDENT_BORDER; - for(USHORT nIn = 0; nIn < 7; nIn++) + for(sal_uInt16 nIn = 0; nIn < 7; nIn++) pIndents[nIn].nPos = 0; } @@ -408,7 +430,7 @@ SvxRuler::SvxRuler pObjectBorders = new RulerBorder[OBJECT_BORDER_COUNT]; size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT; memset(pObjectBorders, 0, nSize); - for(USHORT nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder) + for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder) { pObjectBorders[nBorder].nPos = 0; pObjectBorders[nBorder].nWidth = 0; @@ -441,7 +463,7 @@ SvxRuler::~SvxRuler() pBindings->EnterRegistrations(); - for(USHORT i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i) + for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i) delete pCtrlItem[i]; delete[] pCtrlItem; @@ -554,7 +576,7 @@ long SvxRuler::PixelAdjust(long nVal, long nValOld) const } -inline USHORT SvxRuler::GetObjectBordersOff(USHORT nIdx) const +inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const { return bHorz? nIdx: nIdx + 2; } @@ -569,7 +591,7 @@ void SvxRuler::UpdateFrame() */ { - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = ( pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected() ) ? 0 : RULER_MARGIN_SIZEABLE; @@ -597,7 +619,7 @@ void SvxRuler::UpdateFrame() else lRight = pLRSpaceItem->GetRight(); - ULONG aWidth= + sal_uIntPtr aWidth= ConvertHPosPixel(pPagePosItem->GetWidth() - lRight - lLogicNullOffset + lAppNullOffset); SetMargin2( aWidth, nMarginStyle ); @@ -634,8 +656,8 @@ void SvxRuler::UpdateFrame() } if(pColumnItem) { - pRuler_Imp->nColLeftPix = (USHORT) ConvertSizePixel(pColumnItem->GetLeft()); - pRuler_Imp->nColRightPix = (USHORT) ConvertSizePixel(pColumnItem->GetRight()); + pRuler_Imp->nColLeftPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetLeft()); + pRuler_Imp->nColRightPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetRight()); } } @@ -661,9 +683,9 @@ void SvxRuler::StartListening_Impl() { if(!bListening) { - bValid = FALSE; + bValid = sal_False; StartListening(*pBindings); - bListening = TRUE; + bListening = sal_True; } } @@ -749,7 +771,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) void SvxRuler::Update ( const SvxColumnItem *pItem, // new value - USHORT nSID //Slot Id to identify NULL items + sal_uInt16 nSID //Slot Id to identify NULL items ) /* [Description] @@ -777,7 +799,7 @@ void SvxRuler::Update //must not delete it { delete pColumnItem; pColumnItem = 0; - pRuler_Imp->bIsTableRows = FALSE; + pRuler_Imp->bIsTableRows = sal_False; } StartListening_Impl(); } @@ -799,8 +821,8 @@ void SvxRuler::UpdateColumns() nBorderCount = pColumnItem->Count(); pBorders = new RulerBorder[nBorderCount]; } - USHORT _nFlags = RULER_BORDER_VARIABLE; - BOOL bProtectColumns = + sal_uInt16 _nFlags = RULER_BORDER_VARIABLE; + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); if( !bProtectColumns ) @@ -811,10 +833,10 @@ void SvxRuler::UpdateColumns() if ( !bProtectColumns ) _nFlags |= RULER_BORDER_SIZEABLE; - USHORT nBorders = pColumnItem->Count(); + sal_uInt16 nBorders = pColumnItem->Count(); if(!pRuler_Imp->bIsTableRows) --nBorders; - for(USHORT i = 0; i < nBorders; ++i) + for(sal_uInt16 i = 0; i < nBorders; ++i) { pBorders[i].nStyle = _nFlags; if(!(*pColumnItem)[i].bVisible) @@ -872,7 +894,7 @@ void SvxRuler::UpdateObject() pObjectBorders[3].nPos = ConvertPosPixel(pObjectItem->GetEndY() - nMargin + lAppNullOffset); - const USHORT nOff = GetObjectBordersOff(0); + const sal_uInt16 nOff = GetObjectBordersOff(0); SetBorders(2, pObjectBorders + nOff); } else @@ -902,7 +924,7 @@ void SvxRuler::UpdatePara() // Dependence on PagePosItem if(pParaItem && pPagePosItem && !pObjectItem) { - BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); // First-line indent is negative to the left paragraph margin long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); @@ -1120,7 +1142,7 @@ long SvxRuler::GetDefTabDist() const } -USHORT ToSvTab_Impl(SvxTabAdjust eAdj) +sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) /* [Description] @@ -1140,7 +1162,7 @@ USHORT ToSvTab_Impl(SvxTabAdjust eAdj) } -SvxTabAdjust ToAttrTab_Impl(USHORT eAdj) +SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj) { switch(eAdj) { case RULER_TAB_LEFT: return SVX_TAB_ADJUST_LEFT ; @@ -1167,7 +1189,7 @@ void SvxRuler::UpdateTabs() { // buffer for DefaultTabStop // Distance last Tab <-> Right paragraph margin / DefaultTabDist - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); @@ -1186,10 +1208,10 @@ void SvxRuler::UpdateTabs() long nDefTabDist = ConvertHPosPixel(lDefTabDist); if( !nDefTabDist ) nDefTabDist = 1; - const USHORT nDefTabBuf = lPosPixel > lRightIndent || + const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent ? 0 - : (USHORT)( (lRightIndent - lPosPixel) / nDefTabDist ); + : (sal_uInt16)( (lRightIndent - lPosPixel) / nDefTabDist ); if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize) { @@ -1200,7 +1222,7 @@ void SvxRuler::UpdateTabs() } nTabCount = 0; - USHORT j; + sal_uInt16 j; //#i24363# tab stops relative to indent const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - nParaItemTxtLeft ); const long lParaIndentPix = ConvertSizePixel(lParaIndent); @@ -1341,7 +1363,7 @@ void SvxRuler::SetNullOffsetLogic ) { lAppNullOffset = lLogicNullOffset - lVal; - bAppSetNullOffset = TRUE; + bAppSetNullOffset = sal_True; Ruler::SetNullOffset(ConvertSizePixel(lVal)); Update(); } @@ -1400,7 +1422,7 @@ inline void SvxRuler::SetFrameLeft(long l) */ { - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); if(bAppSetNullOffset) @@ -1501,9 +1523,9 @@ long SvxRuler::GetRightFrameMargin() const { if(pColumnItem) { - if(!IsActLastColumn( TRUE )) + if(!IsActLastColumn( sal_True )) { - long nRet = (*pColumnItem)[GetActRightColumn( TRUE )].nEnd; + long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd; if(pColumnItem->IsTable() && pParaBorderItem) nRet -= pParaBorderItem->GetRight(); return nRet; @@ -1521,7 +1543,7 @@ long SvxRuler::GetRightFrameMargin() const l += pULSpaceItem->GetLower(); if(pParaBorderItem && - (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( TRUE ))) + (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( sal_True ))) l += pParaBorderItem->GetRight(); if(bHorz) @@ -1535,7 +1557,7 @@ long SvxRuler::GetRightFrameMargin() const SVXRULER_SUPPORT_NEGATIVE_MARGINS ) #define TAB_FLAG ( pColumnItem && pColumnItem->IsTable() ) -long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight ) +long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight ) /* [Description] @@ -1547,7 +1569,7 @@ long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight ) const long lNullPix = Ruler::GetNullOffset(); long lDragPos = GetDragPos() + lNullPix; ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) - BOOL bHoriRows = bHorz && pRuler_Imp->bIsTableRows; + sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows; if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft) lDragPos = nMaxLeft; else if((bRight||bHoriRows) && lDragPos > nMaxRight) @@ -1559,7 +1581,7 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) void ModifyTabs_Impl ( - USHORT nCount, // Number of Tabs + sal_uInt16 nCount, // Number of Tabs RulerTab *pTabs, // Tab buffer long lDiff // difference to be added ) @@ -1570,7 +1592,7 @@ void ModifyTabs_Impl */ { if( pTabs ) - for(USHORT i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff; + for(sal_uInt16 i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff; } @@ -1582,7 +1604,7 @@ void SvxRuler::DragMargin1() Dragging the left edge of frame */ { - const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, TRUE ); + const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True ); DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz); if(pColumnItem&& (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) @@ -1593,11 +1615,11 @@ void SvxRuler::AdjustMargin1(long lDiff) { const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset(); const long lDragPos = lDiff; - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; if(!bAppSetNullOffset) @@ -1622,7 +1644,7 @@ void SvxRuler::AdjustMargin1(long lDiff) } if(pColumnItem) { - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) pBorders[i].nPos -= _lDiff; SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) @@ -1671,7 +1693,7 @@ void SvxRuler::AdjustMargin1(long lDiff) if(pColumnItem) { - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) pBorders[i].nPos += _lDiff; SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) @@ -1712,7 +1734,7 @@ void SvxRuler::DragMargin2() Dragging the right edge of frame */ { - const long lDragPos = GetCorrectedDragPos( TRUE, !TAB_FLAG || !NEG_FLAG); + const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG); DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz); long lDiff = lDragPos - GetMargin2(); @@ -1720,10 +1742,10 @@ void SvxRuler::DragMargin2() (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) DragBorders(); - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; SetMargin2( lDragPos, nMarginStyle ); @@ -1744,7 +1766,7 @@ void SvxRuler::DragIndents() */ { const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos(); - const USHORT nIdx = GetDragAryPos()+INDENT_GAP; + const sal_uInt16 nIdx = GetDragAryPos()+INDENT_GAP; const long lDiff = pIndents[nIdx].nPos - lDragPos; if((nIdx == INDENT_FIRST_LINE || @@ -1760,7 +1782,7 @@ void SvxRuler::DragIndents() } -void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, BOOL Hori) +void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori) /* [Description] @@ -1827,9 +1849,9 @@ void SvxRuler::DragTabs() */ { - long lDragPos = GetCorrectedDragPos(TRUE, FALSE); + long lDragPos = GetCorrectedDragPos(sal_True, sal_False); - USHORT nIdx = GetDragAryPos()+TAB_GAP; + sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP; DrawLine_Impl(lTabPos, 7, bHorz); long nDiff = lDragPos - pTabs[nIdx].nPos; @@ -1837,7 +1859,7 @@ void SvxRuler::DragTabs() if(nDragType & DRAG_OBJECT_SIZE_LINEAR) { - for(USHORT i = nIdx; i < nTabCount; ++i) + for(sal_uInt16 i = nIdx; i < nTabCount; ++i) { pTabs[i].nPos += nDiff; // limit on maximum @@ -1851,7 +1873,7 @@ void SvxRuler::DragTabs() { pRuler_Imp->nTotalDist -= nDiff; pTabs[nIdx].nPos = lDragPos; - for(USHORT i = nIdx+1; i < nTabCount; ++i) + for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i) { if(pTabs[i].nStyle & RULER_TAB_DEFAULT) // can be canceled at the DefaultTabs @@ -1877,7 +1899,7 @@ void SvxRuler::DragTabs() -void SvxRuler::SetActive(BOOL bOn) +void SvxRuler::SetActive(sal_Bool bOn) { if(bOn) { @@ -1889,10 +1911,10 @@ void SvxRuler::SetActive(BOOL bOn) { pBindings->EnterRegistrations(); if(bOn) - for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++) + for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++) pCtrlItem[i]->ReBind(); else - for(USHORT j=0;j<pRuler_Imp->nControlerItems;j++) + for(sal_uInt16 j=0;j<pRuler_Imp->nControlerItems;j++) pCtrlItem[j]->UnBind(); pBindings->LeaveRegistrations(); } @@ -1926,7 +1948,7 @@ void SvxRuler::UpdateParaContents_Impl pIndents[INDENT_LEFT_MARGIN].nPos += l; if ( pTabs ) { - for(USHORT i = 0; i < nTabCount+TAB_GAP;++i) + for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP;++i) pTabs[i].nPos += l; SetTabs(nTabCount, pTabs+TAB_GAP); } @@ -1944,7 +1966,7 @@ void SvxRuler::DragBorders() Dragging of Borders (Tables and other columns) */ { - BOOL bLeftIndentsCorrected = FALSE, bRightIndentsCorrected = FALSE; + sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False; int nIdx; if(GetDragType()==RULER_TYPE_BORDER) @@ -1955,7 +1977,7 @@ void SvxRuler::DragBorders() else nIdx=0; - USHORT nDragSize = GetDragSize(); + sal_uInt16 nDragSize = GetDragSize(); long lDiff = 0; // the drag position has to be corrected to be able to prevent borders from passing each other @@ -1984,13 +2006,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi if(i == GetActRightColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); - bRightIndentsCorrected = TRUE; + bRightIndentsCorrected = sal_True; } // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); - bLeftIndentsCorrected = TRUE; + bLeftIndentsCorrected = sal_True; } } } @@ -2056,13 +2078,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi if(i == GetActRightColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); - bRightIndentsCorrected = TRUE; + bRightIndentsCorrected = sal_True; } // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); - bLeftIndentsCorrected = TRUE; + bLeftIndentsCorrected = sal_True; } } } @@ -2165,7 +2187,7 @@ void SvxRuler::DragObjectBorder() if(RULER_DRAGSIZE_MOVE == GetDragSize()) { const long lPos = GetCorrectedDragPos(); - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); pObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPos; SetBorders(2, pObjectBorders + GetObjectBordersOff(0)); DrawLine_Impl(lTabPos, 7, bHorz); @@ -2182,7 +2204,7 @@ void SvxRuler::ApplyMargins() */ { const SfxPoolItem *pItem = 0; - USHORT nId = SID_ATTR_LONG_LRSPACE; + sal_uInt16 nId = SID_ATTR_LONG_LRSPACE; if(bHorz) { const long lOldNull = lLogicNullOffset; @@ -2246,9 +2268,9 @@ void SvxRuler::ApplyIndents() */ { long nNewTxtLeft; - if(pColumnItem&&!IsActFirstColumn( TRUE )) + if(pColumnItem&&!IsActFirstColumn( sal_True )) { - long nLeftCol=GetActLeftColumn( TRUE ); + long nLeftCol=GetActLeftColumn( sal_True ); nNewTxtLeft = PixelHAdjust( ConvertHPosLogic( @@ -2263,7 +2285,7 @@ void SvxRuler::ApplyIndents() ConvertHPosLogic(pIndents[INDENT_LEFT_MARGIN].nPos), pParaItem->GetTxtLeft()); - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); long nNewFirstLineOffset; if(bRTL) @@ -2302,11 +2324,11 @@ void SvxRuler::ApplyIndents() sal::static_int_cast< short >(nNewFirstLineOffset)); pParaItem->SetTxtLeft(nNewTxtLeft); - if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn()))) + if(pColumnItem && ((!bRTL && !IsActLastColumn( sal_True ))|| (bRTL && !IsActFirstColumn()))) { if(bRTL) { - long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos; + long nActBorder = pBorders[GetActLeftColumn( sal_True )].nPos; long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos; long nConvert = ConvertHPosLogic( nRightMargin - nActBorder ); pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) ); @@ -2316,7 +2338,7 @@ void SvxRuler::ApplyIndents() pParaItem->SetRight( PixelHAdjust( ConvertHPosLogic( - pBorders[GetActRightColumn( TRUE )].nPos - + pBorders[GetActRightColumn( sal_True )].nPos - pIndents[INDENT_RIGHT_MARGIN].nPos) - lAppNullOffset, pParaItem->GetRight())); @@ -2341,7 +2363,7 @@ void SvxRuler::ApplyIndents() lAppNullOffset, pParaItem->GetRight())); } } - USHORT nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL; + sal_uInt16 nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL; pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L ); UpdateTabs(); } @@ -2354,8 +2376,8 @@ void SvxRuler::ApplyTabs() Apply tab settings, changed by dragging. */ { - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); - const USHORT nCoreIdx = GetDragAryPos(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + const sal_uInt16 nCoreIdx = GetDragAryPos(); if(IsDragDelete()) { pTabStopItem->Remove(nCoreIdx); @@ -2365,7 +2387,7 @@ void SvxRuler::ApplyTabs() { SvxTabStopItem *pItem = new SvxTabStopItem(pTabStopItem->Which()); //remove default tab stops - for ( USHORT i = 0; i < pItem->Count(); ) + for ( sal_uInt16 i = 0; i < pItem->Count(); ) { if ( SVX_TAB_ADJUST_DEFAULT == (*pItem)[i].GetAdjustment() ) { @@ -2375,7 +2397,7 @@ void SvxRuler::ApplyTabs() ++i; } - USHORT j; + sal_uInt16 j; for(j = 0; j < nCoreIdx; ++j) { pItem->Insert((*pTabStopItem)[j]); @@ -2429,7 +2451,7 @@ void SvxRuler::ApplyTabs() pTabStopItem->Remove(nCoreIdx); pTabStopItem->Insert(aTabStop); } - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L ); UpdateTabs(); } @@ -2457,7 +2479,7 @@ void SvxRuler::ApplyBorders() lAppNullOffset, pColumnItem->GetRight() ) ); } } - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) { long& nEnd = (*pColumnItem)[i].nEnd; nEnd = PIXEL_H_ADJUST( @@ -2478,8 +2500,8 @@ void SvxRuler::ApplyBorders() Debug_Impl(pEditWin,*pColumnItem); #endif // DEBUGLIN SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY, - nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: FALSE); - USHORT nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : + nDragType & DRAG_OBJECT_ACTLINE_ONLY? sal_True : sal_False); + sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL); pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L ); } @@ -2534,8 +2556,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) long lPos; long lWidth=0; - USHORT nStart; - USHORT nIdx=GetDragAryPos(); + sal_uInt16 nStart; + sal_uInt16 nIdx=GetDragAryPos(); lWidth=0; long lActWidth=0; long lActBorderSum; @@ -2567,8 +2589,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) //because the height of the table changes while dragging if(pRuler_Imp->bIsTableRows && RULER_TYPE_BORDER == eType) { - USHORT nStartBorder; - USHORT nEndBorder; + sal_uInt16 nStartBorder; + sal_uInt16 nEndBorder; if(bHorz) { nStartBorder = nIdx + 1; @@ -2586,7 +2608,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) pRuler_Imp->nTotalDist = lWidth; lPos = lOrigLPos = pBorders[nIdx].nPos; - for(USHORT i = nStartBorder; i < nEndBorder; ++i) + for(sal_uInt16 i = nStartBorder; i < nEndBorder; ++i) { if(bHorz) { @@ -2595,16 +2617,16 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) } else lActWidth = pBorders[i].nPos; - pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000) + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000) / pRuler_Imp->nTotalDist); - pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum; + pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum; lActBorderSum += pBorders[i].nWidth; } } else { lPos = lOrigLPos; - for(USHORT ii = nStart; ii < pColumnItem->Count() - 1; ++ii) + for(sal_uInt16 ii = nStart; ii < pColumnItem->Count() - 1; ++ii) { lWidth += pBorders[ii].nPos - lPos; lPos = pBorders[ii].nPos + pBorders[ii].nWidth; @@ -2614,13 +2636,13 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) pRuler_Imp->nTotalDist = lWidth; lPos = lOrigLPos; - for(USHORT i = nStart; i < pColumnItem->Count() - 1; ++i) + for(sal_uInt16 i = nStart; i < pColumnItem->Count() - 1; ++i) { lActWidth += pBorders[i].nPos - lPos; lPos = pBorders[i].nPos + pBorders[i].nWidth; - pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000) + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000) / pRuler_Imp->nTotalDist); - pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum; + pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum; lActBorderSum += pBorders[i].nWidth; } } @@ -2628,14 +2650,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) break; case RULER_TYPE_TAB: { - const USHORT nIdx = GetDragAryPos()+TAB_GAP; + const sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP; pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos; pRuler_Imp->SetPercSize(nTabCount); - for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ; - for(USHORT i = nIdx+1; i < nTabCount; ++i) + for(sal_uInt16 n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ; + for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i) { const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos; - pRuler_Imp->pPercBuf[i] = (USHORT)((nDelta * 1000) / pRuler_Imp->nTotalDist); + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((nDelta * 1000) / pRuler_Imp->nTotalDist); } break; } @@ -2657,7 +2679,7 @@ void SvxRuler::EvalModifier() */ { - USHORT nModifier = GetDragModifier(); + sal_uInt16 nModifier = GetDragModifier(); if(pRuler_Imp->bIsTableRows) { //rows can only be moved in one way, additionally current column is possible @@ -2697,6 +2719,7 @@ void SvxRuler::Click() */ { + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click")); Ruler::Click(); if( bActive ) { @@ -2712,11 +2735,11 @@ void SvxRuler::Click() pBindings->Update( SID_RULER_PROTECT ); pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL ); } - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); if(pTabStopItem && (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) { - BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); + sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if( bContentProtected ) return; const long lPos = GetClickPos(); if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) || @@ -2745,11 +2768,11 @@ void SvxRuler::Click() } -BOOL SvxRuler::CalcLimits +sal_Bool SvxRuler::CalcLimits ( long &nMax1, // minimum value to be set long &nMax2, // minimum value to be set - BOOL + sal_Bool ) const /* [Description] @@ -2760,7 +2783,7 @@ BOOL SvxRuler::CalcLimits { nMax1 = LONG_MIN; nMax2 = LONG_MAX; - return FALSE; + return sal_False; } @@ -2773,7 +2796,7 @@ void SvxRuler::CalcMinMax() */ { - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); const long lNullPix = ConvertPosPixel(lLogicNullOffset); pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1; switch(GetDragType()) @@ -2946,7 +2969,7 @@ void SvxRuler::CalcMinMax() } case RULER_TYPE_BORDER: { // Table, column (Modifier) - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); switch(GetDragSize()) { case RULER_DRAGSIZE_1 : @@ -2987,13 +3010,13 @@ void SvxRuler::CalcMinMax() { //nIdx contains the position of the currently moved item //next visible separator on the left - USHORT nLeftCol=GetActLeftColumn(FALSE, nIdx); + sal_uInt16 nLeftCol=GetActLeftColumn(sal_False, nIdx); //next visible separator on the right - USHORT nRightCol=GetActRightColumn(FALSE, nIdx); + sal_uInt16 nRightCol=GetActRightColumn(sal_False, nIdx); //next separator on the left - regardless if visible or not - USHORT nActLeftCol=GetActLeftColumn(); + sal_uInt16 nActLeftCol=GetActLeftColumn(); //next separator on the right - regardless if visible or not - USHORT nActRightCol=GetActRightColumn(); + sal_uInt16 nActRightCol=GetActRightColumn(); if(pColumnItem->IsTable()) { if(nDragType & DRAG_OBJECT_ACTLINE_ONLY) @@ -3113,8 +3136,8 @@ void SvxRuler::CalcMinMax() else { nMaxRight = lNullPix + pBorders[nRightCol].nPos; - USHORT nNotHiddenRightCol = - GetActRightColumn(TRUE, nIdx); + sal_uInt16 nNotHiddenRightCol = + GetActRightColumn(sal_True, nIdx); if( nActLeftCol == nIdx ) { @@ -3148,7 +3171,7 @@ void SvxRuler::CalcMinMax() { if(pObjectItem->HasLimits()) { - if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: TRUE)) + if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True)) { nMaxLeft = ConvertPosPixel(nMaxLeft); nMaxRight = ConvertPosPixel(nMaxRight); @@ -3196,7 +3219,7 @@ void SvxRuler::CalcMinMax() } case RULER_TYPE_INDENT: { - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); switch(nIdx) { case INDENT_FIRST_LINE - INDENT_GAP: case INDENT_LEFT_MARGIN - INDENT_GAP: @@ -3251,8 +3274,8 @@ void SvxRuler::CalcMinMax() nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame; if(pColumnItem) { - USHORT nRightCol=GetActRightColumn( TRUE ); - if(!IsActLastColumn( TRUE )) + sal_uInt16 nRightCol=GetActRightColumn( sal_True ); + if(!IsActLastColumn( sal_True )) nMaxRight += pBorders[nRightCol].nPos; else nMaxRight += GetMargin2(); @@ -3268,8 +3291,8 @@ void SvxRuler::CalcMinMax() nMaxRight = lNullPix; if(pColumnItem) { - USHORT nRightCol=GetActRightColumn( TRUE ); - if(!IsActLastColumn( TRUE )) + sal_uInt16 nRightCol=GetActRightColumn( sal_True ); + if(!IsActLastColumn( sal_True )) nMaxRight += pBorders[nRightCol].nPos; else nMaxRight += GetMargin2(); @@ -3326,9 +3349,10 @@ long SvxRuler::StartDrag() */ { - BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag")); + sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if(!bValid) - return FALSE; + return sal_False; pRuler_Imp->lLastLMargin=GetMargin1(); pRuler_Imp->lLastRMargin=GetMargin2(); @@ -3348,7 +3372,7 @@ long SvxRuler::StartDrag() nDragType = DRAG_OBJECT; } else - bOk = FALSE; + bOk = sal_False; break; case RULER_TYPE_BORDER: // Table, column (Modifier) if(pColumnItem) @@ -3363,8 +3387,8 @@ long SvxRuler::StartDrag() break; case RULER_TYPE_INDENT: { // Paragraph indents (Modifier) if( bContentProtected ) - return FALSE; - USHORT nIndent = INDENT_LEFT_MARGIN; + return sal_False; + sal_uInt16 nIndent = INDENT_LEFT_MARGIN; if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Left paragraph indent pIndents[0] = pIndents[INDENT_FIRST_LINE]; pIndents[0].nStyle |= RULER_STYLE_DONTKNOW; @@ -3377,7 +3401,7 @@ long SvxRuler::StartDrag() break; } case RULER_TYPE_TAB: // Tabs (Modifier) - if( bContentProtected ) return FALSE; + if( bContentProtected ) return sal_False; EvalModifier(); pTabs[0] = pTabs[GetDragAryPos()+1]; pTabs[0].nStyle |= RULER_STYLE_DONTKNOW; @@ -3442,7 +3466,8 @@ void SvxRuler::EndDrag() data to the application. */ { - const BOOL bUndo = IsDragCanceled(); + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag")); + const sal_Bool bUndo = IsDragCanceled(); const long lPos = GetDragPos(); DrawLine_Impl(lTabPos, 6, bHorz); lTabPos=-1; @@ -3493,7 +3518,7 @@ void SvxRuler::EndDrag() nDragType = NONE; Ruler::EndDrag(); if(bUndo) - for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++) + for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++) { pCtrlItem[i]->ClearCache(); pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId()); @@ -3536,8 +3561,8 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) ((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) { Update(); EndListening(*pBindings); - bValid = TRUE; - bListening = FALSE; + bValid = sal_True; + bListening = sal_False; } } @@ -3570,7 +3595,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu ) aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1); pTabStopItem->Remove(pRuler_Imp->nIdx); pTabStopItem->Insert(aTabStop); - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L ); UpdateTabs(); pRuler_Imp->nIdx = 0; @@ -3590,7 +3615,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) if ( COMMAND_CONTEXTMENU == rCEvt.GetCommand() ) { CancelDrag(); - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); if ( pTabs && RULER_TYPE_TAB == GetType( rCEvt.GetMousePosPixel(), &pRuler_Imp->nIdx ) && @@ -3604,10 +3629,10 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) aDev.SetBackground(Wallpaper(Color(COL_WHITE))); const Point aPt(aSz.Width() / 2, aSz.Height() / 2); - for ( USHORT i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i ) + for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i ) { - USHORT nStyle = bRTL ? i|RULER_TAB_RTL : i; - nStyle |= (USHORT)(bHorz ? WB_HORZ : WB_VERT); + sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i; + nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT); DrawTab(&aDev, aPt, nStyle); aMenu.InsertItem(i+1, String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())), @@ -3622,13 +3647,13 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) PopupMenu aMenu(ResId(RID_SVXMN_RULER, DIALOG_MGR())); aMenu.SetSelectHdl(LINK(this, SvxRuler, MenuSelect)); FieldUnit eUnit = GetUnit(); - const USHORT nCount = aMenu.GetItemCount(); + const sal_uInt16 nCount = aMenu.GetItemCount(); - BOOL bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC); - for ( USHORT i = nCount; i; --i ) + sal_Bool bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC); + for ( sal_uInt16 i = nCount; i; --i ) { - const USHORT nId = aMenu.GetItemId(i - 1); - aMenu.CheckItem(nId, nId == (USHORT)eUnit); + const sal_uInt16 nId = aMenu.GetItemId(i - 1); + aMenu.CheckItem(nId, nId == (sal_uInt16)eUnit); if(bReduceMetric && (nId == FUNIT_M || nId == FUNIT_KM || @@ -3653,14 +3678,14 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) } -USHORT SvxRuler::GetActRightColumn( - BOOL bForceDontConsiderHidden, USHORT nAct ) const +sal_uInt16 SvxRuler::GetActRightColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const { if( nAct == USHRT_MAX ) nAct = pColumnItem->GetActColumn(); else nAct++; //To be able to pass on the ActDrag - BOOL bConsiderHidden = !bForceDontConsiderHidden && + sal_Bool bConsiderHidden = !bForceDontConsiderHidden && !( nDragType & DRAG_OBJECT_ACTLINE_ONLY ); while( nAct < pColumnItem->Count() - 1 ) @@ -3675,15 +3700,15 @@ USHORT SvxRuler::GetActRightColumn( -USHORT SvxRuler::GetActLeftColumn( - BOOL bForceDontConsiderHidden, USHORT nAct ) const +sal_uInt16 SvxRuler::GetActLeftColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const { if(nAct==USHRT_MAX) nAct=pColumnItem->GetActColumn(); - USHORT nLOffs=1; + sal_uInt16 nLOffs=1; - BOOL bConsiderHidden = !bForceDontConsiderHidden && + sal_Bool bConsiderHidden = !bForceDontConsiderHidden && !( nDragType & DRAG_OBJECT_ACTLINE_ONLY ); while(nAct>=nLOffs) @@ -3697,19 +3722,19 @@ USHORT SvxRuler::GetActLeftColumn( } -BOOL SvxRuler::IsActLastColumn( - BOOL bForceDontConsiderHidden, USHORT nAct) const +sal_Bool SvxRuler::IsActLastColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const { return GetActRightColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX; } -BOOL SvxRuler::IsActFirstColumn( - BOOL bForceDontConsiderHidden, USHORT nAct) const +sal_Bool SvxRuler::IsActFirstColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const { return GetActLeftColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX; } -long SvxRuler::CalcPropMaxRight(USHORT nCol) const +long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const { if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR)) @@ -3722,7 +3747,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const long lMinSpace=USHRT_MAX; long lOldPos; long lColumns=0; - USHORT nStart; + sal_uInt16 nStart; if(!pColumnItem->IsTable()) { if(nCol==USHRT_MAX) @@ -3737,7 +3762,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const lFences=pBorders[nCol].nWidth; } - for(USHORT i = nStart; i < nBorderCount-1; ++i) + for(sal_uInt16 i = nStart; i < nBorderCount-1; ++i) { long lWidth=pBorders[i].nPos-lOldPos; lColumns+=lWidth; @@ -3753,7 +3778,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const } else { - USHORT nActCol; + sal_uInt16 nActCol; if(nCol==USHRT_MAX) //CalcMinMax for LeftMargin { lOldPos=GetMargin1(); @@ -3767,7 +3792,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const lFences=0; while(nActCol<nBorderCount||nActCol==USHRT_MAX) { - USHORT nRight; + sal_uInt16 nRight; if(nActCol==USHRT_MAX) { nRight=0; @@ -3775,7 +3800,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const nRight++; } else - nRight=GetActRightColumn(FALSE, nActCol); + nRight=GetActRightColumn(sal_False, nActCol); long lWidth; if(nRight!=USHRT_MAX) { @@ -3799,19 +3824,19 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const { if(pColumnItem->IsTable()) { - USHORT nVisCols=0; - for(USHORT i=GetActRightColumn(FALSE, nCol);i<nBorderCount;) + sal_uInt16 nVisCols=0; + for(sal_uInt16 i=GetActRightColumn(sal_False, nCol);i<nBorderCount;) { if((*pColumnItem)[i].bVisible) nVisCols++; - i=GetActRightColumn(FALSE, i); + i=GetActRightColumn(sal_False, i); } return GetMargin2()-GetMargin1()-(nVisCols+1)*lMinFrame; } else { long lWidth=0; - for(USHORT i=nCol;i<nBorderCount-1;i++) + for(sal_uInt16 i=nCol;i<nBorderCount-1;i++) { lWidth+=lMinFrame+pBorders[i].nWidth; } @@ -3821,7 +3846,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const } // Tab stops relative to indent (#i24363#) -void SvxRuler::SetTabsRelativeToIndent( BOOL bRel ) +void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel ) { pRuler_Imp->bIsTabsRelativeToIndent = bRel; } diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 5f79d8937f96..452a54bce1a6 100644..100755 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -34,7 +34,7 @@ #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <svtools/colorcfg.hxx> -#include <swframeexample.hxx> +#include <svx/swframeexample.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -58,7 +58,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) : nVRel (RelOrientation::PRINT_AREA), nWrap (WrapTextMode_NONE), nAnchor (TextContentAnchorType_AT_PAGE), - bTrans (FALSE), + bTrans (sal_False), aRelPos (Point(0,0)) { InitColors_Impl(); @@ -74,7 +74,7 @@ void SvxSwFrameExample::InitColors_Impl( void ) const StyleSettings& rSettings = GetSettings().GetStyleSettings(); m_aBgCol = Color( rSettings.GetWindowColor() ); - BOOL bHC = rSettings.GetHighContrastMode(); + sal_Bool bHC = rSettings.GetHighContrastMode(); m_aFrameColor = Color( COL_LIGHTGREEN ); m_aAlignColor = Color( COL_LIGHTRED ); @@ -101,19 +101,19 @@ void SvxSwFrameExample::InitAllRects_Impl() { aPage.SetSize( GetOutputSizePixel() ); - ULONG nOutWPix = aPage.GetWidth(); - ULONG nOutHPix = aPage.GetHeight(); + sal_uIntPtr nOutWPix = aPage.GetWidth(); + sal_uIntPtr nOutHPix = aPage.GetHeight(); // PrintArea - ULONG nLBorder; - ULONG nRBorder; - ULONG nTBorder; - ULONG nBBorder; + sal_uIntPtr nLBorder; + sal_uIntPtr nRBorder; + sal_uIntPtr nTBorder; + sal_uIntPtr nBBorder; - ULONG nLTxtBorder; - ULONG nRTxtBorder; - ULONG nTTxtBorder; - ULONG nBTxtBorder; + sal_uIntPtr nLTxtBorder; + sal_uIntPtr nRTxtBorder; + sal_uIntPtr nTTxtBorder; + sal_uIntPtr nBTxtBorder; if (nAnchor != TextContentAnchorType_AS_CHARACTER) { @@ -150,7 +150,7 @@ void SvxSwFrameExample::InitAllRects_Impl() aTextLine.Move(0, nTTxtBorder); // Rectangle to edges including paragraph - USHORT nLines = (USHORT)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder) + sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder) / (aTextLine.GetHeight() + 2)); aPara = aPagePrtArea; aPara.SetSize(Size(aPara.GetWidth(), @@ -198,8 +198,8 @@ void SvxSwFrameExample::InitAllRects_Impl() // Size of the frame to be positioned if (nAnchor != TextContentAnchorType_AS_CHARACTER) { - ULONG nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder; - ULONG nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder; + sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder; + sal_uIntPtr nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder; switch (nHRel) { @@ -222,7 +222,7 @@ void SvxSwFrameExample::InitAllRects_Impl() } else { - ULONG nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT)); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L))); @@ -456,9 +456,9 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C // Testabsatz zeichnen Rectangle aTxt(aTextLine); sal_Int32 nStep = aTxt.GetHeight() + 2; - USHORT nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); + sal_uInt16 nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); - for (USHORT i = 0; i < nLines; i++) + for (sal_uInt16 i = 0; i < nLines; i++) { if (i == nLines - 1) aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight())); @@ -605,7 +605,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) const long nTxtLineHeight = aTextLine.GetHeight(); Rectangle aTxt(aTextLine); sal_Int32 nStep; - USHORT nLines; + sal_uInt16 nLines; if (nAnchor == TextContentAnchorType_AT_FRAME) { @@ -615,13 +615,13 @@ void SvxSwFrameExample::Paint(const Rectangle&) aTxt.Bottom() = aTxt.Top() + aTextLine.GetHeight() - 1; nStep = aTxt.GetHeight() + 2; - nLines = (USHORT)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3) + nLines = (sal_uInt16)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3) / (aTxt.GetHeight() + 2)); } else { nStep = aTxt.GetHeight() + 2; - nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); + nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); } if (nAnchor != TextContentAnchorType_AS_CHARACTER) @@ -635,7 +635,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) ( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR || nVRel == RelOrientation::TEXT_LINE ); - for (USHORT i = 0; i < nLines; ++i) + for (sal_uInt16 i = 0; i < nLines; ++i) { if (i == (nLines - 1)) aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight())); @@ -670,7 +670,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom()) { // Text has been replaced by frame, so adjust parameters height - ULONG nDiff = aTxt.Bottom() - aParaPrtArea.Bottom(); + sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom(); aParaPrtArea.Bottom() += nDiff; aPara.Bottom() += nDiff; @@ -692,7 +692,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor); // Frame View - BOOL bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? TRUE : bTrans; + sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans; DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor ); } diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index 99a9cd371f25..793ed5a24e74 100644..100755 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <swframeposstrings.hxx> +#include <svx/swframeposstrings.hxx> #include <tools/rc.hxx> #include <tools/debug.hxx> #include <svx/dialmgr.hxx> @@ -44,7 +44,7 @@ public: SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() : Resource(SVX_RES(RID_SVXSW_FRAMEPOSITIONS)) { - for(USHORT i = 0; i < SvxSwFramePosString::STR_MAX; i++) + for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++) { //string ids have to start at 1 aStrings[i] = String(SVX_RES(i + 1)); diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src index 6867b0919bdc..a4cc9764b645 100644..100755 --- a/svx/source/dialog/swframeposstrings.src +++ b/svx/source/dialog/swframeposstrings.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//the following defines have to match the (enum values + 1) in swframeposstrings.hxx! +//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx! #define STR_LEFT 1 #define STR_RIGHT 2 #define STR_FROMLEFT 3 diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 0b577e84ea7c..9f276fb90ec5 100644..100755 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "txencbox.hxx" -#include "txenctab.hxx" +#include "svx/txencbox.hxx" +#include "svx/txenctab.hxx" #include <svx/dialogs.hrc> #include "svx/dbcharsethelper.hxx" #include <vcl/svapp.hxx> @@ -58,12 +58,12 @@ SvxTextEncodingBox::~SvxTextEncodingBox() //------------------------------------------------------------------------ -USHORT SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const +sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const { - USHORT nCount = GetEntryCount(); - for ( USHORT i=0; i<nCount; i++ ) + sal_uInt16 nCount = GetEntryCount(); + for ( sal_uInt16 i=0; i<nCount; i++ ) { - if ( nEnc == rtl_TextEncoding( (ULONG)GetEntryData(i) ) ) + if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) ) return i; } return LISTBOX_ENTRY_NOTFOUND; @@ -80,12 +80,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( sal_uInt32 nCount = m_pEncTable->Count(); for ( sal_uInt32 j=0; j<nCount; j++ ) { - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) ); if ( nExcludeInfoFlags ) { if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = FALSE; + bInsert = sal_False; else { if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) @@ -93,10 +93,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && ((nEnc == RTL_TEXTENCODING_UCS2) || nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = FALSE; // InfoFlags don't work for Unicode :-( + bInsert = sal_False; // InfoFlags don't work for Unicode :-( } else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) - bInsert = FALSE; + bInsert = sal_False; } } if ( bInsert ) @@ -109,7 +109,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( case RTL_TEXTENCODING_GB_2312 : case RTL_TEXTENCODING_GBK : case RTL_TEXTENCODING_MS_936 : - bInsert = FALSE; + bInsert = sal_False; break; } } @@ -130,14 +130,14 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( svxform::ODataAccessCharsetHelper aCSH; ::std::vector< rtl_TextEncoding > aEncs; sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs ); - for ( USHORT j=0; j<nCount; j++ ) + for ( sal_uInt16 j=0; j<nCount; j++ ) { - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] ); if ( nExcludeInfoFlags ) { if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = FALSE; + bInsert = sal_False; else { if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) @@ -145,10 +145,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && ((nEnc == RTL_TEXTENCODING_UCS2) || nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = FALSE; // InfoFlags don't work for Unicode :-( + bInsert = sal_False; // InfoFlags don't work for Unicode :-( } else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) - bInsert = FALSE; + bInsert = sal_False; } } if ( bInsert ) @@ -161,7 +161,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( case RTL_TEXTENCODING_GB_2312 : case RTL_TEXTENCODING_GBK : case RTL_TEXTENCODING_MS_936 : - bInsert = FALSE; + bInsert = sal_False; break; } } @@ -186,15 +186,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() //------------------------------------------------------------------------ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, - const String& rEntry, USHORT nPos ) + const String& rEntry, sal_uInt16 nPos ) { - USHORT nAt = InsertEntry( rEntry, nPos ); - SetEntryData( nAt, (void*)(ULONG)nEnc ); + sal_uInt16 nAt = InsertEntry( rEntry, nPos ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc ); } //------------------------------------------------------------------------ -void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos ) +void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos ) { const String& rEntry = m_pEncTable->GetTextString( nEnc ); if ( rEntry.Len() ) @@ -213,7 +213,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc ) { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) RemoveEntry( nAt ); @@ -223,19 +223,19 @@ void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc ) rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { - USHORT nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return rtl_TextEncoding( (ULONG)GetEntryData(nPos) ); + return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) ); else return RTL_TEXTENCODING_DONTKNOW; } //------------------------------------------------------------------------ -void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL bSelect ) +void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect ) { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) SelectEntryPos( nAt, bSelect ); @@ -243,14 +243,14 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL b //------------------------------------------------------------------------ -BOOL SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const +sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nAt ); else - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index ad212ecb2006..f390b46edf24 100644..100755 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -31,7 +31,7 @@ #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE #include <svx/dialmgr.hxx> -#include "txenctab.hxx" +#include "svx/txenctab.hxx" #include <tools/shl.hxx> //------------------------------------------------------------------------ diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src index b90b5fb9a94c..b90b5fb9a94c 100644..100755 --- a/svx/source/dialog/txenctab.src +++ b/svx/source/dialog/txenctab.src diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 3379d52ddac2..1ba6f31b2b1c 100644..100755 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "wrapfield.hxx" +#include "svx/wrapfield.hxx" namespace svx { |