summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-19 12:47:44 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-19 12:47:44 +0200
commit941020379b1ea1ec7c564c21e68ea1674cda7683 (patch)
tree40fcaf109d6d585bcdc0faf7ea6c0812b3cc9a39 /svtools
parent0692507dcc62e94c7af88388961db1d7d12d6dbd (diff)
parent0d2916e03ea51529e15995830a1a8c36bd72e442 (diff)
Merge branch 'master' into feature/gnumake4
Conflicts: basebmp/prj/d.lst basebmp/test/basictest.cxx basebmp/test/makefile.mk basegfx/inc/basegfx/basegfxdllapi.h basegfx/inc/basegfx/tools/debugplotter.hxx basegfx/inc/basegfx/tuple/b2ituple.hxx basegfx/prj/d.lst basegfx/source/numeric/makefile.mk basegfx/source/polygon/makefile.mk basegfx/source/range/makefile.mk basegfx/source/raster/makefile.mk basegfx/source/tuple/makefile.mk basegfx/source/vector/makefile.mk basegfx/test/basegfx1d.cxx basegfx/test/makefile.mk basegfx/util/makefile.mk canvas/Library_canvasfactory.mk canvas/Module_canvas.mk canvas/prj/build.lst canvas/prj/d.lst canvas/source/cairo/cairo_canvashelper_texturefill.cxx canvas/source/cairo/makefile.mk canvas/source/tools/makefile.mk comphelper/qa/string/makefile.mk cppcanvas/Module_cppcanvas.mk cppcanvas/inc/cppcanvas/cppcanvasdllapi.h cppcanvas/prj/build.lst cppcanvas/prj/d.lst cppcanvas/source/mtfrenderer/makefile.mk cppcanvas/util/makefile.mk i18npool/source/search/makefile.mk regexp/Library_regexp.mk regexp/prj/d.lst sax/CppunitTest_sax.mk sax/Library_sax.mk sax/prj/d.lst sax/qa/cppunit/test_converter.cxx sax/source/expatwrap/attrlistimpl.hxx sax/util/makefile.mk svtools/Library_svt.mk tools/Executable_sspretty.mk ucbhelper/prj/d.lst ucbhelper/source/provider/configureucb.cxx ucbhelper/source/provider/provconf.cxx ucbhelper/util/makefile.mk unotools/Library_utl.mk unotools/Module_unotools.mk unotools/Package_inc.mk unotools/prj/build.lst vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gtk.mk vcl/aqua/source/gdi/salprn.cxx vcl/inc/aqua/saldata.hxx vcl/unx/generic/gdi/salgdi3.cxx
Diffstat (limited to 'svtools')
-rw-r--r--svtools/AllLangResTarget_productregistration.mk3
-rw-r--r--svtools/AllLangResTarget_svt.mk7
-rw-r--r--svtools/Executable_bmp.mk10
-rw-r--r--svtools/Executable_bmpsum.mk8
-rw-r--r--svtools/Executable_g2g.mk8
-rw-r--r--[-rwxr-xr-x]svtools/JunitTest_svtools_unoapi.mk6
-rw-r--r--svtools/Library_hatchwindowfactory.mk4
-rw-r--r--svtools/Library_productregistration.mk5
-rw-r--r--svtools/Library_svt.mk15
-rw-r--r--svtools/Package_inc.mk5
-rw-r--r--svtools/bmpmaker/bmp.cxx9
-rw-r--r--svtools/bmpmaker/bmpcore.cxx5
-rw-r--r--svtools/bmpmaker/bmpcore.hxx3
-rw-r--r--svtools/bmpmaker/bmpsum.cxx40
-rw-r--r--svtools/bmpmaker/g2g.cxx9
-rw-r--r--svtools/inc/bindablecontrolhelper.hxx61
-rw-r--r--svtools/inc/pch/precompiled_svtools.cxx2
-rw-r--r--svtools/inc/pch/precompiled_svtools.hxx20
-rw-r--r--svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx2
-rw-r--r--svtools/inc/svtools/DocumentInfoPreview.hxx2
-rw-r--r--svtools/inc/svtools/FilterConfigItem.hxx2
-rw-r--r--svtools/inc/svtools/QueryFolderName.hxx4
-rw-r--r--svtools/inc/svtools/acceleratorexecute.hxx15
-rw-r--r--svtools/inc/svtools/accessibilityoptions.hxx2
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/accessiblefactory.hxx3
-rw-r--r--svtools/inc/svtools/accessibletable.hxx2
-rw-r--r--svtools/inc/svtools/accessibletableprovider.hxx2
-rw-r--r--svtools/inc/svtools/addresstemplate.hxx4
-rw-r--r--svtools/inc/svtools/apearcfg.hxx12
-rw-r--r--svtools/inc/svtools/asynclink.hxx11
-rw-r--r--svtools/inc/svtools/borderhelper.hxx (renamed from svtools/source/dialogs/colrdlg.hrc)57
-rw-r--r--svtools/inc/svtools/brwbox.hxx14
-rw-r--r--svtools/inc/svtools/brwhead.hxx2
-rw-r--r--svtools/inc/svtools/calendar.hxx9
-rw-r--r--svtools/inc/svtools/chartprettypainter.hxx6
-rw-r--r--svtools/inc/svtools/cliplistener.hxx2
-rw-r--r--svtools/inc/svtools/colctrl.hxx202
-rw-r--r--svtools/inc/svtools/collatorres.hxx2
-rw-r--r--svtools/inc/svtools/colorcfg.hxx9
-rw-r--r--svtools/inc/svtools/colrdlg.hxx81
-rw-r--r--svtools/inc/svtools/contextmenuhelper.hxx5
-rw-r--r--svtools/inc/svtools/ctrlbox.hxx171
-rw-r--r--svtools/inc/svtools/ctrltool.hxx18
-rw-r--r--svtools/inc/svtools/dialogclosedlistener.hxx2
-rw-r--r--svtools/inc/svtools/dialogcontrolling.hxx2
-rw-r--r--svtools/inc/svtools/editbrowsebox.hxx5
-rw-r--r--svtools/inc/svtools/editimplementation.hxx2
-rw-r--r--svtools/inc/svtools/editsyntaxhighlighter.hxx3
-rw-r--r--svtools/inc/svtools/ehdl.hxx6
-rw-r--r--svtools/inc/svtools/embedhlp.hxx6
-rw-r--r--svtools/inc/svtools/embedtransfer.hxx2
-rw-r--r--svtools/inc/svtools/expander.hxx3
-rw-r--r--svtools/inc/svtools/extcolorcfg.hxx8
-rw-r--r--svtools/inc/svtools/extensionlistbox.hxx2
-rw-r--r--svtools/inc/svtools/filechangedchecker.hxx54
-rw-r--r--svtools/inc/svtools/filectrl.hxx4
-rw-r--r--svtools/inc/svtools/filedlg.hxx5
-rw-r--r--svtools/inc/svtools/fileurlbox.hxx2
-rw-r--r--svtools/inc/svtools/fileview.hxx8
-rw-r--r--svtools/inc/svtools/filter.hxx13
-rw-r--r--svtools/inc/svtools/filterutils.hxx25
-rw-r--r--svtools/inc/svtools/fixedhyper.hxx2
-rw-r--r--svtools/inc/svtools/fltcall.hxx3
-rw-r--r--svtools/inc/svtools/fltdefs.hxx15
-rw-r--r--svtools/inc/svtools/fmtfield.hxx2
-rw-r--r--svtools/inc/svtools/fontsubstconfig.hxx2
-rw-r--r--svtools/inc/svtools/framestatuslistener.hxx10
-rw-r--r--svtools/inc/svtools/generictoolboxcontroller.hxx3
-rw-r--r--svtools/inc/svtools/genericunodialog.hxx2
-rw-r--r--svtools/inc/svtools/grfmgr.hxx3
-rw-r--r--svtools/inc/svtools/headbar.hxx6
-rw-r--r--svtools/inc/svtools/helpagentwindow.hxx2
-rw-r--r--svtools/inc/svtools/helpopt.hxx2
-rw-r--r--svtools/inc/svtools/htmlcfg.hxx8
-rw-r--r--svtools/inc/svtools/htmlkywd.hxx3
-rw-r--r--svtools/inc/svtools/htmlout.hxx4
-rw-r--r--svtools/inc/svtools/htmltokn.h7
-rw-r--r--svtools/inc/svtools/hyperlabel.hxx2
-rw-r--r--svtools/inc/svtools/imagemgr.hrc29
-rw-r--r--svtools/inc/svtools/imagemgr.hxx13
-rw-r--r--svtools/inc/svtools/imageresourceaccess.hxx2
-rw-r--r--svtools/inc/svtools/imap.hxx6
-rw-r--r--svtools/inc/svtools/imapcirc.hxx3
-rw-r--r--svtools/inc/svtools/imapobj.hxx2
-rw-r--r--svtools/inc/svtools/imappoly.hxx3
-rw-r--r--svtools/inc/svtools/imaprect.hxx3
-rw-r--r--svtools/inc/svtools/imgdef.hxx2
-rw-r--r--svtools/inc/svtools/indexentryres.hxx2
-rw-r--r--svtools/inc/svtools/inetimg.hxx2
-rw-r--r--svtools/inc/svtools/inettbc.hxx4
-rw-r--r--svtools/inc/svtools/insdlg.hxx22
-rw-r--r--svtools/inc/svtools/itemdel.hxx2
-rw-r--r--svtools/inc/svtools/ivctrl.hxx22
-rw-r--r--svtools/inc/svtools/javacontext.hxx8
-rw-r--r--svtools/inc/svtools/javainteractionhandler.hxx6
-rw-r--r--svtools/inc/svtools/langhelp.hxx44
-rw-r--r--svtools/inc/svtools/langtab.hxx2
-rw-r--r--svtools/inc/svtools/localresaccess.hxx2
-rw-r--r--svtools/inc/svtools/menuoptions.hxx3
-rw-r--r--svtools/inc/svtools/miscopt.hxx19
-rw-r--r--svtools/inc/svtools/optionsdrawinglayer.hxx3
-rw-r--r--svtools/inc/svtools/parhtml.hxx5
-rw-r--r--svtools/inc/svtools/parrtf.hxx3
-rw-r--r--svtools/inc/svtools/popupmenucontrollerbase.hxx3
-rw-r--r--svtools/inc/svtools/popupwindowcontroller.hxx3
-rw-r--r--svtools/inc/svtools/prgsbar.hxx3
-rw-r--r--svtools/inc/svtools/printoptions.hxx3
-rw-r--r--svtools/inc/svtools/prnsetup.hxx15
-rw-r--r--svtools/inc/svtools/roadmap.hxx4
-rw-r--r--svtools/inc/svtools/roadmapwizard.hxx5
-rw-r--r--svtools/inc/svtools/rtfkeywd.hxx8
-rw-r--r--svtools/inc/svtools/rtfout.hxx6
-rw-r--r--svtools/inc/svtools/rtftoken.h7
-rw-r--r--svtools/inc/svtools/ruler.hxx329
-rw-r--r--svtools/inc/svtools/scriptedtext.hxx2
-rw-r--r--svtools/inc/svtools/scrwin.hxx5
-rw-r--r--svtools/inc/svtools/sfxecode.hxx2
-rw-r--r--svtools/inc/svtools/soerr.hxx2
-rw-r--r--svtools/inc/svtools/sores.hxx3
-rw-r--r--svtools/inc/svtools/statusbarcontroller.hxx10
-rw-r--r--svtools/inc/svtools/stdctrl.hxx6
-rw-r--r--svtools/inc/svtools/stdmenu.hxx5
-rw-r--r--svtools/inc/svtools/stringtransfer.hxx2
-rw-r--r--svtools/inc/svtools/svicnvw.hxx49
-rw-r--r--svtools/inc/svtools/svlbitm.hxx43
-rw-r--r--svtools/inc/svtools/svlbox.hxx19
-rw-r--r--svtools/inc/svtools/svmedit.hxx3
-rw-r--r--svtools/inc/svtools/svmedit2.hxx2
-rw-r--r--svtools/inc/svtools/svparser.hxx5
-rw-r--r--svtools/inc/svtools/svtabbx.hxx4
-rw-r--r--svtools/inc/svtools/svtdata.hxx2
-rw-r--r--svtools/inc/svtools/svtdllapi.h2
-rw-r--r--svtools/inc/svtools/svtools.hrc46
-rw-r--r--svtools/inc/svtools/svtreebx.hxx48
-rw-r--r--svtools/inc/svtools/svxbox.hxx2
-rw-r--r--svtools/inc/svtools/sychconv.hxx3
-rw-r--r--svtools/inc/svtools/syntaxhighlight.hxx8
-rw-r--r--svtools/inc/svtools/tabbar.hxx22
-rw-r--r--svtools/inc/svtools/table/defaultinputhandler.hxx3
-rw-r--r--svtools/inc/svtools/table/gridtablerenderer.hxx3
-rw-r--r--svtools/inc/svtools/table/tablecontrol.hxx3
-rw-r--r--svtools/inc/svtools/table/tableinputhandler.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/table/tablemodel.hxx3
-rw-r--r--svtools/inc/svtools/table/tablerenderer.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/table/tablesort.hxx0
-rw-r--r--svtools/inc/svtools/table/tabletypes.hxx3
-rw-r--r--svtools/inc/svtools/taskbar.hxx49
-rw-r--r--svtools/inc/svtools/templatefoldercache.hxx3
-rw-r--r--svtools/inc/svtools/templdlg.hxx2
-rw-r--r--svtools/inc/svtools/testtool.hxx3
-rw-r--r--svtools/inc/svtools/textdata.hxx3
-rw-r--r--svtools/inc/svtools/texteng.hxx4
-rw-r--r--svtools/inc/svtools/textview.hxx5
-rw-r--r--svtools/inc/svtools/textwindowpeer.hxx3
-rw-r--r--svtools/inc/svtools/toolbarmenu.hxx3
-rw-r--r--svtools/inc/svtools/toolboxcontroller.hxx12
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/decklayouter.hxx3
-rw-r--r--svtools/inc/svtools/toolpanel/drawerlayouter.hxx3
-rw-r--r--svtools/inc/svtools/toolpanel/paneltabbar.hxx2
-rw-r--r--svtools/inc/svtools/toolpanel/refbase.hxx3
-rw-r--r--svtools/inc/svtools/toolpanel/tabalignment.hxx3
-rw-r--r--svtools/inc/svtools/toolpanel/tabitemcontent.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/tablayouter.hxx3
-rw-r--r--svtools/inc/svtools/toolpanel/toolpanel.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/toolpaneldeck.hxx3
-rw-r--r--svtools/inc/svtools/tooltiplbox.hxx2
-rw-r--r--svtools/inc/svtools/transfer.hxx5
-rw-r--r--svtools/inc/svtools/treelist.hxx584
-rw-r--r--svtools/inc/svtools/ttprops.hxx2
-rw-r--r--svtools/inc/svtools/txtattr.hxx3
-rw-r--r--svtools/inc/svtools/txtcmp.hxx2
-rw-r--r--svtools/inc/svtools/unitconv.hxx49
-rw-r--r--svtools/inc/svtools/unoevent.hxx3
-rw-r--r--svtools/inc/svtools/unoimap.hxx3
-rw-r--r--svtools/inc/svtools/urlcontrol.hxx2
-rw-r--r--svtools/inc/svtools/valueset.hxx48
-rw-r--r--svtools/inc/svtools/wallitem.hxx4
-rw-r--r--svtools/inc/svtools/wizardmachine.hxx4
-rw-r--r--svtools/inc/svtools/wizdlg.hxx5
-rw-r--r--svtools/inc/svtools/wmf.hxx28
-rw-r--r--svtools/inc/svtools/xtextedt.hxx3
-rw-r--r--svtools/inc/svtools/xwindowitem.hxx5
-rw-r--r--svtools/prj/build.lst2
-rw-r--r--svtools/qa/unoapi/Test.java52
-rw-r--r--svtools/source/brwbox/brwbox1.cxx309
-rw-r--r--svtools/source/brwbox/brwbox2.cxx176
-rw-r--r--svtools/source/brwbox/brwbox3.cxx7
-rw-r--r--svtools/source/brwbox/brwhead.cxx5
-rw-r--r--svtools/source/brwbox/brwimpl.hxx5
-rw-r--r--svtools/source/brwbox/datwin.cxx65
-rw-r--r--svtools/source/brwbox/datwin.hxx54
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx26
-rw-r--r--svtools/source/brwbox/editbrowsebox.src28
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx4
-rw-r--r--svtools/source/brwbox/editbrowseboximpl.hxx3
-rw-r--r--svtools/source/config/accessibilityoptions.cxx19
-rw-r--r--svtools/source/config/apearcfg.cxx47
-rw-r--r--svtools/source/config/colorcfg.cxx94
-rw-r--r--svtools/source/config/extcolorcfg.cxx101
-rw-r--r--svtools/source/config/fontsubstconfig.cxx26
-rw-r--r--svtools/source/config/helpopt.cxx33
-rw-r--r--svtools/source/config/htmlcfg.cxx85
-rw-r--r--svtools/source/config/itemholder2.cxx7
-rw-r--r--svtools/source/config/itemholder2.hxx3
-rw-r--r--svtools/source/config/menuoptions.cxx83
-rw-r--r--svtools/source/config/miscopt.cxx313
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx33
-rw-r--r--svtools/source/config/printoptions.cxx21
-rw-r--r--svtools/source/config/test/test.cxx9
-rw-r--r--svtools/source/contnr/contentenumeration.cxx38
-rw-r--r--svtools/source/contnr/contentenumeration.hxx2
-rw-r--r--svtools/source/contnr/fileview.cxx139
-rw-r--r--svtools/source/contnr/fileview.src23
-rw-r--r--svtools/source/contnr/imivctl.hxx6
-rw-r--r--svtools/source/contnr/imivctl1.cxx53
-rw-r--r--svtools/source/contnr/imivctl2.cxx2
-rw-r--r--svtools/source/contnr/ivctrl.cxx43
-rw-r--r--svtools/source/contnr/svcontnr.src21
-rw-r--r--svtools/source/contnr/svicnvw.cxx52
-rw-r--r--svtools/source/contnr/svimpbox.cxx148
-rw-r--r--svtools/source/contnr/svimpicn.cxx80
-rw-r--r--svtools/source/contnr/svlbitm.cxx53
-rw-r--r--svtools/source/contnr/svlbox.cxx39
-rw-r--r--svtools/source/contnr/svtabbx.cxx14
-rw-r--r--svtools/source/contnr/svtreebx.cxx167
-rw-r--r--svtools/source/contnr/templwin.cxx122
-rw-r--r--svtools/source/contnr/templwin.hxx7
-rw-r--r--svtools/source/contnr/templwin.src123
-rw-r--r--svtools/source/contnr/tooltiplbox.cxx2
-rw-r--r--svtools/source/contnr/treelist.cxx349
-rw-r--r--[-rwxr-xr-x]svtools/source/control/asynclink.cxx7
-rw-r--r--[-rwxr-xr-x]svtools/source/control/calendar.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/calendar.src30
-rw-r--r--[-rwxr-xr-x]svtools/source/control/collatorres.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/ctrlbox.cxx1972
-rw-r--r--[-rwxr-xr-x]svtools/source/control/ctrlbox.src55
-rw-r--r--[-rwxr-xr-x]svtools/source/control/ctrltool.cxx82
-rw-r--r--[-rwxr-xr-x]svtools/source/control/ctrltool.src47
-rw-r--r--[-rwxr-xr-x]svtools/source/control/filectrl.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/filectrl.src3
-rw-r--r--[-rwxr-xr-x]svtools/source/control/filectrl2.cxx6
-rw-r--r--svtools/source/control/fileurlbox.cxx2
-rw-r--r--svtools/source/control/fixedhyper.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/fmtfield.cxx9
-rw-r--r--[-rwxr-xr-x]svtools/source/control/headbar.cxx182
-rw-r--r--svtools/source/control/hyperlabel.cxx6
-rw-r--r--[-rwxr-xr-x]svtools/source/control/indexentryres.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/inettbc.cxx32
-rw-r--r--[-rwxr-xr-x]svtools/source/control/prgsbar.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/roadmap.cxx8
-rw-r--r--[-rwxr-xr-x]svtools/source/control/ruler.cxx86
-rw-r--r--[-rwxr-xr-x]svtools/source/control/scriptedtext.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/scrwin.cxx10
-rw-r--r--[-rwxr-xr-x]svtools/source/control/stdctrl.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/control/stdmenu.cxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/control/svxbox.cxx12
-rw-r--r--[-rwxr-xr-x]svtools/source/control/tabbar.cxx908
-rw-r--r--[-rwxr-xr-x]svtools/source/control/taskbar.cxx4
-rw-r--r--[-rwxr-xr-x]svtools/source/control/taskbox.cxx69
-rw-r--r--[-rwxr-xr-x]svtools/source/control/taskmisc.cxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/control/taskstat.cxx73
-rw-r--r--svtools/source/control/toolbarmenu.cxx165
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx65
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx31
-rw-r--r--svtools/source/control/urlcontrol.cxx2
-rw-r--r--svtools/source/control/valueacc.cxx125
-rw-r--r--[-rwxr-xr-x]svtools/source/control/valueimp.hxx27
-rw-r--r--svtools/source/control/valueset.cxx280
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx16
-rw-r--r--svtools/source/dialogs/colctrl.cxx690
-rw-r--r--svtools/source/dialogs/colrdlg.cxx333
-rw-r--r--svtools/source/dialogs/colrdlg.src295
-rw-r--r--svtools/source/dialogs/filedlg.cxx3
-rw-r--r--svtools/source/dialogs/filedlg2.cxx149
-rw-r--r--svtools/source/dialogs/filedlg2.hxx34
-rw-r--r--svtools/source/dialogs/filedlg2.src38
-rw-r--r--svtools/source/dialogs/formats.src3
-rw-r--r--svtools/source/dialogs/insdlg.cxx57
-rw-r--r--svtools/source/dialogs/mcvmath.cxx18
-rw-r--r--svtools/source/dialogs/mcvmath.hxx3
-rw-r--r--svtools/source/dialogs/prnsetup.cxx8
-rw-r--r--svtools/source/dialogs/prnsetup.src35
-rw-r--r--svtools/source/dialogs/property.cxx157
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx7
-rw-r--r--svtools/source/dialogs/so3res.src10
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx11
-rw-r--r--svtools/source/dialogs/wizardmachine.src2
-rw-r--r--svtools/source/dialogs/wizdlg.cxx13
-rw-r--r--svtools/source/edit/editsyntaxhighlighter.cxx5
-rw-r--r--svtools/source/edit/svmedit.cxx8
-rw-r--r--svtools/source/edit/svmedit2.cxx2
-rw-r--r--svtools/source/edit/sychconv.cxx7
-rw-r--r--svtools/source/edit/syntaxhighlight.cxx3
-rw-r--r--svtools/source/edit/textdat2.hxx4
-rw-r--r--svtools/source/edit/textdata.cxx4
-rw-r--r--svtools/source/edit/textdoc.cxx385
-rw-r--r--svtools/source/edit/textdoc.hxx4
-rw-r--r--svtools/source/edit/texteng.cxx21
-rw-r--r--svtools/source/edit/textund2.hxx3
-rw-r--r--svtools/source/edit/textundo.cxx35
-rw-r--r--svtools/source/edit/textundo.hxx3
-rw-r--r--svtools/source/edit/textview.cxx37
-rw-r--r--svtools/source/edit/textwindowpeer.cxx3
-rw-r--r--svtools/source/edit/txtattr.cxx16
-rw-r--r--svtools/source/edit/xtextedt.cxx2
-rw-r--r--svtools/source/filter/FilterConfigCache.cxx21
-rw-r--r--svtools/source/filter/FilterConfigCache.hxx2
-rw-r--r--svtools/source/filter/FilterConfigItem.cxx18
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx6
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.hxx2
-rw-r--r--svtools/source/filter/exportdialog.cxx5
-rw-r--r--svtools/source/filter/exportdialog.hxx2
-rw-r--r--svtools/source/filter/filter.cxx90
-rw-r--r--svtools/source/filter/filter2.cxx5
-rw-r--r--svtools/source/filter/igif/decode.cxx3
-rw-r--r--svtools/source/filter/igif/decode.hxx5
-rw-r--r--svtools/source/filter/igif/gifread.cxx7
-rw-r--r--svtools/source/filter/ixbm/xbmread.cxx5
-rw-r--r--svtools/source/filter/ixpm/rgbtable.hxx3
-rw-r--r--svtools/source/filter/ixpm/xpmread.cxx7
-rw-r--r--svtools/source/filter/jpeg/jpeg.cxx3
-rw-r--r--svtools/source/filter/jpeg/jpeg.h3
-rw-r--r--svtools/source/filter/jpeg/jpegc.c3
-rw-r--r--svtools/source/filter/sgfbram.cxx57
-rw-r--r--svtools/source/filter/sgvmain.cxx64
-rw-r--r--svtools/source/filter/sgvspln.cxx42
-rw-r--r--svtools/source/filter/sgvtext.cxx14
-rw-r--r--svtools/source/filter/wmf/emfwr.cxx166
-rw-r--r--svtools/source/filter/wmf/emfwr.hxx9
-rw-r--r--svtools/source/filter/wmf/enhwmf.cxx199
-rw-r--r--svtools/source/filter/wmf/winmtf.cxx299
-rw-r--r--svtools/source/filter/wmf/winmtf.hxx149
-rw-r--r--svtools/source/filter/wmf/winwmf.cxx43
-rw-r--r--svtools/source/filter/wmf/wmf.cxx11
-rw-r--r--svtools/source/filter/wmf/wmfwr.cxx81
-rw-r--r--svtools/source/filter/wmf/wmfwr.hxx4
-rw-r--r--svtools/source/graphic/descriptor.cxx29
-rw-r--r--svtools/source/graphic/descriptor.hxx3
-rw-r--r--svtools/source/graphic/graphic.cxx29
-rw-r--r--svtools/source/graphic/graphic.hxx3
-rw-r--r--svtools/source/graphic/graphicunofactory.cxx3
-rw-r--r--svtools/source/graphic/grfattr.cxx3
-rw-r--r--svtools/source/graphic/grfcache.cxx36
-rw-r--r--svtools/source/graphic/grfcache.hxx4
-rw-r--r--svtools/source/graphic/grfmgr.cxx151
-rw-r--r--svtools/source/graphic/grfmgr2.cxx16
-rw-r--r--svtools/source/graphic/provider.cxx45
-rw-r--r--svtools/source/graphic/renderer.cxx29
-rw-r--r--svtools/source/graphic/transformer.cxx6
-rw-r--r--svtools/source/graphic/transformer.hxx3
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx6
-rw-r--r--svtools/source/hatchwindow/documentcloser.hxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindow.cxx11
-rw-r--r--svtools/source/hatchwindow/hatchwindow.hxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.cxx11
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.hxx4
-rw-r--r--svtools/source/hatchwindow/ipwin.cxx2
-rw-r--r--svtools/source/hatchwindow/ipwin.hxx2
-rw-r--r--svtools/source/inc/configitems/accessibilityoptions_const.hxx23
-rw-r--r--svtools/source/inc/gifread.hxx7
-rw-r--r--svtools/source/inc/gradwrap.hxx77
-rw-r--r--svtools/source/inc/iodlg.hrc2
-rw-r--r--svtools/source/inc/jpeg.hxx5
-rw-r--r--svtools/source/inc/msgrd.hxx3
-rw-r--r--svtools/source/inc/msgwr.hxx2
-rw-r--r--svtools/source/inc/property.hxx16
-rw-r--r--svtools/source/inc/provider.hxx3
-rw-r--r--svtools/source/inc/renderer.hxx3
-rw-r--r--svtools/source/inc/sgfbram.hxx3
-rw-r--r--svtools/source/inc/sgffilt.hxx3
-rw-r--r--svtools/source/inc/sgvmain.hxx2
-rw-r--r--svtools/source/inc/sgvspln.hxx7
-rw-r--r--svtools/source/inc/svimpbox.hxx104
-rw-r--r--svtools/source/inc/svimpicn.hxx6
-rw-r--r--svtools/source/inc/svtaccessiblefactory.hxx2
-rw-r--r--svtools/source/inc/unoiface.hxx3
-rw-r--r--svtools/source/inc/xbmread.hxx7
-rw-r--r--svtools/source/inc/xpmread.hxx5
-rw-r--r--svtools/source/java/javacontext.cxx11
-rw-r--r--svtools/source/java/javaerror.src4
-rw-r--r--svtools/source/java/javainteractionhandler.cxx27
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx79
-rw-r--r--svtools/source/misc/bindablecontrolhelper.cxx161
-rw-r--r--svtools/source/misc/chartprettypainter.cxx27
-rw-r--r--svtools/source/misc/cliplistener.cxx6
-rw-r--r--svtools/source/misc/dialogclosedlistener.cxx2
-rw-r--r--svtools/source/misc/dialogcontrolling.cxx2
-rw-r--r--svtools/source/misc/ehdl.cxx20
-rw-r--r--svtools/source/misc/embedhlp.cxx159
-rw-r--r--svtools/source/misc/embedtransfer.cxx6
-rw-r--r--svtools/source/misc/filechangedchecker.cxx115
-rw-r--r--svtools/source/misc/filterutils.cxx58
-rw-r--r--svtools/source/misc/helpagent.src5
-rw-r--r--svtools/source/misc/helpagentwindow.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx268
-rw-r--r--svtools/source/misc/imagemgr.src192
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx4
-rw-r--r--svtools/source/misc/imap.cxx3
-rw-r--r--svtools/source/misc/imap2.cxx6
-rw-r--r--svtools/source/misc/imap3.cxx2
-rw-r--r--svtools/source/misc/itemdel.cxx2
-rw-r--r--svtools/source/misc/langhelp.cxx47
-rw-r--r--[-rwxr-xr-x]svtools/source/misc/langtab.cxx5
-rw-r--r--svtools/source/misc/langtab.src11
-rw-r--r--svtools/source/misc/stringtransfer.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/misc/svtaccessiblefactory.cxx10
-rw-r--r--svtools/source/misc/svtdata.cxx3
-rw-r--r--svtools/source/misc/templatefoldercache.cxx78
-rw-r--r--svtools/source/misc/transfer.cxx153
-rw-r--r--svtools/source/misc/transfer2.cxx15
-rw-r--r--svtools/source/misc/undo.src3
-rw-r--r--svtools/source/misc/unitconv.cxx8
-rw-r--r--svtools/source/misc/wallitem.cxx2
-rw-r--r--svtools/source/misc/xwindowitem.cxx2
-rw-r--r--svtools/source/plugapp/testtool.src79
-rw-r--r--svtools/source/plugapp/ttprops.cxx2
-rw-r--r--svtools/source/productregistration/productregistration.cxx26
-rw-r--r--svtools/source/productregistration/productregistration.hxx2
-rw-r--r--svtools/source/productregistration/registrationdlg.cxx13
-rw-r--r--svtools/source/productregistration/registrationdlg.hxx5
-rw-r--r--svtools/source/productregistration/registrationdlg.src8
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx122
-rw-r--r--svtools/source/svhtml/htmlout.cxx4
-rw-r--r--svtools/source/svhtml/htmlsupp.cxx18
-rw-r--r--svtools/source/svhtml/parhtml.cxx443
-rw-r--r--svtools/source/svrtf/parrtf.cxx24
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx24
-rw-r--r--svtools/source/svrtf/rtfout.cxx7
-rw-r--r--svtools/source/svrtf/svparser.cxx4
-rw-r--r--[-rwxr-xr-x]svtools/source/table/cellvalueconversion.cxx0
-rw-r--r--[-rwxr-xr-x]svtools/source/table/cellvalueconversion.hxx0
-rw-r--r--svtools/source/table/defaultinputhandler.cxx3
-rw-r--r--svtools/source/table/gridtablerenderer.cxx2
-rw-r--r--[-rwxr-xr-x]svtools/source/table/mousefunction.cxx0
-rw-r--r--[-rwxr-xr-x]svtools/source/table/mousefunction.hxx0
-rw-r--r--svtools/source/table/tablecontrol.cxx9
-rw-r--r--[-rwxr-xr-x]svtools/source/table/tablecontrol_impl.cxx9
-rw-r--r--[-rwxr-xr-x]svtools/source/table/tablecontrol_impl.hxx3
-rw-r--r--svtools/source/table/tabledatawindow.cxx3
-rw-r--r--svtools/source/table/tabledatawindow.hxx5
-rw-r--r--svtools/source/table/tablegeometry.cxx3
-rw-r--r--svtools/source/table/tablegeometry.hxx3
-rw-r--r--svtools/source/toolpanel/drawerlayouter.cxx7
-rw-r--r--svtools/source/toolpanel/dummypanel.cxx3
-rw-r--r--svtools/source/toolpanel/dummypanel.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/paneldecklisteners.cxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/paneldecklisteners.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/paneltabbar.cxx22
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.cxx8
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.hxx3
-rw-r--r--svtools/source/toolpanel/refbase.cxx3
-rw-r--r--svtools/source/toolpanel/tabbargeometry.cxx3
-rw-r--r--svtools/source/toolpanel/tabbargeometry.hxx3
-rw-r--r--svtools/source/toolpanel/tabitemdescriptor.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/tablayouter.cxx5
-rw-r--r--svtools/source/toolpanel/toolpanel.cxx3
-rw-r--r--svtools/source/toolpanel/toolpanel.src10
-rw-r--r--svtools/source/toolpanel/toolpanelcollection.cxx3
-rw-r--r--svtools/source/toolpanel/toolpanelcollection.hxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/toolpaneldeck.cxx3
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/toolpaneldeckpeer.cxx8
-rw-r--r--[-rwxr-xr-x]svtools/source/toolpanel/toolpaneldeckpeer.hxx3
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.cxx18
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.hxx3
-rw-r--r--svtools/source/toolpanel/toolpaneldrawerpeer.cxx6
-rw-r--r--svtools/source/toolpanel/toolpaneldrawerpeer.hxx3
-rw-r--r--svtools/source/uno/addrtempuno.cxx8
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx30
-rw-r--r--svtools/source/uno/framestatuslistener.cxx25
-rw-r--r--svtools/source/uno/generictoolboxcontroller.cxx11
-rw-r--r--svtools/source/uno/genericunodialog.cxx18
-rw-r--r--svtools/source/uno/miscservices.cxx6
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx15
-rw-r--r--svtools/source/uno/popupwindowcontroller.cxx2
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx61
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx44
-rw-r--r--[-rwxr-xr-x]svtools/source/uno/svtxgridcontrol.hxx3
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx55
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx81
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx4
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx4
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx3
-rw-r--r--svtools/source/uno/unoevent.cxx4
-rw-r--r--[-rwxr-xr-x]svtools/source/uno/unogridcolumnfacade.cxx6
-rw-r--r--[-rwxr-xr-x]svtools/source/uno/unogridcolumnfacade.hxx0
-rw-r--r--svtools/source/uno/unoiface.cxx191
-rw-r--r--svtools/source/uno/unoimap.cxx35
-rw-r--r--svtools/source/uno/unowizard.hxx3
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx33
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx3
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.hxx3
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx5
-rw-r--r--svtools/source/uno/wizard/wizardshell.hxx3
-rw-r--r--svtools/source/urlobj/inetimg.cxx2
-rw-r--r--svtools/workben/browser.cxx810
-rw-r--r--svtools/workben/cui/loadlib.cxx6
-rw-r--r--svtools/workben/stest.cxx186
-rw-r--r--svtools/workben/svdem.cxx3
-rw-r--r--[-rwxr-xr-x]svtools/workben/toolpanel/toolpaneltest.cxx21
-rw-r--r--svtools/workben/treecontrol/treetest.cxx9
-rw-r--r--svtools/workben/unodialog/roadmapskeleton.cxx3
-rw-r--r--svtools/workben/unodialog/roadmapskeleton.hxx3
-rw-r--r--svtools/workben/unodialog/roadmapskeletonpages.cxx3
-rw-r--r--svtools/workben/unodialog/roadmapskeletonpages.hxx3
-rw-r--r--svtools/workben/unodialog/udlg_module.cxx2
-rw-r--r--svtools/workben/unodialog/udlg_module.hxx2
-rw-r--r--svtools/workben/unodialog/udlg_services.cxx3
-rw-r--r--svtools/workben/unodialog/unodialogsample.cxx3
-rw-r--r--svtools/workben/urange.cxx220
510 files changed, 8619 insertions, 10485 deletions
diff --git a/svtools/AllLangResTarget_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk
index e6f2fd093f07..888e342fad64 100644
--- a/svtools/AllLangResTarget_productregistration.mk
+++ b/svtools/AllLangResTarget_productregistration.mk
@@ -38,9 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration))
$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\
$$(INCLUDE) \
-I$(WORKDIR)/inc \
- -I$(SRCDIR)/svtools/source/inc \
- -I$(SRCDIR)/svtools/inc/ \
- -I$(SRCDIR)/svtools/inc/svtools \
))
$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 59088cb126c3..52bed245f66d 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/res))
$(eval $(call gb_SrsTarget_set_include,svt/res,\
$$(INCLUDE) \
-I$(WORKDIR)/inc \
- -I$(SRCDIR)/svtools/source/uno \
- -I$(SRCDIR)/svtools/source/inc \
- -I$(SRCDIR)/svtools/inc/ \
- -I$(SRCDIR)/svtools/inc/svtools \
+ -I$(realpath $(SRCDIR)/svtools/source/inc) \
))
$(eval $(call gb_SrsTarget_add_files,svt/res,\
@@ -54,7 +51,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/control/ctrltool.src \
svtools/source/control/filectrl.src \
svtools/source/dialogs/addresstemplate.src \
- svtools/source/dialogs/colrdlg.src \
svtools/source/dialogs/filedlg2.src \
svtools/source/dialogs/formats.src \
svtools/source/dialogs/prnsetup.src \
@@ -71,5 +67,4 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/toolpanel/toolpanel.src \
))
-
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 115665ed0d18..3b2fd2a1203c 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -32,19 +32,17 @@ $(eval $(call gb_Executable_set_include,bmp,\
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(OUTDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc \
- -I$(SRCDIR)/svtools/inc/svtools \
- -I$(SRCDIR)/svtools/source/inc \
- -I$(SRCDIR)/svtools/inc/pch \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
+ -I$(realpath $(SRCDIR)/svtools/source/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Executable_add_linked_libs,bmp,\
sal \
- stl \
tl \
vcl \
- vos3 \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 37fa508bdda2..492dabeb58f8 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -31,17 +31,15 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
-I$(OUTDIR)/inc/offuh/ \
- -I$(SRCDIR)/svtools/inc/ \
- -I$(SRCDIR)/svtools/inc/pch/ \
- -I$(SRCDIR)/svtools/inc/svtools/ \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
+ -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
))
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
sal \
- stl \
tl \
vcl \
- vos3 \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index d55b37abd565..c817cff43ccd 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -31,19 +31,17 @@ $(eval $(call gb_Executable_set_include,g2g,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
-I$(OUTDIR)/inc/offuh/ \
- -I$(SRCDIR)/svtools/inc/ \
- -I$(SRCDIR)/svtools/inc/pch/ \
- -I$(SRCDIR)/svtools/inc/svtools/ \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
+ -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
))
$(eval $(call gb_Executable_add_linked_libs,g2g,\
jvmfwk \
sal \
- stl \
svt \
tl \
vcl \
- vos3 \
$(gb_STDLIBS) \
))
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index 3f0ec67897b5..665adee8f172 100755..100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,svtools_unoapi,\
$(OUTDIR)/bin/jurt.jar \
))
-$(eval $(call gb_JunitTest_add_sourcefiles,svtools_unoapi,\
- svtools/qa/unoapi/Test \
-))
-
$(eval $(call gb_JunitTest_add_classes,svtools_unoapi,\
- org.openoffice.svtools.qa.unoapi.Test \
+ org.openoffice.test.UnoApiTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index b92313e446d7..96e8f10c3306 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -33,9 +33,9 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc/pch/ \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-I$(OUTDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 6e76b1d6c9db..726e5a3b664b 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -33,9 +33,9 @@ $(eval $(call gb_Library_set_include,productregistration,\
$$(SOLARINC) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc/pch/ \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-I$(OUTDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
cppu \
cppuhelper \
sal \
- stl \
svl \
tk \
tl \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a21f3594014f..98f112864ab6 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_Library_set_include,svt,\
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(OUTDIR)/inc/ \
- -I$(SRCDIR)/svtools/inc \
- -I$(SRCDIR)/svtools/inc/svtools \
- -I$(SRCDIR)/svtools/source/inc \
- -I$(SRCDIR)/svtools/inc/pch \
+ -I$(realpath $(SRCDIR)/svtools/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
+ -I$(realpath $(SRCDIR)/svtools/source/inc) \
+ -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-I$(OUTDIR)/inc/offuh \
))
@@ -58,16 +58,15 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
i18nisolang1 \
i18nutil \
jvmfwk \
+ salhelper \
sal \
sot \
- stl \
svl \
tk \
tl \
ucbhelper \
utl \
vcl \
- vos3 \
$(gb_STDLIBS) \
))
@@ -144,7 +143,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/valueacc \
svtools/source/control/valueset \
svtools/source/dialogs/addresstemplate \
- svtools/source/dialogs/colctrl \
svtools/source/dialogs/colrdlg \
svtools/source/dialogs/filedlg \
svtools/source/dialogs/filedlg2 \
@@ -209,6 +207,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/misc/ehdl \
svtools/source/misc/embedhlp \
svtools/source/misc/embedtransfer \
+ svtools/source/misc/filterutils \
+ svtools/source/misc/filechangedchecker \
svtools/source/misc/helpagentwindow \
svtools/source/misc/imagemgr \
svtools/source/misc/imageresourceaccess \
@@ -217,6 +217,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/misc/imap3 \
svtools/source/misc/itemdel \
svtools/source/misc/langtab \
+ svtools/source/misc/langhelp \
svtools/source/misc/stringtransfer \
svtools/source/misc/svtaccessiblefactory \
svtools/source/misc/svtdata \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 4162e8f53fea..39d2331641fc 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovide
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/borderhelper.hxx,svtools/borderhelper.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx))
@@ -68,6 +68,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/f
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filterutils.hxx,svtools/filterutils.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx))
@@ -103,6 +105,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/it
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langhelp.hxx,svtools/langhelp.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 43f285c1b422..dce36f039730 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#ifndef INCLUDED_RTL_MATH_HXX
#include <rtl/math.hxx>
-#endif
#include <math.h>
#include <stdio.h>
@@ -161,7 +160,7 @@ void BmpApp::Message( const String& rText, sal_uInt8 cExit )
ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
aText.Append( "\r\n" );
- fprintf( stderr, aText.GetBuffer() );
+ fprintf( stderr, "%s", aText.GetBuffer() );
}
// -----------------------------------------------------------------------------
@@ -171,7 +170,7 @@ void BmpApp::ShowUsage()
Message( String( RTL_CONSTASCII_USTRINGPARAM( "Usage:" ) ), EXIT_NOERROR );
Message( String( RTL_CONSTASCII_USTRINGPARAM( " bmp srs_inputfile output_dir lang_dir lang_num -i input_dir [-i input_dir ][-f err_file]" ) ), EXIT_NOERROR );
Message( String( RTL_CONSTASCII_USTRINGPARAM( "Options:" ) ), EXIT_NOERROR );
- Message( String( RTL_CONSTASCII_USTRINGPARAM( " -i ... name of directory to be searched for input files [multiple occurence is possible]" ) ), EXIT_NOERROR );
+ Message( String( RTL_CONSTASCII_USTRINGPARAM( " -i ... name of directory to be searched for input files [multiple occurrence is possible]" ) ), EXIT_NOERROR );
Message( String( RTL_CONSTASCII_USTRINGPARAM( " -f name of file, output should be written to" ) ), EXIT_NOERROR );
Message( String( RTL_CONSTASCII_USTRINGPARAM( "Examples:" ) ), EXIT_NOERROR );
Message( String( RTL_CONSTASCII_USTRINGPARAM( " bmp /home/test.srs /home/out enus 01 -i /home/res -f /home/out/bmp.err" ) ), EXIT_NOERROR );
@@ -246,3 +245,5 @@ int main( int nArgCount, char* ppArgs[] )
return aBmpApp.Start( aArgs );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index ed3ae80b2788..622cce494a71 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,7 +162,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
Message( aInfo );
// create bit vector to hold flags for valid bitmaps
- ::std::bit_vector aValidBmpBitVector( aNameVector.size(), false );
+ ::std::vector<bool, std::allocator<bool> > aValidBmpBitVector( aNameVector.size(), false );
BitmapEx aBmpEx;
for( sal_uInt32 n = 0; n < aNameVector.size(); n++ )
@@ -418,3 +419,5 @@ void BmpCreator::Create( const String& rSRSName,
delete pSRS;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx
index ee836cc4a5e5..4e0d08da7db6 100644
--- a/svtools/bmpmaker/bmpcore.hxx
+++ b/svtools/bmpmaker/bmpcore.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ public:
};
#endif // _BMPCORE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 0ac43ce57148..8d7d34240d94 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,6 @@ private:
sal_uInt32 cExitCode;
sal_Bool GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
- sal_Bool GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
void SetExitCode( sal_uInt8 cExit )
{
@@ -128,38 +128,6 @@ sal_Bool BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const S
// -----------------------------------------------------------------------
-sal_Bool BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
-{
- sal_Bool bRet = sal_False;
-
- for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
- {
- String aTestStr( '-' );
-
- for( int n = 0; ( n < 2 ) && !bRet; n++ )
- {
- aTestStr += rSwitch;
-
- if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
- {
- if( i < ( nCount - 1 ) )
- rParams.push_back( rArgs[ i + 1 ] );
- else
- rParams.push_back( String() );
-
- break;
- }
-
- if( 0 == n )
- aTestStr = '/';
- }
- }
-
- return( rParams.size() > 0 );
-}
-
-// -----------------------------------------------------------------------
-
void BmpSum::Message( const String& rText, sal_uInt8 nExitCode )
{
if( EXIT_NOERROR != nExitCode )
@@ -167,7 +135,7 @@ void BmpSum::Message( const String& rText, sal_uInt8 nExitCode )
ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
aText.Append( "\r\n" );
- fprintf( stderr, aText.GetBuffer() );
+ fprintf( stderr, "%s", aText.GetBuffer() );
}
// -----------------------------------------------------------------------------
@@ -223,7 +191,6 @@ sal_uInt64 BmpSum::GetCRC( const BitmapEx& rBmpEx )
AlphaMask aAlpha;
BitmapReadAccess* pAAcc = NULL;
sal_uInt64 nRet = 0;
- sal_uInt32 nCrc = 0;
if( rBmpEx.IsTransparent() )
{
@@ -234,6 +201,7 @@ sal_uInt64 BmpSum::GetCRC( const BitmapEx& rBmpEx )
if( pRAcc && pRAcc->Width() && pRAcc->Height() )
{
SVBT32 aBT32;
+ sal_uInt32 nCrc = 0;
for( long nY = 0; nY < pRAcc->Height(); ++nY )
{
@@ -506,3 +474,5 @@ int main( int nArgCount, char* ppArgs[] )
return aBmpSum.Start( aArgs );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 0a308cccda40..024700dc7cc7 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,7 +126,7 @@ void G2GApp::Message( const String& rText, sal_uInt8 nExitCode )
ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
aText.Append( "\r\n" );
- fprintf( stderr, aText.GetBuffer() );
+ fprintf( stderr, "%s", aText.GetBuffer() );
}
// -----------------------------------------------------------------------------
@@ -147,8 +148,7 @@ void G2GApp::ShowUsage()
int G2GApp::Start( const ::std::vector< String >& rArgs )
{
- int nCmdCount = rArgs.size();
- sal_uInt16 nCurCmd = 0;
+ size_t nCmdCount = rArgs.size();
cExitCode = EXIT_NOERROR;
@@ -156,6 +156,7 @@ int G2GApp::Start( const ::std::vector< String >& rArgs )
{
GraphicFilter aFilter( sal_False );
String aInFile, aOutFile, aFilterStr, aFilterPath, aTransColStr;
+ size_t nCurCmd = 0;
aInFile = rArgs[ nCurCmd++ ];
aOutFile = rArgs[ nCurCmd++ ];
@@ -249,3 +250,5 @@ int main( int nArgCount, char* ppArgs[] )
return aG2GApp.Start( aArgs );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/bindablecontrolhelper.hxx b/svtools/inc/bindablecontrolhelper.hxx
new file mode 100644
index 000000000000..e53af10eaa68
--- /dev/null
+++ b/svtools/inc/bindablecontrolhelper.hxx
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, 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 SVTOOLS_INC_BINDABLECONTROL_HXX
+#define SVTOOLS_INC_BINDABLECONTROL_HXX
+
+#include "svtools/svtdllapi.h"
+
+#include <com/sun/star/frame/XModel.hpp>
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+ //====================================================================
+ //= GraphicAccess
+ //====================================================================
+ /** helper class for obtaining streams (which also can be used with the ImageProducer)
+ from a resource
+ */
+ class BindableControlHelper
+ {
+ private:
+ BindableControlHelper(); // never implemented
+
+ public:
+ SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource );
+ };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVTOOLS_INC_BINDABLECONTROL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/pch/precompiled_svtools.cxx b/svtools/inc/pch/precompiled_svtools.cxx
index 03fc0b4bb41d..e19db906595e 100644
--- a/svtools/inc/pch/precompiled_svtools.cxx
+++ b/svtools/inc/pch/precompiled_svtools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_svtools.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx
index ebabe33af690..6ce70e0c5d0b 100644
--- a/svtools/inc/pch/precompiled_svtools.hxx
+++ b/svtools/inc/pch/precompiled_svtools.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -303,7 +304,7 @@
#include <algorithm>
#include <deque>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <limits>
#include <list>
@@ -352,7 +353,6 @@
#include <cppuhelper/weakref.hxx>
#include <osl/conditn.hxx>
-#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/endian.h>
#include <osl/file.h>
@@ -362,6 +362,7 @@
#include <osl/mutex.h>
#include <osl/mutex.hxx>
#include <osl/process.h>
+#include <osl/security.hxx>
#include <osl/thread.h>
#include <osl/thread.hxx>
@@ -384,6 +385,7 @@
#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <rtl/memory.h>
+#include <rtl/ref.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
#include <rtl/tencinfo.h>
@@ -394,8 +396,8 @@
#include <rtl/ustring.hxx>
#include <rtl/uuid.h>
-#include "unotools/configitem.hxx"
-#include "unotools/configmgr.hxx"
+#include <salhelper/simplereferenceobject.hxx>
+#include <salhelper/timer.hxx>
#include <sot/clsids.hxx>
@@ -423,15 +425,11 @@
#include <tools/mapunit.hxx>
#include <vcl/unohelp.hxx>
-#include <vos/mutex.hxx>
-#include <vos/process.hxx>
-#include <vos/ref.hxx>
-#include <vos/refernce.hxx>
-#include <vos/security.hxx>
-#include <vos/thread.hxx>
-#include <vos/timer.hxx>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
//---MARKER---
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx b/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
index fdca9a80af13..d17e7ef241cd 100644
--- a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
+++ b/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,4 @@ enum AccessibleBrowseBoxObjType
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx
index 92c9c72b36bc..0e4e9bf86230 100644
--- a/svtools/inc/svtools/DocumentInfoPreview.hxx
+++ b/svtools/inc/svtools/DocumentInfoPreview.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,4 @@ namespace svtools
#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx
index bdae8dabb1c3..06988af9704b 100644
--- a/svtools/inc/svtools/FilterConfigItem.hxx
+++ b/svtools/inc/svtools/FilterConfigItem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,4 @@ class SVT_DLLPUBLIC FilterConfigItem
#endif // _FILTER_CONFIG_ITEM_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx
index 971b4b26e13e..b9762717d3cd 100644
--- a/svtools/inc/svtools/QueryFolderName.hxx
+++ b/svtools/inc/svtools/QueryFolderName.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#define SVT_QUERYFOLDER_HXX
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/dialog.hxx>
@@ -64,3 +63,4 @@ public:
}
#endif // SVT_QUERYFOLDER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index b5e9f99d2c4b..ec2a69e1edfd 100644
--- a/svtools/inc/svtools/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,30 +39,18 @@
#define INCLUDED_VECTOR
#endif
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
#include <com/sun/star/util/XURLTransformer.hpp>
-#endif
#include <com/sun/star/util/URL.hpp>
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
#include <com/sun/star/awt/KeyEvent.hpp>
-#endif
#include <vcl/keycod.hxx>
#include <vcl/evntpost.hxx>
#include <osl/mutex.h>
@@ -285,3 +274,5 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
#undef css
#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 784f570825fb..2f964c5e2069 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ public:
#endif // #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
index 372af4fdca25..6fefb18a17a1 100755..100644
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,3 +187,5 @@ namespace svt
//........................................................................
#endif // SVTOOLS_ACCESSIBLE_FACTORY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index d7bd98481404..5afd1ff2d68e 100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,3 +184,4 @@ public:
#endif // _SVTOOLS_ACCESSIBLETABLE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index dba96768f8bf..3f16370a4bad 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,4 @@ public:
#endif // _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx
index bb4ee44647e9..d69a7652affd 100644
--- a/svtools/inc/svtools/addresstemplate.hxx
+++ b/svtools/inc/svtools/addresstemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/scrbar.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <unotools/configitem.hxx>
@@ -161,3 +160,4 @@ namespace svt
#endif // _SVT_ADDRESSTEMPLATE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx
index ef59e86df96c..c423f24c6c79 100644
--- a/svtools/inc/svtools/apearcfg.hxx
+++ b/svtools/inc/svtools/apearcfg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,6 @@
class Application;
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
typedef enum {
SnapToButton = 0,
SnapToMiddle,
@@ -55,12 +53,12 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
short nScaleFactor ;
short nSnapMode ;
short nMiddleMouse;
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
short nAAMinPixelHeight ;
#endif
sal_Bool bMenuMouseFollow ;
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
sal_Bool bFontAntialiasing ;
#endif
@@ -92,7 +90,7 @@ public:
void SetMenuMouseFollow(sal_Bool bSet) {bMenuMouseFollow = bSet; SetModified();}
sal_Bool IsMenuMouseFollow() const{return bMenuMouseFollow;}
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
void SetFontAntiAliasing( sal_Bool bSet ) { bFontAntialiasing = bSet; SetModified(); }
sal_Bool IsFontAntiAliasing() const { return bFontAntialiasing; }
@@ -105,3 +103,5 @@ public:
};
#endif // _OFA_APEARCFG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx
index d5aebd370966..6a2b07b9c9b6 100644
--- a/svtools/inc/svtools/asynclink.hxx
+++ b/svtools/inc/svtools/asynclink.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,14 +32,10 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
#include <tools/link.hxx>
+#include <osl/mutex.hxx>
class Timer;
-namespace vos
-{
- class OMutex;
-}
-
namespace svtools {
class SVT_DLLPUBLIC AsynchronLink
@@ -49,7 +46,7 @@ class SVT_DLLPUBLIC AsynchronLink
sal_Bool _bInCall;
sal_Bool* _pDeleted;
void* _pArg;
- vos::OMutex* _pMutex;
+ ::osl::Mutex* _pMutex;
DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* );
SVT_DLLPRIVATE void Call_Impl( void* pArg );
@@ -75,3 +72,5 @@ public:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/colrdlg.hrc b/svtools/inc/svtools/borderhelper.hxx
index b1e785bd2f17..de24369929f5 100644
--- a/svtools/source/dialogs/colrdlg.hrc
+++ b/svtools/inc/svtools/borderhelper.hxx
@@ -1,8 +1,9 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -24,46 +25,30 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define DLG_COLOR 996
-#define VAL_SET_COLOR 2
-#define BTN_1 1
-#define BTN_2 2
-#define BTN_3 3
-#define BTN_4 4
-#define FT_RGB 12
+#ifndef _BORDERHELPER_HXX
+#define _BORDERHELPER_HXX
-#define CTL_COLOR 1
+#include "svtools/svtdllapi.h"
-#define FT_RED 1
-#define NUM_RED 1
-#define FT_GREEN 2
-#define NUM_GREEN 2
-#define FT_BLUE 3
-#define NUM_BLUE 3
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <vcl/outdev.hxx>
+#include <vector>
-#define FT_CYAN 7
-#define NUM_CYAN 7
-#define FT_MAGENTA 8
-#define NUM_MAGENTA 8
-#define FT_YELLOW 9
-#define NUM_YELLOW 9
-#define FT_KEY 10
-#define NUM_KEY 10
+namespace svtools
+{
+ SVT_DLLPUBLIC basegfx::B2DPolyPolygon ApplyLineDashing( const basegfx::B2DPolygon& rPolygon,
+ sal_uInt16 nDashing, MapUnit eUnit );
-#define FT_HUE 4
-#define NUM_HUE 4
-#define FT_SATURATION 5
-#define NUM_SATURATION 5
-#define FT_LUMINANCE 6
-#define NUM_LUMINANCE 6
+ SVT_DLLPUBLIC void DrawLine( OutputDevice& rDev, const basegfx::B2DPoint& rBeg,
+ const basegfx::B2DPoint& rEnd, sal_uInt32 nWidth, sal_uInt16 nDashing );
-#define CTL_PREVIEW 3
-#define CTL_PREVIEW_OLD 4
+ SVT_DLLPUBLIC void DrawLine( OutputDevice& rDev, const Point& rBeg,
+ const Point& rEnd, sal_uInt32 nWidth, sal_uInt16 nDashing );
+}
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
+#endif
-//IAccessibility2 Implementation 2009-----
-#define STR_COLORDES 3001
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index fe17531b3c92..edfacfa77e00 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,6 +36,7 @@
#include <svtools/transfer.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
+#include <vector>
#ifndef INCLUDED_LIMITS_H
#include <limits.h>
@@ -47,11 +49,12 @@
#endif
class BrowserColumn;
-class BrowserColumns;
class BrowserDataWin;
class MultiSelection;
class BrowserHeader;
+typedef ::std::vector< BrowserColumn* > BrowserColumns;
+
namespace svt {
class BrowseBoxImpl;
class IAccessibleFactory;
@@ -225,7 +228,6 @@ public:
// whole class, which is planned for a long time :)
//
// sorry for the ranting. could not resist
-// 98483 - 11.04.2002 - fs@openoffice.org
class SVT_DLLPUBLIC BrowseBox
:public Control
@@ -240,10 +242,6 @@ class SVT_DLLPUBLIC BrowseBox
friend class BrowserDataWin;
friend class ::svt::BrowseBoxImpl;
-#ifdef DBG_MI
- friend void DoLog_Impl( const BrowseBox *pThis, const char *pWhat, const char *pWho );
-#endif
-
#ifdef DBG_UTIL
friend const char* BrowseBoxCheckInvariants( const void * pVoid );
#endif
@@ -309,7 +307,6 @@ class SVT_DLLPUBLIC BrowseBox
BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too)
private:
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode);
SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt );
SVT_DLLPRIVATE void ToggleSelection( sal_Bool bForce = sal_False );
@@ -369,7 +366,7 @@ protected:
@param nRow
nRow starts at 0
*/
- virtual sal_Bool SeekRow( long nRow ) = 0;
+ virtual sal_Bool SeekRow( long nRow ) = 0;
virtual void DrawCursor();
virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect );
virtual void PaintData( Window& rWin, const Rectangle& rRect );
@@ -875,3 +872,4 @@ inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/brwhead.hxx b/svtools/inc/svtools/brwhead.hxx
index 3ed431a09efe..ecd8d563f102 100644
--- a/svtools/inc/svtools/brwhead.hxx
+++ b/svtools/inc/svtools/brwhead.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 61e75705ba01..f07b100e5c03 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,17 +31,11 @@
#include "svtools/svtdllapi.h"
#include <unotools/calendarwrapper.hxx>
-#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP
#include <com/sun/star/i18n/Weekdays.hpp>
-#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class Table;
class MouseEvent;
@@ -499,3 +494,5 @@ protected:
};
#endif // _CALENDAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index 200951d5c5e8..23aacc6b7144 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,8 @@
#ifndef CHARTPRETTYPAINTER_HXX
#define CHARTPRETTYPAINTER_HXX
-#ifndef INCLUDED_SVTDLLAPI_H
#include "svtools/svtdllapi.h"
-#endif
-//#include <svtools/embedhlp.hxx>
#include <vcl/outdev.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -69,3 +67,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx
index 5051633bd6b6..6f9aee42c268 100644
--- a/svtools/inc/svtools/cliplistener.hxx
+++ b/svtools/inc/svtools/cliplistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/colctrl.hxx b/svtools/inc/svtools/colctrl.hxx
deleted file mode 100644
index 7841ce93952e..000000000000
--- a/svtools/inc/svtools/colctrl.hxx
+++ /dev/null
@@ -1,202 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_COLCTRL_HXX
-#define _SV_COLCTRL_HXX
-
-#include <tools/color.hxx>
-#include <vcl/ctrl.hxx>
-#include <svtools/valueset.hxx>
-
-// ----------------
-// - ColorControl -
-// ----------------
-
-class Bitmap;
-class BitmapReadAccess;
-class ColorHSB;
-
-class SvColorControl : public Control
-{
-private:
- Bitmap* mpBitmap;
- BitmapReadAccess* mpReadAccess;
- Color maColor;
- short mnLuminance;
- Point maPosition;
- Link maModifyHdl;
-
- void Initialize();
- void CreateBitmap();
- void ShowPosition( const Point& aPos );
-
-public:
- SvColorControl( Window* pParent, WinBits nStyle = 0 );
- SvColorControl( Window* pParent, const ResId& rResId );
- ~SvColorControl();
-
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
-// virtual void KeyInput( const KeyEvent& rKEvent );
- virtual void Paint( const Rectangle& rRect );
- virtual void Resize();
-// virtual void GetFocus();
-// virtual void LoseFocus();
-
- virtual void Modify();
-
- Color GetColor() const { return maColor; };
- void SetColor( const Color& rCol );
- void SetColor( const ColorHSB& rCol, sal_Bool bSetColor = sal_True );
-
- short GetLuminance() const { return mnLuminance; };
- void SetLuminance( short nLum );
-
- void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
- const Link& GetModifyHdl() const { return maModifyHdl; }
-
-};
-
-// -----------------------
-// - ColorPreviewControl -
-// -----------------------
-
-class ColorPreviewControl : public Control
-{
-private:
- Color maColor;
-
-public:
- ColorPreviewControl( Window* pParent, WinBits nStyle = 0 );
- ColorPreviewControl( Window* pParent, const ResId& rResId );
- ~ColorPreviewControl();
-
- virtual void Paint( const Rectangle& rRect );
-
- Color GetColor() const { return maColor; };
- void SetColor( const Color& rCol );
-};
-
-// -----------------------
-// - ColorMixingControl -
-// -----------------------
-
-enum CMCPosition { CMC_TOPLEFT, CMC_TOPRIGHT, CMC_BOTTOMLEFT, CMC_BOTTOMRIGHT, CMC_OTHER };
-
-class ColorMixingControl : public ValueSet
-{
-private:
- sal_uInt16 mnRows;
- sal_uInt16 mnColumns;
- Color maColor[4];
-
- void Initialize();
-
- Color CalcDifferenceColor( sal_uInt16 nCol1, sal_uInt16 nCol2, sal_uInt16 nSteps );
- void FillRow( sal_uInt16 nRow );
- void FillColumn( sal_uInt16 nColumn );
-
-public:
- ColorMixingControl( Window* pParent, WinBits nStyle = 0,
- sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 );
- ColorMixingControl( Window* pParent, const ResId& rResId,
- sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 );
- ~ColorMixingControl();
-
- sal_uInt16 GetRows() const { return mnRows; };
- void SetRows( sal_uInt16 nRows );
- sal_uInt16 GetColumns() const { return mnColumns; };
- void SetColumns( sal_uInt16 nColumns );
-
- using ValueSet::GetColor;
- Color GetColor( CMCPosition ePos ) const { return maColor[ ePos ]; };
- using ValueSet::SetColor;
- void SetColor( CMCPosition ePos, const Color& rCol );
-
- String GetRGBString( const Color& rColor );
- CMCPosition GetCMCPosition() const;
-};
-
-// ------------
-// - ColorHSB -
-// ------------
-
-class ColorHSB
-{
-private:
- sal_uInt16 mnHue; // Farbwinkel, 360 Grad
- sal_uInt16 mnSat; // Saturation, 100 %
- sal_uInt16 mnBri; // Brightness, 100 %
-
-public:
- ColorHSB()
- { mnHue=0; mnSat=0; mnBri=0; }
- ColorHSB( sal_uInt16 nH, sal_uInt16 nS, sal_uInt16 nB )
- { mnHue=nH; mnSat=nS; mnBri=nB; }
- ColorHSB( const Color& rColor );
-
- void SetHue( sal_uInt16 nH ) { mnHue=nH; }
- void SetSat( sal_uInt16 nS ) { mnSat=nS; }
- void SetBri( sal_uInt16 nB ) { mnBri=nB; }
- sal_uInt16 GetHue() const { return mnHue; }
- sal_uInt16 GetSat() const { return mnSat; }
- sal_uInt16 GetBri() const { return mnBri; }
- Color GetRGB() const;
-};
-
-// -------------
-// - ColorCMYK -
-// -------------
-
-class ColorCMYK
-{
-private:
- sal_uInt16 mnCyan;
- sal_uInt16 mnMagenta;
- sal_uInt16 mnYellow;
- sal_uInt16 mnKey;
-
-public:
- ColorCMYK()
- { mnCyan=0; mnMagenta=0; mnYellow=0; mnKey=100; }
- ColorCMYK( sal_uInt16 nC, sal_uInt16 nM, sal_uInt16 nY, sal_uInt16 nK )
- { mnCyan=nC; mnMagenta=nM; mnYellow=nY; mnKey=nK; }
- ColorCMYK( const Color& rColor );
-
- void SetCyan( sal_uInt16 nC ) { mnCyan=nC; }
- void SetMagenta( sal_uInt16 nM ) { mnMagenta=nM; }
- void SetYellow( sal_uInt16 nY ) { mnYellow=nY; }
- void SetKey( sal_uInt16 nK ) { mnKey=nK; }
- sal_uInt16 GetCyan() const { return mnCyan; }
- sal_uInt16 GetMagenta() const { return mnMagenta; }
- sal_uInt16 GetYellow() const { return mnYellow; }
- sal_uInt16 GetKey() const { return mnKey; }
- Color GetRGB() const;
-};
-
-#endif // _SV_COLCTRL_HXX
diff --git a/svtools/inc/svtools/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx
index 63b4e7ef64f3..467e8b7103f1 100644
--- a/svtools/inc/svtools/collatorres.hxx
+++ b/svtools/inc/svtools/collatorres.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef SVTOOLS_COLLATORRESSOURCE_HXX
#define SVTOOLS_COLLATORRESSOURCE_HXX
@@ -22,3 +23,4 @@ class SVT_DLLPUBLIC CollatorRessource
#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index ac78afe59034..09daa6aa75d2 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,6 +51,7 @@ enum ColorConfigEntry
ANCHOR ,
SPELL ,
SMARTTAGS ,
+ SHADOWCOLOR ,
WRITERTEXTGRID ,
WRITERFIELDSHADINGS ,
WRITERIDXSHADINGS ,
@@ -88,9 +90,7 @@ enum ColorConfigEntry
SQLCOMMENT,
ColorConfigEntryCount
};
-/* -----------------------------22.03.2002 15:36------------------------------
- ---------------------------------------------------------------------------*/
class ColorConfig_Impl;
struct ColorConfigValue
{
@@ -101,9 +101,7 @@ struct ColorConfigValue
sal_Bool operator !=(const ColorConfigValue& rCmp) const
{ return nColor != rCmp.nColor || bIsVisible != rCmp.bIsVisible;}
};
-/* -----------------------------22.03.2002 15:36------------------------------
- ---------------------------------------------------------------------------*/
class SVT_DLLPUBLIC ColorConfig:
public utl::detail::Options
{
@@ -119,9 +117,7 @@ public:
ColorConfigValue GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart = sal_True)const;
static Color GetDefaultColor(ColorConfigEntry eEntry);
};
-/* -----------------------------22.03.2002 15:31------------------------------
- ---------------------------------------------------------------------------*/
class SVT_DLLPUBLIC EditableColorConfig
{
ColorConfig_Impl* m_pImpl;
@@ -150,3 +146,4 @@ public:
}//namespace svtools
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index 00ec9647aa7a..09336e12d134 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,79 +30,39 @@
#define _SV_COLRDLG_HXX
#include "svtools/svtdllapi.h"
-#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/colctrl.hxx>
+
+#include <tools/color.hxx>
+
+class Window;
// ---------------
// - ColorDialog -
// ---------------
-class SVT_DLLPUBLIC SvColorDialog : public ModalDialog
+namespace svtools
{
-private:
- ColorMixingControl maColMixCtrl;
- PushButton maBtn1;
- PushButton maBtn2;
- //PushButton maBtn3;
- //PushButton maBtn4;
- //FixedText maFtRGB;
- SvColorControl maCtlColor;
-
- // CMYK controls.
- FixedText maFtCyan;
- MetricField maNumCyan;
- FixedText maFtMagenta;
- MetricField maNumMagenta;
- FixedText maFtYellow;
- MetricField maNumYellow;
- FixedText maFtKey;
- MetricField maNumKey;
-
- // RGB controls.
- FixedText maFtRed;
- NumericField maNumRed;
- FixedText maFtGreen;
- NumericField maNumGreen;
- FixedText maFtBlue;
- NumericField maNumBlue;
-
- // HSL controls.
- FixedText maFtHue;
- NumericField maNumHue;
- FixedText maFtSaturation;
- NumericField maNumSaturation;
- FixedText maFtLuminance;
- NumericField maNumLuminance;
-
- ColorPreviewControl maCtlPreview;
- ColorPreviewControl maCtlPreviewOld;
-
- OKButton maBtnOK;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
-
- Color maColor;
-
- SVT_DLLPRIVATE void Initialize();
-
- DECL_DLLPRIVATE_LINK( ColorModifyHdl, void * );
- DECL_DLLPRIVATE_LINK( ClickBtnHdl, void * );
- DECL_DLLPRIVATE_LINK( ClickMixCtrlHdl, void * );
- DECL_DLLPRIVATE_LINK( SelectMixCtrlHdl, void * );
+ // SELECT is the default
+ enum ColorPickerMode { ColorPickerMode_SELECT = 0, ColorPickerMode_ADD = 1, ColorPickerMode_MODIFY = 2 };
+}
+class SVT_DLLPUBLIC SvColorDialog
+{
public:
- SvColorDialog( Window* pParent );
- ~SvColorDialog();
+ SvColorDialog( ::Window* pParent );
void SetColor( const Color& rColor );
const Color& GetColor() const;
+ void SetMode( sal_Int16 eMode );
+
virtual short Execute();
+
+private:
+ Window* mpParent;
+ Color maColor;
+ sal_Int16 meMode;
};
#endif // _SV_COLRDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx
index 54d254309b1e..c6f30e2a3d4b 100644
--- a/svtools/inc/svtools/contextmenuhelper.hxx
+++ b/svtools/inc/svtools/contextmenuhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,7 +97,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
// methods to retrieve a single command URL dependent value from a
// ui configuratin manager
- Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const;
+ Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
// creates an association between current module/controller bound to the
@@ -128,3 +129,5 @@ class SVT_DLLPUBLIC ContextMenuHelper
} // namespace svt
#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 46e3a64d49f6..56c69e0d078b 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,29 +31,33 @@
#include "svtools/svtdllapi.h"
-#ifndef _LSTBOX_HXX
+#include <tools/string.hxx>
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX
#include <vcl/combobox.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
-class ImplFontList;
-class ImpColorList;
-class ImpLineList;
class FontList;
+class ImplColorListData;
+class ImpLineListData;
+class ImplFontNameListData;
+
+typedef ::std::vector< ImplColorListData* > ImpColorList;
+typedef ::std::vector< ImpLineListData* > ImpLineList;
+typedef ::std::vector< ImplFontNameListData* > ImplFontList;
+
+#define STYLE_SOLID ( ( sal_uInt16 ) 0 )
+#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
+#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+
+#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
+#define CHANGE_LINE2 ( ( sal_uInt16 ) 2 )
+#define CHANGE_DIST ( ( sal_uInt16 ) 4 )
+#define ADAPT_DIST ( ( sal_uInt16 ) 8 )
+
+
/*************************************************************************
@@ -245,9 +250,65 @@ inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const
// - LineListBox -
// ---------------
+/**
+ Class computing border widths shared between Line style listbox and the
+ SvxBorderLine implementation.
+
+ This class doesn't know anything about units: it all depends on the different
+ values set. A border is composed of 2 lines separated by a gap. The computed
+ widths are the ones of each line and the gap and they can either be fix or vary.
+
+ The #m_nflags member will define which widths will vary (value 0 means that all
+ widths are fixed). The available flags are:
+ - CHANGE_LINE1
+ - CHANGE_LINE2
+ - CHANGE_DIST
+
+ For each line, the rate member is used as a multiplication factor is the width
+ isn't fixed. Otherwise it is the width in the unit expected by the client code.
+ */
+class SVT_DLLPUBLIC BorderWidthImpl
+{
+ sal_uInt16 m_nFlags;
+ double m_nRate1;
+ double m_nRate2;
+ double m_nRateGap;
+
+public:
+
+ BorderWidthImpl( sal_uInt16 nFlags = CHANGE_LINE1, double nRate1 = 0.0,
+ double nRate2 = 0.0, double nRateGap = 0.0 );
+
+ BorderWidthImpl& operator= ( const BorderWidthImpl& r );
+ bool operator== ( const BorderWidthImpl& r ) const;
+
+ long GetLine1 ( long nWidth ) const;
+ long GetLine2( long nWidth ) const;
+ long GetGap( long nWidth ) const;
+
+ long GuessWidth( long nLine1, long nLine2, long nGap );
+
+ bool IsEmpty( ) const { return (0 == m_nRate1) && (0 == m_nRate2); }
+ bool IsDouble( ) const { return (0 != m_nRate1) && (0 != m_nRate2); }
+};
+
+SVT_DLLPUBLIC inline Color sameColor( Color rMain )
+{
+ return rMain;
+}
+
+SVT_DLLPUBLIC inline Color sameDistColor( Color /*rMain*/, Color rDefault )
+{
+ return rDefault;
+}
+
+
class SVT_DLLPUBLIC LineListBox : public ListBox
{
ImpLineList* pLineList;
+ long m_nWidth;
+ XubString m_sNone;
+
VirtualDevice aVirDev;
Size aTxtSize;
Color aColor;
@@ -255,39 +316,54 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
FieldUnit eUnit;
FieldUnit eSourceUnit;
- SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr );
+ SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance,
+ Color nColor1, Color nColor2, Color nColorDist,
+ sal_uInt16 nStyle, Bitmap& rBmp );
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
- void UpdateLineColors( void );
- sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed
- inline const Color& GetPaintColor( void ) const;
+ sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed
virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ void UpdateEntries( long nOldWidth );
+ sal_uInt16 GetStylePos( sal_uInt16 nListPos, long nWidth );
+
public:
LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER );
LineListBox( Window* pParent, const ResId& rResId );
virtual ~LineListBox();
+ /** Set the width in Twips */
+ void SetWidth( long nWidth );
+ void SetNone( const XubString& sNone );
+
using ListBox::InsertEntry;
virtual sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
- virtual sal_uInt16 InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, sal_uInt16 nPos = LISTBOX_APPEND );
+ /** Insert a listbox entry with all widths in Twips. */
+ void InsertEntry( BorderWidthImpl aWidthImpl,
+ sal_uInt16 nStyle, long nMinWidth = 0,
+ Color (*pColor1Fn)(Color) = &sameColor,
+ Color (*pColor2Fn)( Color ) = &sameColor,
+ Color (*pColorDistFn)( Color, Color ) = &sameDistColor );
+
using ListBox::RemoveEntry;
virtual void RemoveEntry( sal_uInt16 nPos );
virtual void Clear();
using ListBox::GetEntryPos;
- sal_uInt16 GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
+ virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = STYLE_SOLID ) const;
long GetEntryLine1( sal_uInt16 nPos ) const;
long GetEntryLine2( sal_uInt16 nPos ) const;
long GetEntryDistance( sal_uInt16 nPos ) const;
+ sal_uInt16 GetEntryStyle( sal_uInt16 nPos ) const;
- inline void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
- void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, sal_Bool bSelect = sal_True );
+ void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
+ void SelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool bSelect = sal_True );
long GetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const;
long GetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const;
long GetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const;
+ sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const;
inline sal_Bool IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); }
- sal_Bool IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const;
+ sal_Bool IsEntrySelected( sal_uInt16 nStyle1 = STYLE_SOLID ) const;
inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
inline FieldUnit GetUnit() const { return eUnit; }
@@ -297,6 +373,13 @@ public:
void SetColor( const Color& rColor );
inline Color GetColor( void ) const;
+protected:
+
+ inline const Color& GetPaintColor( void ) const;
+ Color GetColorLine1( sal_uInt16 nPos = 0 );
+ Color GetColorLine2( sal_uInt16 nPos = 0 );
+ Color GetColorDist( sal_uInt16 nPos = 0 );
+
private:
// declared as private because some compilers would generate the default methods
LineListBox( const LineListBox& );
@@ -305,13 +388,6 @@ private:
void* GetEntryData( sal_uInt16 nPos ) const;
};
-inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, sal_Bool bSelect )
-{
- sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance );
- if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- ListBox::SelectEntryPos( nPos, bSelect );
-}
-
inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const
{
sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
@@ -339,9 +415,9 @@ inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const
return 0;
}
-inline sal_Bool LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const
+inline sal_Bool LineListBox::IsEntrySelected( sal_uInt16 nStyle ) const
{
- sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance );
+ sal_uInt16 nPos = GetEntryPos( nStyle );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nPos );
else
@@ -352,7 +428,7 @@ inline void LineListBox::SetColor( const Color& rColor )
{
aColor = rColor;
- UpdateLineColors();
+ UpdateEntries( m_nWidth );
}
inline Color LineListBox::GetColor( void ) const
@@ -360,6 +436,22 @@ inline Color LineListBox::GetColor( void ) const
return aColor;
}
+const Color& LineListBox::GetPaintColor( void ) const
+{
+ return maPaintCol;
+}
+
+inline void LineListBox::SetWidth( long nWidth )
+{
+ long nOldWidth = m_nWidth;
+ m_nWidth = nWidth;
+ UpdateEntries( nOldWidth );
+}
+
+inline void LineListBox::SetNone( const XubString& sNone )
+{
+ m_sNone = sNone;
+}
// ---------------
// - FontNameBox -
@@ -372,8 +464,9 @@ private:
Image maImagePrinterFont;
Image maImageBitmapFont;
Image maImageScalableFont;
- sal_Bool mbWYSIWYG;
- sal_Bool mbSymbols;
+ sal_Bool mbWYSIWYG;
+ sal_Bool mbSymbols;
+ String maFontMRUEntriesFile;
#ifdef _CTRLBOX_CXX
SVT_DLLPRIVATE void ImplCalcUserItemSize();
@@ -383,6 +476,8 @@ private:
void InitBitmaps( void );
protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ void LoadMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' );
+ void SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' ) const;
public:
FontNameBox( Window* pParent,
WinBits nWinStyle = WB_SORT );
@@ -400,6 +495,8 @@ public:
sal_Bool IsSymbolsEnabled() const { return mbSymbols; }
private:
+ void InitFontMRUEntriesFile();
+
// declared as private because some compilers would generate the default functions
FontNameBox( const FontNameBox& );
FontNameBox& operator =( const FontNameBox& );
@@ -502,3 +599,5 @@ private:
};
#endif // _CTRLBOX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index 8444951a8623..e5df9eaa8852 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,15 +29,12 @@
#ifndef _CTRLTOOL_HXX
#define _CTRLTOOL_HXX
+#include <boost/ptr_container/ptr_vector.hpp>
+
#include "svtools/svtdllapi.h"
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
-#include <tools/list.hxx>
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
class ImplFontListNameInfo;
class OutputDevice;
@@ -153,7 +151,7 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden.
#define FONTLIST_FONTNAMETYPE_SCREEN ((sal_uInt16)0x0002)
#define FONTLIST_FONTNAMETYPE_SCALABLE ((sal_uInt16)0x0004)
-class SVT_DLLPUBLIC FontList : private List
+class SVT_DLLPUBLIC FontList
{
private:
XubString maMapBoth;
@@ -173,7 +171,7 @@ private:
long* mpSizeAry;
OutputDevice* mpDev;
OutputDevice* mpDev2;
-
+ boost::ptr_vector<ImplFontListNameInfo> maEntries;
#ifdef CTRLTOOL_CXX
SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uLong* pIndex ) const;
SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const;
@@ -209,7 +207,7 @@ public:
sal_Bool IsAvailable( const XubString& rName ) const;
sal_uInt16 GetFontNameCount() const
- { return (sal_uInt16)List::Count(); }
+ { return (sal_uInt16)maEntries.size(); }
const FontInfo& GetFontName( sal_uInt16 nFont ) const;
sal_uInt16 GetFontNameType( sal_uInt16 nFont ) const;
sal_Handle GetFirstFontInfo( const XubString& rName ) const;
@@ -232,7 +230,7 @@ private:
class SVT_DLLPUBLIC FontSizeNames
{
private:
- struct ImplFSNameItem* mpArray;
+ const struct ImplFSNameItem* mpArray;
sal_uLong mnElem;
public:
@@ -249,3 +247,5 @@ public:
};
#endif // _CTRLTOOL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx
index 3712d408af52..7b80ed6b449d 100644
--- a/svtools/inc/svtools/dialogclosedlistener.hxx
+++ b/svtools/inc/svtools/dialogclosedlistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,4 @@ namespace svt
#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx
index cd60736527f5..d0bb6646ba85 100644
--- a/svtools/inc/svtools/dialogcontrolling.hxx
+++ b/svtools/inc/svtools/dialogcontrolling.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -304,3 +305,4 @@ namespace svt
#endif // SVTOOLS_DIALOGCONTROLLING_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index 24a8baa8ac4b..d8c389215613 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _IMAGEBTN_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/brwbox.hxx>
#include <vcl/timer.hxx>
#include <svtools/brwhead.hxx>
@@ -115,7 +114,6 @@ namespace svt
// commit any current changes. Especially, do any reformatting you need (from input formatting
// to output formatting) here
- // 95826 - 2002-10-14 - fs@openoffice.org
virtual void CommitModifications();
// suspending the controller is not culmulative!
@@ -694,3 +692,4 @@ namespace svt
#undef SVTOOLS_IN_EDITBROWSEBOX_HXX
#endif // _SVTOOLS_EDITBROWSEBOX_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx
index fcdd140d78d6..e93ec6721e68 100644
--- a/svtools/inc/svtools/editimplementation.hxx
+++ b/svtools/inc/svtools/editimplementation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,4 @@ void GenericEditImplementation< EDIT >::SetModifyHdl( const Link& _rLink )
m_rEdit.SetModifyHdl( _rLink );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx
index aca298fd1d31..caba30f37e1f 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index 56255f48f2f2..3a572aa29d8f 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _EINF_HXX
#include <tools/errinf.hxx>
-#endif
class Window;
class ResMgr;
@@ -75,9 +74,7 @@ private:
ResMgr *pMgr;
ResMgr *pFreeMgr;
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, String &) const;
-//#endif
virtual sal_Bool CreateString(
const ErrorInfo *, String &, sal_uInt16 &) const;
};
@@ -86,3 +83,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index 46169d645c91..abae6318de69 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,9 +110,6 @@ namespace svt
// no conversion is done if no target mode is provided
Size GetSize( MapMode* pTargetMapMode = NULL ) const;
- // the following method tries to get the HC graphic if it is possible, otherwise returns NULL
- Graphic* GetHCGraphic() const;
-
void SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType );
void SetGraphicStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream,
@@ -138,3 +136,5 @@ namespace svt
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/embedtransfer.hxx b/svtools/inc/svtools/embedtransfer.hxx
index 6b3896ceb1aa..7c82a7302b84 100644
--- a/svtools/inc/svtools/embedtransfer.hxx
+++ b/svtools/inc/svtools/embedtransfer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/expander.hxx b/svtools/inc/svtools/expander.hxx
index ec53a515c989..da998d50d332 100644
--- a/svtools/inc/svtools/expander.hxx
+++ b/svtools/inc/svtools/expander.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx
index 44167f63287c..11d551cd88e6 100644
--- a/svtools/inc/svtools/extcolorcfg.hxx
+++ b/svtools/inc/svtools/extcolorcfg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
//-----------------------------------------------------------------------------
namespace svtools{
-/* -----------------------------22.03.2002 15:36------------------------------
- ---------------------------------------------------------------------------*/
class ExtendedColorConfig_Impl;
class ExtendedColorConfigValue
{
@@ -68,9 +67,7 @@ public:
sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const
{ return m_nColor != rCmp.m_nColor;}
};
-/* -----------------------------22.03.2002 15:36------------------------------
- ---------------------------------------------------------------------------*/
class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener
{
friend class ExtendedColorConfig_Impl;
@@ -90,9 +87,7 @@ public:
sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const;
ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const;
};
-/* -----------------------------22.03.2002 15:31------------------------------
- ---------------------------------------------------------------------------*/
class SVT_DLLPUBLIC EditableExtendedColorConfig
{
ExtendedColorConfig_Impl* m_pImpl;
@@ -126,3 +121,4 @@ public:
}//namespace svtools
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/extensionlistbox.hxx b/svtools/inc/svtools/extensionlistbox.hxx
index 532d3822c555..a4b2d68198db 100644
--- a/svtools/inc/svtools/extensionlistbox.hxx
+++ b/svtools/inc/svtools/extensionlistbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,4 @@ public:
#endif // _SVTOOLS_EXTENSIONLISTBOX_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filechangedchecker.hxx b/svtools/inc/svtools/filechangedchecker.hxx
new file mode 100644
index 000000000000..fe5fd689c27c
--- /dev/null
+++ b/svtools/inc/svtools/filechangedchecker.hxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * [ Surendran Mahendran <surenspost@gmail.com>]
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef SVTOOLS_INCLUDED_FILECHANGEDCHECKER_HXX
+#define SVTOOLS_INCLUDED_FILECHANGEDCHECKER_HXX
+
+#include "svtools/svtdllapi.h"
+#include <boost/function.hpp>
+#include <osl/file.hxx>
+#include <vcl/timer.hxx>
+
+/** Periodically checks if a file has been modified
+
+ Instances of this class setup a vcl timer to occasionally wake up
+ check whether file modification time has changed.
+ */
+class SVT_DLLPUBLIC FileChangedChecker
+{
+private :
+ Timer mTimer;
+ rtl::OUString mFileName;
+ TimeValue mLastModTime;
+ ::boost::function0<void> mpCallback;
+
+ bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
+ DECL_LINK(TimerHandler, Timer *);
+
+public :
+ void resetTimer();
+ bool hasFileChanged();
+ FileChangedChecker(const rtl::OUString& rFilename, const ::boost::function0<void>& rCallback);
+};
+
+#endif
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index 97475c8b38ca..40eace698501 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "svtools/svtdllapi.h"
#include <vcl/window.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?!
@@ -109,3 +108,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index 59fd393ea73c..1e31ddc7a6a6 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class Edit;
class ImpSvFileDlg;
@@ -106,3 +105,5 @@ public:
};
#endif // _FILEDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fileurlbox.hxx b/svtools/inc/svtools/fileurlbox.hxx
index 6d2f6e2b9041..570c2cb82a2a 100644
--- a/svtools/inc/svtools/fileurlbox.hxx
+++ b/svtools/inc/svtools/fileurlbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,4 @@ namespace svt
#endif // SVTOOLS_FILEURLBOX_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index a88009ffa7c3..a1a539224b81 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/image.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <rtl/ustring.hxx>
@@ -48,6 +47,7 @@
#define FILEVIEW_SHOW_SIZE 0x0020
#define FILEVIEW_SHOW_DATE 0x0040
#define FILEVIEW_SHOW_ALL 0x0070
+#define FILEVIEW_SHOW_NONE 0x00A0
class ViewTabListBox_Impl;
class SvtFileView_Impl;
@@ -81,6 +81,7 @@ class SVT_DLLPUBLIC SvtFileView : public Control
{
private:
SvtFileView_Impl* mpImp;
+ sal_Bool bSortColumn;
::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList;
@@ -109,6 +110,8 @@ public:
void SetSizePixel( const Size& rNewSize );
using Window::SetPosSizePixel;
virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
+ void SetSortColumn( sal_Bool bValue ) { bSortColumn = bValue; }
+ sal_Bool GetSortColumn() { return bSortColumn; }
/** initialize the view with the content of a folder given by URL, and aply an immediate filter
@@ -269,3 +272,4 @@ public:
#endif // _SVT_FILEVIEW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 3245200605d4..4ea0bce85ee0 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,6 +39,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
+struct WMF_APMFILEHEADER;
// -----------------------
// - GraphicFilter-Types -
// -----------------------
@@ -181,7 +183,6 @@ class SVT_DLLPUBLIC GraphicDescriptor
sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo );
sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo );
sal_Bool ImpDetectSVG( SvStream& rStm, sal_Bool bExtendedInfo );
-
GraphicDescriptor( const GraphicDescriptor& );
GraphicDescriptor& operator=( const GraphicDescriptor& );
@@ -345,13 +346,15 @@ public:
sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath,
SvStream& rStream,
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
- sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
+ sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0,
+ WMF_APMFILEHEADER *pAPMHeader = NULL );
sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath,
SvStream& rStream,
sal_uInt16 nFormat,
sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags,
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData );
+ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData,
+ WMF_APMFILEHEADER *pAPMHeader = NULL );
sal_Bool Setup( sal_uInt16 nFormat );
@@ -361,7 +364,7 @@ public:
void ResetLastError();
const Link GetFilterCallback() const;
- static GraphicFilter* GetGraphicFilter();
+ static GraphicFilter& GetGraphicFilter();
static int LoadGraphic( const String& rPath, const String& rFilter,
Graphic& rGraphic,
GraphicFilter* pFilter = NULL,
@@ -377,3 +380,5 @@ SVT_DLLPUBLIC sal_Bool WriteWindowMetafile( SvStream& rStream, const GDIMetaFile
SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF );
#endif //_FILTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filterutils.hxx b/svtools/inc/svtools/filterutils.hxx
new file mode 100644
index 000000000000..ac14f9237958
--- /dev/null
+++ b/svtools/inc/svtools/filterutils.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef SVTOOLS_INC_FILTERUTILS_HXX
+#define SVTOOLS_INC_FILTERUTILS_HXX
+
+#include "svtools/svtdllapi.h"
+#include <com/sun/star/uno/RuntimeException.hpp>
+namespace svt
+{
+ class BinFilterUtils
+ {
+ private:
+ BinFilterUtils(); // never implemented
+
+ public:
+ SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+ SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+ };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fixedhyper.hxx b/svtools/inc/svtools/fixedhyper.hxx
index 290b53c7d841..6c34526dbb0b 100644
--- a/svtools/inc/svtools/fixedhyper.hxx
+++ b/svtools/inc/svtools/fixedhyper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,3 +230,4 @@ namespace svt
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx
index 3da14a9a83f9..a3bc298cc106 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ typedef sal_Bool ( *PFilterDlgCall )( FltCallDialogParameter& );
// und darf von dem Filter nicht geaendert werden!
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx
index fa987d912588..5a8cee962e38 100644
--- a/svtools/inc/svtools/fltdefs.hxx
+++ b/svtools/inc/svtools/fltdefs.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,20 +72,10 @@ typedef sal_uInt8* PDIBBYTE;
#endif
-#if defined ( OS2 ) || defined ( UNX )
+#if defined ( UNX )
void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 );
void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer );
-#ifdef OS2
-#define RGBQUAD RGBQUADOS2
-#define BITMAPFILEHEADER BITMAPFILEHEADEROS2
-#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2
-#define BITMAPINFOHEADER BITMAPINFOHEADEROS2
-#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2
-#define BITMAPINFO BITMAPINFOOS2
-#define PBITMAPINFO PBITMAPINFOOS2
-#endif
-
typedef struct RGBQUAD
{
sal_uInt8 rgbBlue;
@@ -134,3 +125,5 @@ typedef BITMAPINFO* PBITMAPINFO;
#endif
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 4e036e974828..c7192392811d 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -348,3 +349,4 @@ protected:
#endif // _FMTFIELD_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx
index 7bdb0dc412c3..f7bce249e2a3 100644
--- a/svtools/inc/svtools/fontsubstconfig.hxx
+++ b/svtools/inc/svtools/fontsubstconfig.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,4 @@ public:
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index fd068ac5f86b..4a41d93d5334 100644
--- a/svtools/inc/svtools/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,10 +40,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
-#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
-#define INCLUDED_HASH_MAP
-#endif
+#include <boost/unordered_map.hpp>
namespace svt
{
@@ -99,7 +97,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
@@ -114,3 +112,5 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
}
#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx
index 674429bf2e4d..ffe229c58fa9 100644
--- a/svtools/inc/svtools/generictoolboxcontroller.hxx
+++ b/svtools/inc/svtools/generictoolboxcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
}
#endif // __SVTOOLS_GENERICTOOLBOXCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx
index c5fbe5b840e4..fd4154816402 100644
--- a/svtools/inc/svtools/genericunodialog.hxx
+++ b/svtools/inc/svtools/genericunodialog.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,3 +193,4 @@ namespace svt
#endif // _SVT_GENERICUNODIALOG_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 155bd8402a74..c99ea7a55bcd 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -572,3 +573,5 @@ public:
};
#endif // _GRFMGR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx
index 106184e040f6..1cba24f2e212 100644
--- a/svtools/inc/svtools/headbar.hxx
+++ b/svtools/inc/svtools/headbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,7 +187,9 @@ nicht HIB_CLICKABLE setzen und dafuer HIB_FIXEDPOS.
*************************************************************************/
class Accelerator;
-class ImplHeadItemList;
+class ImplHeadItem;
+
+typedef ::std::vector< ImplHeadItem* > ImplHeadItemList;
// -----------
// - WinBits -
@@ -393,3 +396,4 @@ public:
#endif // _HEADBAR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx
index 45b2917c500a..7d2987eb6f96 100644
--- a/svtools/inc/svtools/helpagentwindow.hxx
+++ b/svtools/inc/svtools/helpagentwindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,4 @@ namespace svt
#endif // _SVTOOLS_HELPAGENTWIDNOW_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index 974c6c85fa38..5947b8d034b1 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx
index 7778ffacfd7b..c668324069bd 100644
--- a/svtools/inc/svtools/htmlcfg.hxx
+++ b/svtools/inc/svtools/htmlcfg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,8 +59,8 @@ class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
void CallListeners();
public:
- SvxHtmlOptions();
- ~SvxHtmlOptions();
+ SvxHtmlOptions();
+ ~SvxHtmlOptions();
virtual void Commit();
virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
@@ -91,7 +92,7 @@ public:
sal_Bool IsDefaultTextEncoding() const;
rtl_TextEncoding GetTextEncoding() const;
void SetTextEncoding( rtl_TextEncoding );
- static SvxHtmlOptions* Get();
+ static SvxHtmlOptions& Get();
sal_Bool IsNumbersEnglishUS() const;
void SetNumbersEnglishUS(sal_Bool bSet);
@@ -105,3 +106,4 @@ public:
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx
index 13928eaeaa39..999ee21d236c 100644
--- a/svtools/inc/svtools/htmlkywd.hxx
+++ b/svtools/inc/svtools/htmlkywd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -799,3 +800,5 @@
#define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index dbb8d63914a2..06caae765b6a 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,7 +64,7 @@ struct HTMLOutFuncs
#if defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
SVT_DLLPUBLIC static void ConvertStringToHTML( const String& sSrc, ByteString& rDest,
@@ -123,3 +124,4 @@ struct HTMLOutFuncs
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/htmltokn.h b/svtools/inc/svtools/htmltokn.h
index 5b577093ce8a..1ccfca3bd4e9 100644
--- a/svtools/inc/svtools/htmltokn.h
+++ b/svtools/inc/svtools/htmltokn.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +47,7 @@ SVT_DLLPUBLIC int GetHTMLToken( const String& rName );
int GetHTMLOption( const String& rName );
// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX)
-SVT_DLLPUBLIC sal_uIntPtr GetHTMLColor( const String& rName );
+SVT_DLLPUBLIC sal_uInt32 GetHTMLColor( const String& rName );
// beginnen immer ab 256, groesser als ein char
const int HTML_TOKEN_START = 0x100;
@@ -522,7 +523,7 @@ HTML_OPTION_ENUM_END,
// Attribute mit Script-Code als Wert
HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END,
- HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScaript
+ HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScript
HTML_O_ONBLUR, // JavaScript
HTML_O_ONCHANGE, // JavaScript
HTML_O_ONCLICK, // JavaScript
@@ -567,3 +568,5 @@ HTML_OPTION_END
};
#endif // _HTMLTOKN_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/hyperlabel.hxx b/svtools/inc/svtools/hyperlabel.hxx
index 926b11c5537c..a94a5ea99168 100644
--- a/svtools/inc/svtools/hyperlabel.hxx
+++ b/svtools/inc/svtools/hyperlabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,4 @@ namespace svt
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc
index 19cc2942d6f4..021cbe4c9ac8 100644
--- a/svtools/inc/svtools/imagemgr.hrc
+++ b/svtools/inc/svtools/imagemgr.hrc
@@ -33,58 +33,35 @@
#define IMAGELIST_START 3076 // must match to old Id's in SFX!
#define IMG_IMPRESS (IMAGELIST_START + 47)
-#define IMG_WORKPLACE (IMAGELIST_START + 48)
#define IMG_BITMAP (IMAGELIST_START + 49)
#define IMG_CALC (IMAGELIST_START + 50)
#define IMG_CALCTEMPLATE (IMAGELIST_START + 51)
#define IMG_CHART (IMAGELIST_START + 52)
#define IMG_DATABASE (IMAGELIST_START + 53)
#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54)
-#define IMG_EXCEL (IMAGELIST_START + 55)
-#define IMG_EXCELTEMPLATE (IMAGELIST_START + 56)
-#define IMG_FTPSERVER (IMAGELIST_START + 58)
-#define IMG_GALLERY (IMAGELIST_START + 59)
-#define IMG_GALLERYTHEME (IMAGELIST_START + 60)
#define IMG_GIF (IMAGELIST_START + 61)
#define IMG_HELP (IMAGELIST_START + 62)
#define IMG_HTML (IMAGELIST_START + 63)
#define IMG_JPG (IMAGELIST_START + 64)
-#define IMG_LINK (IMAGELIST_START + 65)
-#define IMG_LOTUS (IMAGELIST_START + 66)
#define IMG_MATH (IMAGELIST_START + 68)
#define IMG_MATHTEMPLATE (IMAGELIST_START + 69)
#define IMG_FILE (IMAGELIST_START + 74)
-#define IMG_APP (IMAGELIST_START + 75)
#define IMG_PCD (IMAGELIST_START + 76)
#define IMG_PCT (IMAGELIST_START + 77)
#define IMG_PCX (IMAGELIST_START + 78)
#define IMG_SIM (IMAGELIST_START + 79)
#define IMG_TEXTFILE (IMAGELIST_START + 80)
-#define IMG_SVHELP (IMAGELIST_START + 81)
#define IMG_TIFF (IMAGELIST_START + 82)
#define IMG_URL (IMAGELIST_START + 83)
#define IMG_WMF (IMAGELIST_START + 84)
-#define IMG_WORD (IMAGELIST_START + 85)
#define IMG_WRITER (IMAGELIST_START + 86)
#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87)
#define IMG_FIXEDDEV (IMAGELIST_START + 88)
#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89)
#define IMG_CDROMDEV (IMAGELIST_START + 90)
#define IMG_NETWORKDEV (IMAGELIST_START + 91)
-#define IMG_RAMDEV (IMAGELIST_START + 92)
-#define IMG_TABLEFOLDER (IMAGELIST_START + 111)
#define IMG_TABLE (IMAGELIST_START + 112)
#define IMG_FOLDER (IMAGELIST_START + 113)
-#define IMG_EXPANDEDFOLDER (IMAGELIST_START + 114)
-#define IMG_XXX (IMAGELIST_START + 117)
-#define IMG_GALLERYIMPORT (IMAGELIST_START + 122)
-#define IMG_QUERYFOLDER (IMAGELIST_START + 125)
-#define IMG_QUERY (IMAGELIST_START + 126)
-#define IMG_FORM (IMAGELIST_START + 127)
-#define IMG_FORMFOLDER (IMAGELIST_START + 128)
-#define IMG_REPORT (IMAGELIST_START + 129)
-#define IMG_REPORTFOLDER (IMAGELIST_START + 130)
-#define IMG_OTHERS (IMAGELIST_START + 138)
#define IMG_MACROLIB (IMAGELIST_START + 140)
#define IMG_DXF (IMAGELIST_START + 141)
#define IMG_MET (IMAGELIST_START + 142)
@@ -95,13 +72,7 @@
#define IMG_GLOBAL_DOC (IMAGELIST_START + 150)
#define IMG_DRAW (IMAGELIST_START + 151)
#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152)
-#define IMG_TASK (IMAGELIST_START + 160)
-#define IMG_APPOINTMENT (IMAGELIST_START + 161)
-#define IMG_RELATION (IMAGELIST_START + 163)
-#define IMG_IMPRESSPACKED (IMAGELIST_START + 165)
#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166)
-#define IMG_POWERPOINT (IMAGELIST_START + 167)
-#define IMG_POWERPOINTTEMPLATE (IMAGELIST_START + 168)
#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169)
#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170)
#define IMG_OO_MATH_DOC (IMAGELIST_START + 171)
diff --git a/svtools/inc/svtools/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx
index efd15c5f4cde..eca8b658e5cb 100644
--- a/svtools/inc/svtools/imagemgr.hxx
+++ b/svtools/inc/svtools/imagemgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,18 +75,11 @@ private:
SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
public:
- // depricated, because no high contrast mode
SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+ SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+ SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
- // now with high contrast mode
- SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
- SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
- SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
- SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast );
-
SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject );
SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject );
SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo );
@@ -93,3 +87,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx
index d77b1c97a512..3999ce908be5 100644
--- a/svtools/inc/svtools/imageresourceaccess.hxx
+++ b/svtools/inc/svtools/imageresourceaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,4 @@ namespace svt
#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index e43d97eef9b9..7e0124f70d0c 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,8 +148,6 @@ public:
|*
\******************************************************************************/
-//#if 0 // _SOLAR__PRIVATE
-
class IMapCompat
{
SvStream* pRWStm;
@@ -167,5 +166,6 @@ public:
~IMapCompat();
};
-//#endif // __PRIVATE
#endif // _IMAP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx
index 88f7fffa8d22..1ae929374b4f 100644
--- a/svtools/inc/svtools/imapcirc.hxx
+++ b/svtools/inc/svtools/imapcirc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index 42e6b1740b70..fc907135fdaa 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,3 +162,4 @@ inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent )
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imappoly.hxx b/svtools/inc/svtools/imappoly.hxx
index e6d31f78597a..605a43c36c44 100644
--- a/svtools/inc/svtools/imappoly.hxx
+++ b/svtools/inc/svtools/imappoly.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imaprect.hxx b/svtools/inc/svtools/imaprect.hxx
index 3e6d80f52bef..e5dc8ebaf18b 100644
--- a/svtools/inc/svtools/imaprect.hxx
+++ b/svtools/inc/svtools/imaprect.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx
index 7cdcec0fd642..d10585a73caa 100644
--- a/svtools/inc/svtools/imgdef.hxx
+++ b/svtools/inc/svtools/imgdef.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ enum SfxSymbolsSize
#endif // _SVTOOLS_IMGDEF_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx
index f2c73000ed67..56424cc00c7e 100644
--- a/svtools/inc/svtools/indexentryres.hxx
+++ b/svtools/inc/svtools/indexentryres.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX
#define SVTOOLS_INDEXENTRYRESSOURCE_HXX
@@ -21,3 +22,4 @@ class SVT_DLLPUBLIC IndexEntryRessource
#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx
index 61204e9d0935..12f3df2a4289 100644
--- a/svtools/inc/svtools/inetimg.hxx
+++ b/svtools/inc/svtools/inetimg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,4 @@ public:
#endif // #ifndef _INETIMG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index b65e8b0edea7..f352dd2fae83 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
class IUrlFilter;
class SvtMatchContext_Impl;
@@ -109,3 +108,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index afbbc2509011..4bb9cd893828 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include <tools/globname.hxx>
#include <sot/formats.hxx>
-#ifndef _OWNCONT_HXX
-#include <svl/ownlist.hxx>
-#endif
+#include <vector>
#include <svtools/transfer.hxx>
class SvObjectServer
@@ -54,13 +53,27 @@ public:
const String & GetHumanName() const { return aHumanName; }
};
+typedef ::std::vector< SvObjectServer > SvObjectServerList_impl;
+
class SVT_DLLPUBLIC SvObjectServerList
{
- PRV_SV_DECL_OWNER_LIST(SvObjectServerList,SvObjectServer)
+private:
+ SvObjectServerList_impl aObjectServerList;
+
+public:
const SvObjectServer * Get( const String & rHumanName ) const;
const SvObjectServer * Get( const SvGlobalName & ) const;
void Remove( const SvGlobalName & );
void FillInsertObjects();
+ size_t Count() const
+ {
+ return aObjectServerList.size();
+ }
+
+ const SvObjectServer operator[]( size_t n ) const
+ {
+ return aObjectServerList[ n ];
+ }
};
class SVT_DLLPUBLIC SvPasteObjectHelper
@@ -72,3 +85,4 @@ public:
#endif // _SVTOOLS_INSDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx
index 51af97730079..2ceb73a781b9 100644
--- a/svtools/inc/svtools/itemdel.hxx
+++ b/svtools/inc/svtools/itemdel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,4 @@ void DeleteOnIdleItems();
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index 9e42f12dffb1..13bf8bcdd24a 100644
--- a/svtools/inc/svtools/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,7 +73,6 @@ enum SvxIconChoiceCtrlPositionMode
class SvxIconChoiceCtrlEntry
{
Image aImage;
- Image aImageHC;
String aText;
String aQuickHelpText;
@@ -122,16 +122,13 @@ class SvxIconChoiceCtrlEntry
public:
SvxIconChoiceCtrlEntry( sal_uInt16 nFlags = 0 );
SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 nFlags = 0 );
- SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, sal_uInt16 nFlags = 0 );
~SvxIconChoiceCtrlEntry () {}
void SetImage ( const Image& rImage ) { aImage = rImage; }
- void SetImageHC ( const Image& rImage ) { aImageHC = rImage; }
Image GetImage () const { return aImage; }
- Image GetImageHC () const { return aImageHC; }
void SetText ( const String& rText ) { aText = rText; }
String GetText () const { return aText; }
- String SVT_DLLPUBLIC GetDisplayText() const;
+ String SVT_DLLPUBLIC GetDisplayText() const;
void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
String GetQuickHelpText() const { return aQuickHelpText; }
void SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
@@ -302,14 +299,12 @@ public:
SvxIconChoiceCtrlEntry* InsertEntry( sal_uLong nPos = LIST_APPEND,
const Point* pPos = 0,
sal_uInt16 nFlags = 0 );
- SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage,
- sal_uLong nPos = LIST_APPEND,
- const Point* pPos = 0,
- sal_uInt16 nFlags = 0 );
- SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC,
- sal_uLong nPos = LIST_APPEND,
- const Point* pPos = 0,
- sal_uInt16 nFlags = 0 );
+ SvxIconChoiceCtrlEntry* InsertEntry( const String& rText,
+ const Image& rImage,
+ sal_uLong nPos = LIST_APPEND,
+ const Point* pPos = 0,
+ sal_uInt16 nFlags = 0
+ );
/** creates automatic mnemonics for all icon texts in the control
*/
@@ -388,3 +383,4 @@ public:
#endif // _ICNVW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx
index 54ef70975ae0..7c32a49448b3 100644
--- a/svtools/inc/svtools/javacontext.hxx
+++ b/svtools/inc/svtools/javacontext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,9 +47,6 @@ namespace svt
{
public:
- JavaContext( const com::sun::star::uno::Reference<
- com::sun::star::uno::XCurrentContext> & ctx);
-
/** The parameter bShowErrorsOnce controls whether a message box is
only displayed once for a reocurring Java error. That is only
the first time JavaInteractionHandler.handle is called with a
@@ -57,7 +55,7 @@ namespace svt
*/
JavaContext( const com::sun::star::uno::Reference<
com::sun::star::uno::XCurrentContext> & ctx,
- bool bReportErrorOnce);
+ bool bReportErrorOnce = true );
virtual ~JavaContext();
// XInterface
@@ -89,3 +87,5 @@ namespace svt
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx
index 56dbe0e03423..608861ad898e 100644
--- a/svtools/inc/svtools/javainteractionhandler.hxx
+++ b/svtools/inc/svtools/javainteractionhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,8 +48,7 @@ class SVT_DLLPUBLIC JavaInteractionHandler:
public com::sun::star::task::XInteractionHandler
{
public:
- JavaInteractionHandler();
- JavaInteractionHandler(bool bReportErrorOnce);
+ JavaInteractionHandler(bool bReportErrorOnce = true);
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -80,3 +80,5 @@ private:
}
#endif // _DESKTOP_JAVAINTERACTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/langhelp.hxx b/svtools/inc/svtools/langhelp.hxx
new file mode 100644
index 000000000000..ccc946c305b6
--- /dev/null
+++ b/svtools/inc/svtools/langhelp.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Thorsten Behrens <tbehrens@novell.com>
+ *
+ * Contributor(s): Thorsten Behrens <tbehrens@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef _SVTOOLS_LANGHELP_HXX_
+#define _SVTOOLS_LANGHELP_HXX_
+
+#include <svtools/svtdllapi.h>
+
+namespace rtl { class OUString; }
+
+/** Localize a URI to one of the foundation's webservices
+
+ @param io_rURI
+ URI to localize - depending on your UI locale, a country local
+ part is appended to the URI (like "en", or "fr", or "es")
+ */
+SVT_DLLPUBLIC void localizeWebserviceURI( ::rtl::OUString& io_rURI );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index e5600413091b..9b38297433bf 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText );
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx
index b00a306d0535..c006f034e5fd 100644
--- a/svtools/inc/svtools/localresaccess.hxx
+++ b/svtools/inc/svtools/localresaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ namespace svt
#endif // _SVTOOLS_LOCALRESACCESS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 6de173f40c3a..eb0f83df22c0 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -167,3 +168,5 @@ class SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
}; // class SvtMenuOptions
#endif // #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index ecd2574c1943..eeabc624deff 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,6 +111,12 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
void SetUseSystemFileDialog( sal_Bool bSet );
sal_Bool IsUseSystemFileDialogReadOnly() const;
+ sal_Bool TryODMADialog() const;
+ void SetTryODMADialog( sal_Bool bSet );
+ sal_Bool IsTryUseODMADialogReadOnly() const;
+
+ sal_Bool DisableUICustomization() const;
+
sal_Bool IsPluginsEnabled() const;
void SetPluginsEnabled( sal_Bool bEnable );
sal_Bool IsPluginsEnabledReadOnly() const;
@@ -136,6 +143,16 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
sal_Bool UseSystemPrintDialog() const;
void SetUseSystemPrintDialog( sal_Bool bSet );
+ sal_Bool ShowLinkWarningDialog() const;
+ void SetShowLinkWarningDialog( sal_Bool bSet );
+ sal_Bool IsShowLinkWarningDialogReadOnly() const;
+
+ void SetSaveAlwaysAllowed( sal_Bool bSet );
+ sal_Bool IsSaveAlwaysAllowed() const;
+
+ void SetExperimentalMode( sal_Bool bSet );
+ sal_Bool IsExperimentalMode() const;
+
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
@@ -178,3 +195,5 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
}; // class SvtMiscOptions
#endif // #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index bd3114b4e871..d788c4d3e340 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -236,3 +237,5 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
}; // class SvtOptionsDrawinglayer
#endif // #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index 8de20132cbc4..20e15990e538 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -256,7 +257,7 @@ public:
// Mit Ausnahme des Falls, dass SwitchToUCS2==sal_False und
// SVPAR_CS_DONTKNOW uebergeben wird muss der String mit zwei(!)
// 0-Bytes an einer geraden(!) Position terminiert sein.
- static FASTBOOL IsHTMLFormat( const sal_Char* pHeader,
+ static bool IsHTMLFormat( const sal_Char* pHeader,
sal_Bool bSwitchToUCS2 = sal_False,
rtl_TextEncoding eEnc=RTL_TEXTENCODING_DONTKNOW );
@@ -295,3 +296,5 @@ inline void HTMLParser::StartXMP( sal_Bool bRestart )
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx
index 212fe9cafaed..e47428ba3ac9 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/svtools/inc/svtools/parrtf.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ public:
};
#endif //_PARRTF_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/svtools/inc/svtools/popupmenucontrollerbase.hxx
index b062234a512e..5bd15cf68d25 100644
--- a/svtools/inc/svtools/popupmenucontrollerbase.hxx
+++ b/svtools/inc/svtools/popupmenucontrollerbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,3 +140,5 @@ namespace svt
}
#endif // __SVTOOLS_POPUPMENUCONTROLLERBASE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/svtools/inc/svtools/popupwindowcontroller.hxx
index 4877d0184318..1d9c2b4ba407 100644
--- a/svtools/inc/svtools/popupwindowcontroller.hxx
+++ b/svtools/inc/svtools/popupwindowcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ private:
} // namespace svt
#endif // __SVTOOLS_POPUPWINDOWCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx
index 25411b696c84..b55955cf0462 100644
--- a/svtools/inc/svtools/prgsbar.hxx
+++ b/svtools/inc/svtools/prgsbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,5 @@ public:
};
#endif // _PRGSBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/printoptions.hxx b/svtools/inc/svtools/printoptions.hxx
index 5d95eb27949f..cf0be185c23a 100644
--- a/svtools/inc/svtools/printoptions.hxx
+++ b/svtools/inc/svtools/printoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ public:
};
#endif // INCLUDED_SVTOOLS_PRINTOPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index 07f131fda07b..a7155032a238 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,24 +31,12 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _VCL_TIMER_HXX
#include <vcl/timer.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class Printer;
@@ -120,3 +109,5 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo );
XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo );
#endif // _SV_PRNSETUP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx
index ff94cc966f4d..988af84294c0 100644
--- a/svtools/inc/svtools/roadmap.hxx
+++ b/svtools/inc/svtools/roadmap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/imgctrl.hxx>
-#ifndef _SVTOOLS_HYPERLABEL_HXX
#include "svtools/hyperlabel.hxx"
-#endif
@@ -135,3 +134,4 @@ namespace svt
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx
index 25d983c85a90..5df0ac4e717b 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/svtools/inc/svtools/roadmapwizard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,7 +232,7 @@ protected:
void updateRoadmapItemLabel( WizardState _nState );
protected:
-#if OSL_DEBUG_LEVEL > 0
+#ifdef DBG_UTIL
const sal_Char* checkInvariants() const;
friend const char* CheckInvariants( const void* pVoid );
#endif
@@ -255,3 +256,5 @@ protected:
//........................................................................
#endif // OOO_SVTOOLS_INC_ROADMAPWIZARD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx
index de59e1d8faf9..dca17c91d813 100644
--- a/svtools/inc/svtools/rtfkeywd.hxx
+++ b/svtools/inc/svtools/rtfkeywd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,6 +71,8 @@
#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf"
#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb"
#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot"
+#define OOO_STRING_SVTOOLS_RTF_BRDRDASH "\\brdrdash"
+#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm"
#define OOO_STRING_SVTOOLS_RTF_BRDRHAIR "\\brdrhair"
#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl"
#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr"
@@ -744,6 +747,9 @@
#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm"
#define OOO_STRING_SVTOOLS_RTF_BRDREMBOSS "\\brdremboss"
#define OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE "\\brdrengrave"
+#define OOO_STRING_SVTOOLS_RTF_BRDROUTSET "\\brdroutset"
+#define OOO_STRING_SVTOOLS_RTF_BRDRINSET "\\brdrinset"
+#define OOO_STRING_SVTOOLS_RTF_BRDRNONE "\\brdrnone"
#define OOO_STRING_SVTOOLS_RTF_BRDRFRAME "\\brdrframe"
#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG "\\brdrthtnlg"
#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG "\\brdrthtnmg"
@@ -1152,3 +1158,5 @@
#define OOO_STRING_SVTOOLS_RTF_NONESTTABLES "\\nonesttables"
#endif // _RTFKEYWD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx
index 72e488353b72..b8b3c400103a 100644
--- a/svtools/inc/svtools/rtfout.hxx
+++ b/svtools/inc/svtools/rtfout.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
-#ifndef _RTL_TEXTENC_H_
#include <rtl/textenc.h>
-#endif
class String;
class SvStream;
@@ -44,7 +43,7 @@ public:
#if defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
@@ -65,3 +64,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/rtftoken.h b/svtools/inc/svtools/rtftoken.h
index f292682a0236..843002b62086 100644
--- a/svtools/inc/svtools/rtftoken.h
+++ b/svtools/inc/svtools/rtftoken.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _RTFTOKEN_H
#define _RTFTOKEN_H
@@ -659,6 +658,8 @@ enum RTF_TOKEN_IDS {
RTF_BRDRDOT,
RTF_BRDRHAIR,
RTF_BRDRDASH,
+ RTF_BRDRINSET,
+ RTF_BRDROUTSET,
RTF_BRDRFRAME,
// Swg-Border-Tokens
@@ -1270,4 +1271,4 @@ enum RTF_TOKEN_IDS {
#endif // _RTFTOKEN_H
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx
index 6ad47779e1d9..ba04f9342525 100644
--- a/svtools/inc/svtools/ruler.hxx
+++ b/svtools/inc/svtools/ruler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
#include <vcl/window.hxx>
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/field.hxx>
class MouseEvent;
@@ -42,62 +41,57 @@ class DataChangedEvent;
/*************************************************************************
-Beschreibung
+Description
============
class Ruler
-Diese Klasse dient zur Anzeige eines Lineals. Dabei kann diese Klasse nicht
-nur als Anzeige-Control verwendet werden, sondern auch als aktives Control
-zum Setzen/Verschieben von Tabulatoren und Raendern.
+This class is used for displaying a ruler, but it can also be used
+for setting or moving tabs and margins.
--------------------------------------------------------------------------
WinBits
-WB_HORZ Lineal wird horizontal dargestellt
-WB_VERT Lineal wird vertikal dargestellt
-WB_3DLOOK 3D-Darstellung
-WB_BORDER Border am unteren/rechten Rand
-WB_EXTRAFIELD Feld in der linken/oberen Ecke zur Anzeige und
- Auswahl von Tabs, Null-Punkt, ...
+WB_HORZ ruler is displayed horizontally
+WB_VERT ruler is displayed vertically
+WB_3DLOOK 3D look
+WB_BORDER border at the bottom/right margin
+WB_EXTRAFIELD Field in the upper left corner for
+ displaying and selecting tabs, origin of coordinates, ...
WB_RIGHT_ALIGNED Marks the vertical ruler as right aligned
--------------------------------------------------------------------------
-Beim Lineal werden alle Werte als Pixel-Werte eingestellt. Dadurch werden
-doppelte Umrechnungen und Rundungsfehler vermieden und die Raender werden
-im Lineal auch an der Position angezeigt, den Sie auch im Dokument haben.
-Dadurch kann die Applikation zum Beispiel bei Tabellendarstellung auch
-eigene Rundungen vornehmen und die Positionen im Lineal passen trotzdem noch
-zu denen im Dokument. Damit aber das Lineal weiss, wie das Dokument auf dem
-Bildschirm dargestellt wird, muessen noch ein paar zusaetzliche Werte
-eingestellt werden.
-
-Mit SetWinPos() wird der Offset des Edit-Fenster zum Lineal eingestellt.
-Dabei kann auch die Breite des Fensters eingestellt werden. Wenn bei den
-Werten 0 uebergeben wird, wird die Position/Breite vom Fenster automatisch
-so breit gesetzt, wie das Lineal breit ist.
-
-Mit SetPagePos() wird der Offset der Seite zum Edit-Fenster eingestellt und
-die Breite der Seite eingestellt. Wenn bei den Werten 0 uebergeben wird,
-wird die Position/Breite automatisch so gesetzt, als ob die Seite das ganze
-Editfenster ausfuellen wuerde.
-
-Mit SetBorderPos() kann der Offset eingestellt werden, ab dem der
-Border ausgegeben wird. Die Position bezieht sich auf die linke bzw. obere
-Fensterkante. Dies wird gebraucht, wenn ein horizontales und vertikales
-Lineal gleichzeitig sichtbar sind. Beispiel:
+All ruler parameters are set in pixel units. This way double conversions
+and rounding errors are avoided and the ruler displays the margins
+at their actual position in the document. Because of this, the application can,
+for example in tables, do its own roundings and the positions on the ruler will
+still match those in the document. However, for the ruler to know how the
+document is displayed on the screen, some additional values have to be configured
+
+SetWinPos() sets the offset of the ruler's edit window. In doing so,
+the width of the window can also be configured. If there is a 0 among the
+values passed to the function, the position/width is automatically set to
+the width of the ruler.
+
+SetPagePos() sets the offset of the page relative to the edit window and the
+width of the page. If there is a 0 among the values passed to the function,
+the position/width is automatically set as if the page filled the whole edit window.
+
+SetBorderPos() sets the offset of the border. The position is relative to
+the upper/left margin of the window. This is needed when there are a horizontal
+and a vertical ruler visible at the same time. Example:
aHRuler.SetBorderPos( aVRuler.GetSizePixel().Width()-1 );
-Mit SetNullOffset() wird der Null-Punkt bezogen auf die Seite gesetzt.
+SetNullOffset() sets the origin relative to the page.
-Alle anderen Werte (Raender, Einzug, Tabs, ...) beziehen sich auf den 0 Punkt,
-der mit SetNullOffset() eingestellt wird.
+All the other values (margins, indentation, tabs, ...) refer to the origin,
+which is set with SetNullOffset().
-Die Werte werden zum Beispiel folgendermassen berechnet:
+The values are computed as described below:
-- WinPos (wenn beide Fenster den gleichen Parent haben)
+- WinPos (if both windows have the same parent)
Point aHRulerPos = aHRuler.GetPosPixel();
Point aEditWinPos = aEditWin.GetPosPixel();
@@ -108,16 +102,15 @@ Die Werte werden zum Beispiel folgendermassen berechnet:
Point aPagePos = aEditWin.LogicToPixel( aEditWin.GetPagePos() );
aHRuler.SetPagePos( aPagePos().X() );
-- Alle anderen Werte
+- All other values
- Die logischen Werte zusammenaddieren, als Position umrechnen und
- die vorher gemerkten Pixel-Positionen (von PagePos und NullOffset)
- entsprechend abziehen.
+ Add the logical values, recompute as position and subtract the
+ previously saved pixel positions (of PagePos and Null Offset).
--------------------------------------------------------------------------
-Mit SetUnit() und SetZoom() wird eingestellt, in welcher Einheit das Lineal
-die Werte anzeigt. Folgende Einheiten werden akzeptiert:
+SetUnit() and SetZoom() configure which unit is used to display
+the values on the ruler. The following units are accepted:
FUNIT_MM
FUNIT_CM (Default)
@@ -131,160 +124,145 @@ die Werte anzeigt. Folgende Einheiten werden akzeptiert:
--------------------------------------------------------------------------
-Mit SetMargin1() kann der linke/obere Rand und mit SetMargin2() kann
-der rechte/untere Rand gesetzt werden. Falls diese Methoden ohne Parameter
-aufgerufen werden, werden keine Raender angezeigt. Wenn SetMargin1() bzw.
-SetMargin2() mit Parametern aufgerufen werden, kann bei diesen
-folgendes angegeben werden:
+SetMargin1() sets the upper/left margin and SetMargin2() sets the
+bottom/right margin. If these methods are called whithout arguments,
+no margins are displayed. Otherwise, the following arguments can be passed:
- long nPos - Offset zum NullPunkt in Pixel
- sal_uInt16 nStyle - Bit-Style:
+ long nPos - offset in pixels relative to the origin
+ sal_uInt16 nStyle - bit style:
RULER_MARGIN_SIZEABLE
- Rand kann in der Groesse veraendert werden.
+ margin size can be changed
- Zu diesen Style's koennen folgende Style-
- Bits dazugeodert werden:
- RULER_STYLE_INVISIBLE (fuer nicht sichtbar)
+ The following bits can be set in addition
+ to these styles:
+ RULER_STYLE_INVISIBLE
-Mit SetBorders() kann ein Array von Raendern gesetzt werden. Dabei muss
-ein Array vom Typ RulerBorder uebergeben werden, wobei folgende Werte
-initialisiert werden muessen:
+SetBorders() sets an array of margins. To do this, an array of type RulerBorder
+has to be passed. In the array, the following values have to be initialized:
- long nPos - Offset zum NullPunkt in Pixel
- long nWidth - Breite des Spaltenabstands in Pixel (kann zum
- Beispiel fuer Tabellenspalten auch 0 sein)
- sal_uInt16 nStyle - Bit-Style:
+ long nPos - offset in pixels relative to the origin
+ long nWidth - column spacing in pixels (can also be 0, for example,
+ for table columns)
+ sal_uInt16 nStyle - bit style:
RULER_BORDER_SIZEABLE
- Spaltenabstand kann in der Groesse veraendert
- werden. Dieses Flag sollte nur gesetzt werden,
- wenn ein Abstand in der Groesse geaendert wird
- und nicht die Groesse einer Zelle.
+ Column spacing can be changed. This flag should
+ only be set if the size of the spacing is changed,
+ not that of a cell.
RULER_BORDER_MOVEABLE
- Spaltenabstand/Begrenzung kann verschoben
- werden. Wenn Tabellenbegrenzungen verschoben
- werden, sollte dieses Flag gesetzt werden und
- nicht Sizeable. Denn Sizeable gibt an, das
- ein Abstand vergroessert werden kann und nicht
- eine einzelne Zelle in der Groesse geaendert
- werden kann.
+ Column spacing/border can be moved. Whenever
+ table borders are to be moved, this flag should
+ be set instead of SIZEABLE (SIZEABLE indicates
+ that the size of a spacing, not that of a single
+ cell can be changed).
RULER_BORDER_VARIABLE
- Nicht alle Spaltenabstande sind gleich
+ Not all of the column spacings are equal
RULER_BORDER_TABLE
- Tabellenrahmen. Wenn dieser Style gesetzt
- wird, muss die Spaltenbreite 0 sein.
+ Table border. Whenever this style ist set, the column
+ width must be 0.
RULER_BORDER_SNAP
- Hilfslinie / Fanglinie. Wenn dieser Style
- gesetzt wird, muss die Spaltenbreite 0 sein.
+ Auxiliary line. Whenever this style is set, the
+ column width must be 0.
RULER_BORDER_MARGIN
- Margin. Wenn dieser Style gesetzt wird,
- muss die Spaltenbreite 0 sein.
-
- Zu diesen Style's koennen folgende Style-
- Bits dazugeodert werden:
- RULER_STYLE_INVISIBLE (fuer nicht sichtbar)
-
-Mit SetIndents() kann ein Array von Indents gesetzt werden. Diese Methode darf
-nur angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als
-Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende
-Werte initialisiert werden muessen:
-
- long nPos - Offset zum NullPunkt in Pixel
- sal_uInt16 nStyle - Bit-Style:
- RULER_INDENT_TOP (Erstzeileneinzug)
- RULER_INDENT_BOTTOM (Linker/Rechter Einzug)
- RULER_INDENT_BORDER (Verical line that shows the border distance)
- Zu diesen Style's koennen folgende Style-
- Bits dazugeodert werden:
- RULER_STYLE_DONTKNOW (fuer alte Position oder
- fuer Uneindeutigkeit)
- RULER_STYLE_INVISIBLE (fuer nicht sichtbar)
-
-Mit SetTabs() kann ein Array von Tabs gesetzt werden. Diese Methode darf nur
-angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als
-Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende
-Werte initialisiert werden muessen:
-
- long nPos - Offset zum NullPunkt in Pixel
- sal_uInt16 nStyle - Bit-Style:
- RULER_TAB_DEFAULT (kann nicht selektiert werden)
+ Margin. Whenever this style is set, the column
+ width must be 0.
+
+ The following bits can be set in addition
+ to these styles:
+ RULER_STYLE_INVISIBLE
+
+SetIndents() sets an array of indents. This method may only be used for horizontal
+rulers. A Ruler Indent must be passed as an argument, with the following values
+initialized:
+
+ long nPos - offset relative to the origin in pixels
+ sal_uInt16 nStyle - bit style:
+ RULER_INDENT_TOP (indent of the first line)
+ RULER_INDENT_BOTTOM (left/right indent)
+ RULER_INDENT_BORDER (Vertical line that shows the border distance)
+ The following bits can be set in addition
+ to these styles:
+ RULER_STYLE_DONTKNOW (for old position or for
+ ambiguity)
+ RULER_STYLE_INVISIBLE
+
+SetTabs() sets an array of tabs. This method may only be used for horizontal rulers.
+An array of type RulerTab must be passed as an argument, with the following values
+initialized:
+
+ long nPos - offset relative to the origin in pixels
+ sal_uInt16 nStyle - bit style:
+ RULER_TAB_DEFAULT (can't be selected)
RULER_TAB_LEFT
RULER_TAB_CENTER
RULER_TAB_RIGHT
RULER_TAB_DECIMAL
- Zu diesen Style's koennen folgende Style-
- Bits dazugeodert werden:
- RULER_STYLE_DONTKNOW (fuer alte Position oder
- fuer Uneindeutigkeit)
- RULER_STYLE_INVISIBLE (fuer nicht sichtbar)
-
-Mit SetLines() koennen Positionslinien im Lineal angezeigt werden. Dabei
-muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte
-initialisiert werden muessen:
-
- long nPos - Offset zum NullPunkt in Pixel
- sal_uInt16 nStyle - Bit-Style (muss zur Zeit immer 0 sein)
-
-Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn
-Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen
-mehr angezeigt. Deshalb sollten die Bemassungspfeile immer ueber die ganze
-Linealbreite gesetzt werden. Dabei muss ein Array vom Typ RulerArrow
-uebergeben werden, wobei folgende Werte initialisiert werden muessen:
-
- long nPos - Offset zum NullPunkt in Pixel
- long nWidth - Breite des Pfeils
- long nLogWidth - Breite des Pfeils in logischer Einheit
- sal_uInt16 nStyle - Bit-Style (muss zur Zeit immer 0 sein)
-
-Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen
-Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die
-Einheiten MAP_TWIP und MAP_100TH_MM (default) akzeptiert.
+ The following bits can be set in addition
+ to these styles:
+ RULER_STYLE_DONTKNOW (for old position of for
+ ambiguity)
+ RULER_STYLE_INVISIBLE
+
+SetLines() displays position lines in the ruler. An array of type RulerLine must be passed, with
+the following values initialized:
+
+ long nPos - offset relative to the origin in pixels
+ sal_uInt16 nStyle - bit style (has to be 0 currently)
+
+SetArrows() displays dimension arrows in the ruler. With dimension arrows set
+no subdivisions will be shown any more in the ruler. Therefore, dimension
+arrows should always be set along the whole ruler. An array of type RulerArrow
+must be passed with the following values initialized:
+
+ long nPos - offset relative to the origin in pixels
+ long nWidth - the arrow's width
+ long nLogWidth - the arrow's width in logical unit
+ sal_uInt16 nStyle - bit style (has to be 0 currently)
+
+SetSourceUnit() sets the unit in which the logical values are given that are
+passed to SetArrows(). The only units accepted are MAP_TWIP and MAP_100TH_MM.
--------------------------------------------------------------------------
-Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal
-geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu
-muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden.
-Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben
-von sal_False das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position
-abgefragt werden und die Werte muessen an die neue Position verschoben werden.
-Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich
-im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst
-danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber
-entsprechende Set..Hdl()-Methoden gesetzt werden.
+If the user should also be able to change the margins tabs, borders, ...
+in the ruler, a bit more effort is necessary. In this case, the StartDrag(),
+Drag() and EndDrag() methods have to be overridden. For the StartDrag() method
+it is possible to prevent dragging by returning FALSE. In the drag handler,
+the drag position must be queried and the values must be moved to the new
+position. This is done by calling the particular Set methods. While in the
+drag handler, the values are just cached and only afterward the ruler is redrawn.
+All the handlers can also be set as links with the particular Set..Hdl() methods.
- StartDrag()
- Wird gerufen, wenn das Draggen gestartet wird. Wenn sal_False
- zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei sal_True
- wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert
- wird, wird sal_False zurueckgegeben.
+ Is called when dragging is started. If FALSE is returned, the dragging.
+ won't be executed. If TRUE is returned, the dragging will be permitted.
+ If the handler isn't overridden, FALSE will be returned.
- EndDrag()
- Wird gerufen, wenn das Draggen beendet wird.
+ Is called at the end of dragging.
- Drag()
- Wird gerufen, wenn gedragt wird.
+ Is called when dragging takes place.
- Click()
- Dieser Handler wird gerufen, wenn kein Element angeklickt wurde.
- Die Position kann mit GetClickPos() abgefragt werden. Dadurch
- kann man zum Beispiel Tabs in das Lineal setzen. Nach Aufruf des
- Click-Handlers wird gegebenenfalls das Drag sofort ausgeloest. Dadurch
- ist es moeglich, einen neuen Tab im Click-Handler zu setzen und
- danach gleich zu verschieben.
+ This handler is called when no element has been clicked on.
+ The position can be queried with GetClickPos(). This way it is possible
+ to, for example, ser tabs in the ruler. After calling the click handler,
+ the drag, if any, is immediately triggered. This makes it possible to
+ set a new tab in the click handler and then immediately move it.
- DoubleClick()
- Dieser Handler wird gerufen, wenn ein DoubleClick ausserhalb des
- Extrafeldes gemacht wurde. Was angeklickt wurde, kann mit
- GetClickType(), GetClickAryPos() und GetClickPos() abgefragt werden.
- Somit kann man zum Beispiel den Tab-Dialog anzeigen, wenn ein
- Tab mit einem DoubleClick betaetigt wurde.
+ This handler is called when a double-click has been performed outside
+ the special panel. The methods GetClickType(), GetClickAryPos() and
+ GetClickPos() can be used to query what has been clicked on.
+ This way you can, for example, show the tab dialog when a double-click
+ is performed on a tab.
-Im Drag-Handler kann man abfragen, was und wohin gedragt wurde. Dazu gibt
-es folgende Abfrage-Methoden.
+In the drag handler it is possible to query what has been dragged and where
+it has been dragged. There are the following query methods:
- GetDragType()
- Liefert zurueck, was gedragt wird:
+ Returns what has been dragged.
RULER_TYPE_MARGIN1
RULER_TYPE_MARGIN2
RULER_TYPE_BORDER
@@ -292,8 +270,8 @@ es folgende Abfrage-Methoden.
RULER_TYPE_TAB
- GetDragPos()
- Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset
- zurueck, wohin der Anwender die Maus bewegt hat.
+ Returns the pixel position to which the user has moved the mouse
+ relative to the set zero-offset.
- GetDragAryPos()
Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein
@@ -690,6 +668,10 @@ private:
sal_uInt16 mnExtraStyle;
sal_uInt16 mnExtraClicks;
sal_uInt16 mnExtraModifier;
+// Amelia
+ long mnCharWidth;
+ long mnLineHeight;
+
RulerExtra meExtraType;
RulerType meDragType;
MapUnit meSourceUnit;
@@ -869,6 +851,13 @@ public:
//set text direction right-to-left
void SetTextRTL(sal_Bool bRTL);
+
+ void SetCharWidth( long nWidth ) { mnCharWidth = nWidth ; }
+ void SetLineHeight( long nHeight ) { mnLineHeight = nHeight ; }
+
+ void DrawTicks();
};
#endif // _RULER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx
index 5bb89969785b..bbca120ef017 100644
--- a/svtools/inc/svtools/scriptedtext.hxx
+++ b/svtools/inc/svtools/scriptedtext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx
index deeab0ee3fd9..f81b60d446de 100644
--- a/svtools/inc/svtools/scrwin.hxx
+++ b/svtools/inc/svtools/scrwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
class DataChangedEvent;
@@ -110,3 +109,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx
index 59611eb35844..1ac67e909b69 100644
--- a/svtools/inc/svtools/sfxecode.hxx
+++ b/svtools/inc/svtools/sfxecode.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,4 @@
#endif // #ifndef _SFXECODE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/soerr.hxx b/svtools/inc/svtools/soerr.hxx
index 41e488480039..05d3100f8f4e 100644
--- a/svtools/inc/svtools/soerr.hxx
+++ b/svtools/inc/svtools/soerr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/sores.hxx b/svtools/inc/svtools/sores.hxx
index e5a7e51b54cf..1b19a2c8144c 100644
--- a/svtools/inc/svtools/sores.hxx
+++ b/svtools/inc/svtools/sores.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@
// #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118)
#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119)
#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx
index 7856d96bcd77..0703a87f4d06 100644
--- a/svtools/inc/svtools/statusbarcontroller.hxx
+++ b/svtools/inc/svtools/statusbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,10 +43,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
-#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
-#define INCLUDED_HASH_MAP
-#endif
+#include <boost/unordered_map.hpp>
#include <tools/gen.hxx>
@@ -124,7 +122,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
@@ -156,3 +154,5 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu
}
#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx
index 4c0b794f78e3..b8f6a12019cd 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/svtools/inc/svtools/stdctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,12 +31,8 @@
#include "svtools/svtdllapi.h"
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
// -------------
// - FixedInfo -
@@ -71,3 +68,4 @@ namespace svt
#endif // _STDCTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx
index 34626dbd7721..d14a42e6a7b5 100644
--- a/svtools/inc/svtools/stdmenu.hxx
+++ b/svtools/inc/svtools/stdmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
-#ifndef _MENU_HXX
#include <vcl/menu.hxx>
-#endif
class FontList;
class FontInfo;
@@ -239,3 +238,5 @@ public:
};
#endif // _STDMENU_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx
index 9cfe75418a12..7295dec2a261 100644
--- a/svtools/inc/svtools/stringtransfer.hxx
+++ b/svtools/inc/svtools/stringtransfer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,4 @@ namespace svt
#endif // _SVTOOLS_STRINGTRANSFER_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index 6aab24a32d70..30773b101547 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _SVICNVW_HXX
#define _SVICNVW_HXX
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvImpIconView;
@@ -56,8 +55,7 @@ enum SvIconViewTextMode
ShowTextFull = 1,
ShowTextShort,
ShowTextSmart, // not implemented
- ShowTextDontKnow // nur fuer Eintraege (->Einstellung der View
- // wird genommen)
+ ShowTextDontKnow // only for entries (uses config? from the view)
};
class SvIcnVwDataEntry : public SvViewDataEntry
@@ -66,10 +64,10 @@ friend class SvImpIconView;
sal_uInt16 nIcnVwFlags;
SvIconViewTextMode eTextMode;
public:
- Rectangle aRect; // Bounding-Rect des Entries
- Rectangle aGridRect; // gesetzt im Grid-Modus
- Size aTextSize; // nur gesetzt im Grid-Modus
- sal_uInt16 nX,nY; // fuer Tastatursteuerung
+ Rectangle aRect; // Bounding-Rect of the Entry
+ Rectangle aGridRect; // set in grid mode
+ Size aTextSize; // set in grid mode only
+ sal_uInt16 nX,nY; // for keyboard control
SvIcnVwDataEntry();
virtual ~SvIcnVwDataEntry();
@@ -176,17 +174,17 @@ public:
using Window::GetDropTarget;
virtual SvLBoxEntry* GetDropTarget( const Point& );
virtual Region GetDragRegion() const;
- // NotifyMoving/Copying ueberladen, da wir bei GetDropTarget
- // einen "magic pointer" zurueckgeben, falls in einen leeren
- // Bereich auf der IconView gedroppt wird.
+ // NotifyMoving/Copying is overloaded, since GetDropTarget
+ // returns a "magic pointer" if the drop happens in/on an empty
+ // area(?) of the IconView
virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos);
virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos);
- // gibt TopLeft des BoundingRects zurueck
- // Konvertierung in Fensterposition: MapMode.Origin addieren
- Point GetEntryPosition( SvLBoxEntry* ) const;
+ // returns TopLeft of the BoundingRect. Add MapMode.Origin to get the
+ // position relative to the window
+ Point GetEntryPosition( SvLBoxEntry* ) const;
void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos);
void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos,
sal_Bool bAdjustAtGrid );
@@ -196,9 +194,9 @@ public:
using SvLBox::GetEntry;
SvLBoxEntry* GetEntry( const Point& rPixPos, sal_Bool ) const;
- // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder)
+ // returns the entry just above pCurEntry (z-wise)
SvLBoxEntry* GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const;
- // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder)
+ // returns the entry just below pCurEntry (z-wise)
SvLBoxEntry* GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const;
SvLBoxEntry* GetEntryFromLogicPos( const Point& rDocPos ) const;
@@ -219,12 +217,12 @@ public:
virtual SvLBoxEntry*
GetCurEntry() const;
- // logische Koordinaten
+ // locigal coordinates
void SelectRect(
const Rectangle& rRect,
sal_Bool bAdd = sal_False,
- // die Schnittmenge mit rRect wird invertiert
- // wird bei bAdd == sal_False ignoriert
+ // inverts the intersection with rRect
+ // (ignored if bAdd == sal_False)
SvPtrarr* pOtherRects = 0,
short nBorderOffs = -5 );
sal_uLong GetSelectionCount() const;
@@ -245,13 +243,13 @@ public:
virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
SvListEntry* pEntry2, sal_uLong nPos );
- // 0,0: Grid-Modus ausschalten
+ // pass (0, 0) to switch off grid mode
void SetGrid( long nDX, long nDY );
- // nDeltaY < 0 : View bewegt sich auf dem Doc nach oben
- // nDeltaY > 0 : View bewegt sich auf dem Doc nach unten
- // nDeltaX < 0 : View bewegt sich auf dem Doc nach links
- // nDeltaX > 0 : View bewegt sich auf dem Doc nach rechts
+ // nDeltaY < 0 : View moves up relative to Doc
+ // nDeltaY > 0 : View moves down relative to Doc
+ // nDeltaX < 0 : View moves left relative to Doc
+ // nDeltaX > 0 : View moves right relative to Doc
using Window::Scroll;
virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 );
@@ -266,7 +264,7 @@ public:
void HideDDIcon();
void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos );
- // fuers Scrollen beim D&D
+ // to scroll during Drag&Drop
void CalcScrollOffsets(
const Point& rRefPosPixel,
long& rScrollX,
@@ -288,3 +286,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index e6881e6ddb44..6ef90e9e7b97 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,9 @@
#include "svtools/svtdllapi.h"
-#ifndef LINK_HXX
#include <tools/link.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvLBoxEntry;
@@ -256,44 +253,40 @@ public:
void Clone( SvLBoxItem* pSource );
- sal_Bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- void GetModeImages( Image& _rBitmap1, Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+ sal_Bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 );
+ void GetModeImages( Image& _rBitmap1, Image& _rBitmap2 ) const;
- inline void SetBitmap1( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- inline void SetBitmap2( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- inline const Image& GetBitmap1( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
- inline const Image& GetBitmap2( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+ inline void SetBitmap1( const Image& _rImage );
+ inline void SetBitmap2( const Image& _rImage );
+ inline const Image& GetBitmap1( ) const;
+ inline const Image& GetBitmap2( ) const;
private:
- Image& implGetImageStore( sal_Bool _bFirst, BmpColorMode _eMode );
+ Image& implGetImageStore( sal_Bool _bFirst );
};
-inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage, BmpColorMode _eMode )
+inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage )
{
- implGetImageStore( sal_True, _eMode ) = _rImage;
+ implGetImageStore( sal_True ) = _rImage;
}
-inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage, BmpColorMode _eMode )
+inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage )
{
- implGetImageStore( sal_False, _eMode ) = _rImage;
+ implGetImageStore( sal_False ) = _rImage;
}
-inline const Image& SvLBoxContextBmp::GetBitmap1( BmpColorMode _eMode ) const
+inline const Image& SvLBoxContextBmp::GetBitmap1( ) const
{
- Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, _eMode );
- if ( !rImage )
- // fallback to the "normal" image
- rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, BMP_COLOR_NORMAL );
+ Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True );
return rImage;
}
-inline const Image& SvLBoxContextBmp::GetBitmap2( BmpColorMode _eMode ) const
+inline const Image& SvLBoxContextBmp::GetBitmap2( ) const
{
- Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False, _eMode );
- if ( !rImage )
- // fallback to the "normal" image
- rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, BMP_COLOR_NORMAL );
+ Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False );
return rImage;
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index fd524e512a9e..c56b740c6cc9 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,17 +36,11 @@
#define INCLUDED_DEQUE
#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/seleng.hxx>
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _ACCEL_HXX
#include <vcl/accel.hxx>
-#endif
#include <vcl/mnemonicengine.hxx>
#include <vcl/quickselectionengine.hxx>
#include <tools/gen.hxx>
@@ -195,9 +190,7 @@ class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry
SvPtrarr aItems;
void* pUserData;
sal_uInt16 nEntryFlags;
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void DeleteItems_Impl();
-//#endif
public:
SvLBoxEntry();
@@ -274,7 +267,6 @@ class SVT_DLLPUBLIC SvLBox
{
friend class SvLBoxEntry;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, SvInplaceEdit2 * );
// Handler, der von TreeList zum Clonen eines Entries aufgerufen wird
DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* );
@@ -288,7 +280,6 @@ class SVT_DLLPUBLIC SvLBox
SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvLBox& rB );
SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvLBox& rB );
DECL_DLLPRIVATE_STATIC_LINK( SvLBox, DragFinishHdl_Impl, sal_Int8* );
-//#endif
DragDropMode nOldDragMode;
@@ -408,7 +399,7 @@ public:
SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); }
SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));}
SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));}
- SvLBoxEntry* Last( sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Last(pDepth));}
+ SvLBoxEntry* Last() const { return (SvLBoxEntry*)(pModel->Last()); }
SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
@@ -608,12 +599,10 @@ class SvInplaceEdit : public Edit
sal_Bool bCanceled;
sal_Bool bAlreadyInCallBack;
-//#if 0 // _SOLAR__PRIVATE
void CallCallBackHdl_Impl();
DECL_LINK( Timeout_Impl, Timer * );
DECL_LINK( ReturnHdl_Impl, Accelerator * );
DECL_LINK( EscapeHdl_Impl, Accelerator * );
-//#endif
public:
SvInplaceEdit( Window* pParent, const Point& rPos, const Size& rSize,
@@ -639,12 +628,10 @@ class SvInplaceEdit2
sal_Bool bAlreadyInCallBack;
sal_Bool bMultiLine;
-//#if 0 // _SOLAR__PRIVATE
void CallCallBackHdl_Impl();
DECL_LINK( Timeout_Impl, Timer * );
DECL_LINK( ReturnHdl_Impl, Accelerator * );
DECL_LINK( EscapeHdl_Impl, Accelerator * );
-//#endif
public:
SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize,
@@ -672,3 +659,5 @@ inline SvViewDataItem* SvLBox::GetViewDataItem( SvListEntry* pEntry,
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 01c2c46fee91..5ff8ab4de8a3 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,3 +153,5 @@ inline sal_uLong MultiLineEdit::IsUpdateDataEnabled() const
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index 70bd623fef0a..9710f1e5bf6d 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx
index 7eac9c93d425..b82a5a85e36e 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/svtools/inc/svtools/svparser.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _SVPARSER_HXX
#define _SVPARSER_HXX
@@ -282,4 +281,4 @@ SV_IMPL_REF(SvKeyValueIterator);
#endif //_SVPARSER_HXX
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index be891d69bbbc..aa32ebe019da 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -202,7 +203,7 @@ public:
virtual sal_Bool HasRowHeader() const; //GetColumnId
/** @return <TRUE/>, if the object can focus a cell. */
virtual sal_Bool IsCellFocusable() const;
- virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+ virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
virtual void SetNoSelection();
using SvListView::SelectAll;
@@ -266,3 +267,4 @@ public:
#endif // #ifndef _SVTABBX_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index d2012f067e38..f647c6ee32e2 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,4 @@ public:
#endif // _SVTOOLS_SVTDATA_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svtdllapi.h b/svtools/inc/svtools/svtdllapi.h
index d230d7e76d0c..5a15b20c2020 100644
--- a/svtools/inc/svtools/svtdllapi.h
+++ b/svtools/inc/svtools/svtdllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,4 @@
#endif /* INCLUDED_SVTDLLAPI_H */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 554fc63f5c7c..c6e05f2ad5d3 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -6,9 +6,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: svtools.hrc,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,15 +25,15 @@
*
************************************************************************/
#ifndef _SVTOOLS_HRC
-#define _SVTOOLS_HRC "$Revision: 1.0"
+#define _SVTOOLS_HRC
#include <svl/solar.hrc>
#define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0)
#define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0)
-#define ABOUT_STR_COPYRIGHT (RID_SVTOOLS_START + 1)
-#define ABOUT_STR_DEVELOPER_ARY (RID_SVTOOLS_START + 2)
+//#define ABOUT_STR_COPYRIGHT (RID_SVTOOLS_START + 1)
+//#define ABOUT_STR_DEVELOPER_ARY (RID_SVTOOLS_START + 2)
//.............................................................................
// various unsorted stuff
@@ -66,6 +63,7 @@
#define RID_FILEOPEN_INVALIDFOLDER (RID_SVTOOLS_START + 34)
#define RID_FILEOPEN_NOTEXISTENTFILE (RID_SVTOOLS_START + 35)
#define STR_SVT_NOREMOVABLEDEVICE (RID_SVTOOLS_START + 36)
+#define STR_SVT_ALLFORMATS (RID_SVTOOLS_START + 37)
// doc template dialog
#define DLG_DOCTEMPLATE (RID_SVTOOLS_START+50)
@@ -148,7 +146,7 @@
#define STR_SVT_PRNDLG_POWER_SAVE (STR_SVT_PRNDLG_START+26)
#define STR_SVT_PRNDLG_DEFPRINTER (STR_SVT_PRNDLG_START+27)
#define STR_SVT_PRNDLG_JOBCOUNT (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END (RID_IMG_PRNDLG_NOCOLLATE_HC)
+#define STR_SVT_PRNDLG_END (RID_IMG_PRNDLG_NOCOLLATE)
#define STR_SVT_CALENDAR_START (STR_SVT_PRNDLG_END+1)
#define STR_SVT_CALENDAR_DAY (STR_SVT_CALENDAR_START+0)
@@ -286,6 +284,8 @@
// String array to match UI language names to LanguageType values and vice versa
#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1)
#define STR_ARR_SVT_LANGUAGE_TABLE (STR_ARR_SVT_LANGUAGE_TABLE_START + 0)
+//due to some horror wizards/com/sun/star/wizards/letter/LocaleCodes.java needs to be kept
+//manually in sync with STR_ARR_SVT_LANGUAGE_TABLE
#define STR_ARR_SVT_LANGUAGE_TABLE_END (STR_ARR_SVT_LANGUAGE_TABLE)
//.............................................................................
@@ -307,6 +307,7 @@
#define BMP_HELP_AGENT_IMAGE (RID_SVTOOLS_BITMAP_START + 1)
#define BMP_HELP_AGENT_CLOSER (RID_SVTOOLS_BITMAP_START + 2)
#define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3)
+#define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4)
//.............................................................................
// image lists
@@ -315,11 +316,7 @@
#define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1)
#define RID_SVTOOLS_IMAGELIST_SMALL (RID_SVTOOLS_IMAGELIST_START + 2)
#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX (RID_SVTOOLS_IMAGELIST_START + 3)
-#define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST (RID_SVTOOLS_IMAGELIST_START + 4)
-#define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST (RID_SVTOOLS_IMAGELIST_START + 5)
-#define RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H (RID_SVTOOLS_IMAGELIST_START + 6)
#define RID_FILEPICKER_IMAGES (RID_SVTOOLS_IMAGELIST_START + 7)
-#define RID_FILEPICKER_IMAGES_HC (RID_SVTOOLS_IMAGELIST_START + 8)
//.............................................................................
// error boxes
@@ -340,20 +337,13 @@
// images
#define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0)
#define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1)
-#define RID_IMG_TREENODE_COLLAPSED_HC (RID_SVTOOLS_START + 2)
-#define RID_IMG_TREENODE_EXPANDED_HC (RID_SVTOOLS_START + 3)
#define RID_IMG_PRINTERFONT (RID_SVTOOLS_START + 12)
#define RID_IMG_BITMAPFONT (RID_SVTOOLS_START + 13)
#define RID_IMG_SCALABLEFONT (RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC (RID_SVTOOLS_START + 15)
-#define RID_IMG_BITMAPFONT_HC (RID_SVTOOLS_START + 16)
-#define RID_IMG_SCALABLEFONT_HC (RID_SVTOOLS_START + 17)
#define IMG_TRIANGLE_RIGHT (RID_SVTOOLS_START + 18)
-#define IMG_TRIANGLE_RIGHT_HC (RID_SVTOOLS_START + 19)
#define IMG_TRIANGLE_DOWN (RID_SVTOOLS_START + 20)
-#define IMG_TRIANGLE_DOWN_HC (RID_SVTOOLS_START + 21)
#define IMG_SVT_FOLDER (RID_SVTOOLS_START + 40)
@@ -362,11 +352,6 @@
#define IMG_SVT_TEMPLATES (RID_SVTOOLS_START + 54)
#define IMG_SVT_SAMPLES (RID_SVTOOLS_START + 55)
-#define IMG_SVT_NEWDOC_HC (RID_SVTOOLS_START + 59)
-#define IMG_SVT_MYDOCS_HC (RID_SVTOOLS_START + 60)
-#define IMG_SVT_TEMPLATES_HC (RID_SVTOOLS_START + 61)
-#define IMG_SVT_SAMPLES_HC (RID_SVTOOLS_START + 62)
-
#define IMG_SVT_DOCTEMPLATE_BACK_SMALL (RID_SVTOOLS_START + 70)
#define IMG_SVT_DOCTEMPLATE_BACK_LARGE (RID_SVTOOLS_START + 71)
#define IMG_SVT_DOCTEMPLATE_PREV_SMALL (RID_SVTOOLS_START + 72)
@@ -378,21 +363,8 @@
#define IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL (RID_SVTOOLS_START + 78)
#define IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE (RID_SVTOOLS_START + 79)
-#define IMG_SVT_DOCTEMPL_HC_BACK_SMALL (RID_SVTOOLS_START + 80)
-#define IMG_SVT_DOCTEMPL_HC_BACK_LARGE (RID_SVTOOLS_START + 81)
-#define IMG_SVT_DOCTEMPL_HC_PREV_SMALL (RID_SVTOOLS_START + 82)
-#define IMG_SVT_DOCTEMPL_HC_PREV_LARGE (RID_SVTOOLS_START + 83)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_SMALL (RID_SVTOOLS_START + 84)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_LARGE (RID_SVTOOLS_START + 85)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL (RID_SVTOOLS_START + 86)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE (RID_SVTOOLS_START + 87)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL (RID_SVTOOLS_START + 88)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE (RID_SVTOOLS_START + 89)
-
#define RID_IMG_PRNDLG_COLLATE (STR_SVT_PRNDLG_START + 29)
#define RID_IMG_PRNDLG_NOCOLLATE (STR_SVT_PRNDLG_START + 30)
-#define RID_IMG_PRNDLG_COLLATE_HC (STR_SVT_PRNDLG_START + 31)
-#define RID_IMG_PRNDLG_NOCOLLATE_HC (STR_SVT_PRNDLG_START + 32)
// IAccessible2 implementation in 2009
#define STR_PARAGRAPH_START (STR_SVT_PRNDLG_START + 50)
@@ -401,5 +373,3 @@
#endif // #ifndef _SVTOOLS_HRC
-// ******************************************************************* EOF
-
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index 7705050bc3ca..6edd32110317 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _SVTREEBOX_HXX
#define _SVTREEBOX_HXX
@@ -80,12 +82,12 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
#ifdef _SVTREEBX_CXX
DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
- SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
- SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize);
+ SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
+ SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize);
SVT_DLLPRIVATE void SetEntryHeight( SvLBoxEntry* pEntry );
SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp );
- SVT_DLLPRIVATE void AdjustEntryHeight( const Font& rFont );
+ SVT_DLLPRIVATE void AdjustEntryHeight( const Font& rFont );
SVT_DLLPRIVATE void ImpEntryInserted( SvLBoxEntry* pEntry );
SVT_DLLPRIVATE long PaintEntry1( SvLBoxEntry*, long nLine,
@@ -93,7 +95,7 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
sal_Bool bHasClipRegion=sal_False );
SVT_DLLPRIVATE void InitTreeView();
- SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
+ SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
sal_uInt16 nEmptyWidth );
SVT_DLLPRIVATE void ImplInitStyle();
@@ -178,25 +180,26 @@ public:
void EnableCheckButton( SvLBoxButtonData* );
void SetCheckButtonData( SvLBoxButtonData* );
- void SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- void SetDontKnowNodeBitmap( const Image& rDontKnowBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+ void SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp );
/** returns the default image which clients should use for expanded nodes, to have a consistent user
interface experience in the whole product.
*/
- static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+ static const Image& GetDefaultExpandedNodeImage( );
/** returns the default image which clients should use for expanded nodes, to have a consistent user
interface experience in the whole product.
*/
- static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+ static const Image& GetDefaultCollapsedNodeImage( );
/** sets default bitmaps for collapsed and expanded nodes.
*/
inline void SetNodeDefaultImages( )
{
- SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_NORMAL ), GetDefaultExpandedNodeImage( BMP_COLOR_NORMAL ), BMP_COLOR_NORMAL );
- SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_HIGHCONTRAST ), GetDefaultExpandedNodeImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
+ SetNodeBitmaps(
+ GetDefaultCollapsedNodeImage( ),
+ GetDefaultExpandedNodeImage( )
+ );
}
virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
@@ -212,11 +215,11 @@ public:
sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
- const Image& GetDefaultExpandedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
- const Image& GetDefaultCollapsedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+ const Image& GetDefaultExpandedEntryBmp( ) const;
+ const Image& GetDefaultCollapsedEntryBmp( ) const;
- void SetDefaultExpandedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- void SetDefaultCollapsedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+ void SetDefaultExpandedEntryBmp( const Image& rBmp );
+ void SetDefaultCollapsedEntryBmp( const Image& rBmp );
void SetCheckButtonState( SvLBoxEntry*, SvButtonState );
SvButtonState GetCheckButtonState( SvLBoxEntry* ) const;
@@ -225,13 +228,13 @@ public:
sal_Bool IsExpandBitmapOnCursor() const { return (sal_Bool)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
void SetEntryText(SvLBoxEntry*, const XubString& );
- void SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- void SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+ void SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
+ void SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
virtual String GetEntryText( SvLBoxEntry* pEntry ) const;
String SearchEntryText( SvLBoxEntry* pEntry ) const;
- const Image& GetExpandedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
- const Image& GetCollapsedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+ const Image& GetExpandedEntryBmp(SvLBoxEntry* _pEntry ) const;
+ const Image& GetCollapsedEntryBmp(SvLBoxEntry* _pEntry ) const;
void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; }
Link GetCheckButtonHdl() const { return aCheckButtonHdl; }
@@ -301,10 +304,10 @@ public:
virtual void MakeVisible( SvLBoxEntry* );
void MakeVisible( SvLBoxEntry*, sal_Bool bMoveToTop );
- void SetCollapsedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- void SetExpandedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL );
- Image GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
- Image GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+ void SetCollapsedNodeBmp( const Image& );
+ void SetExpandedNodeBmp( const Image& );
+ Image GetCollapsedNodeBmp( ) const;
+ Image GetExpandedNodeBmp( ) const;
void SetFont( const Font& rFont );
@@ -414,3 +417,4 @@ protected:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx
index 5697f39a4ca7..0759e212bb9f 100644
--- a/svtools/inc/svtools/svxbox.hxx
+++ b/svtools/inc/svtools/svxbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,3 +188,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx
index c5ab6d78059c..73936870157a 100644
--- a/svtools/inc/svtools/sychconv.hxx
+++ b/svtools/inc/svtools/sychconv.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ public:
};
#endif // _CHARCONV_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index 5539e97b7a4d..a9a0c5a2da58 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,8 +30,7 @@
#include <list>
-#include <vos/macros.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -45,7 +45,7 @@
#ifdef WNT
#define CDECL _cdecl
#endif
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
#define CDECL
#endif
#ifdef UNX
@@ -186,3 +186,5 @@ public:
HighlighterLanguage GetLanguage() { return eLanguage;}
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index cab942b452b6..a8bdabdb6432 100644
--- a/svtools/inc/svtools/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,15 +32,18 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
#include <vcl/window.hxx>
+#include <vector>
class MouseEvent;
class TrackingEvent;
class DataChangedEvent;
-class ImplTabBarList;
class ImplTabButton;
class ImplTabSizer;
class TabBarEdit;
+struct ImplTabBarItem;
+typedef ::std::vector< ImplTabBarItem* > ImplTabBarList;
+
// -----------------
// - Dokumentation -
// -----------------
@@ -302,6 +306,7 @@ ueber einem bzw. ueber welchem Item durchgefuehrt wurde.
#define WB_TOPBORDER ((WinBits)0x04000000)
#define WB_3DTAB ((WinBits)0x08000000)
#define WB_MINSCROLL ((WinBits)0x20000000)
+#define WB_INSERTTAB ((WinBits)0x40000000)
#define WB_STDTABBAR WB_BORDER
// ------------------
@@ -328,6 +333,7 @@ typedef sal_uInt16 TabBarPageBits;
// - TabBar -
// ----------
struct TabBar_Impl;
+struct ImplTabBarItem;
class SVT_DLLPUBLIC TabBar : public Window
{
@@ -371,6 +377,7 @@ private:
sal_Bool mbSelColor;
sal_Bool mbSelTextColor;
sal_Bool mbMirrored;
+ bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end.
Link maSelectHdl;
Link maDoubleClickHdl;
Link maSplitHdl;
@@ -379,6 +386,7 @@ private:
Link maStartRenamingHdl;
Link maAllowRenamingHdl;
Link maEndRenamingHdl;
+ size_t maCurrentItemList;
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
@@ -394,11 +402,19 @@ private:
SVT_DLLPRIVATE void ImplSelect();
SVT_DLLPRIVATE void ImplActivatePage();
SVT_DLLPRIVATE long ImplDeactivatePage();
+ SVT_DLLPRIVATE void ImplPrePaint();
+ SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount );
+ SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const;
DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* );
+ ImplTabBarItem* seek( size_t i );
+ ImplTabBarItem* prev();
+ ImplTabBarItem* next();
+
public:
static const sal_uInt16 APPEND;
static const sal_uInt16 PAGE_NOT_FOUND;
+ static const sal_uInt16 INSERT_TAB_POS;
TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR );
virtual ~TabBar();
@@ -443,7 +459,7 @@ public:
sal_uInt16 GetPageCount() const;
sal_uInt16 GetPageId( sal_uInt16 nPos ) const;
sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const;
- sal_uInt16 GetPageId( const Point& rPos ) const;
+ sal_uInt16 GetPageId( const Point& rPos, bool bCheckInsTab = false ) const;
Rectangle GetPageRect( sal_uInt16 nPageId ) const;
// returns the rectangle in which page tabs are drawn
Rectangle GetPageArea() const;
@@ -558,3 +574,5 @@ public:
};
#endif // _TABBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/svtools/inc/svtools/table/defaultinputhandler.hxx
index 6990f903cdb2..3b05fe15d996 100644
--- a/svtools/inc/svtools/table/defaultinputhandler.hxx
+++ b/svtools/inc/svtools/table/defaultinputhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -68,3 +69,5 @@ namespace svt { namespace table
//......................................................................................................................
#endif // SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx
index c472fa408574..9e3322695439 100644
--- a/svtools/inc/svtools/table/gridtablerenderer.hxx
+++ b/svtools/inc/svtools/table/gridtablerenderer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -130,3 +131,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index 8afc2209227c..726490a0710b 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -224,3 +225,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_TABLECONTROL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/svtools/inc/svtools/table/tableinputhandler.hxx
index 87803f03e240..a3153d96e8ac 100644
--- a/svtools/inc/svtools/table/tableinputhandler.hxx
+++ b/svtools/inc/svtools/table/tableinputhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -76,3 +77,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_TABLEINPUTHANDLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/svtools/inc/svtools/table/tablemodel.hxx
index 94f03b684e64..6e962befefc8 100755..100644
--- a/svtools/inc/svtools/table/tablemodel.hxx
+++ b/svtools/inc/svtools/table/tablemodel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -518,3 +519,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_TABLEMODEL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx
index 3d50c9d70ee7..a0fc93b665c3 100644
--- a/svtools/inc/svtools/table/tablerenderer.hxx
+++ b/svtools/inc/svtools/table/tablerenderer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -271,3 +272,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_TABLERENDERER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/table/tablesort.hxx b/svtools/inc/svtools/table/tablesort.hxx
index 1690b4d51344..1690b4d51344 100755..100644
--- a/svtools/inc/svtools/table/tablesort.hxx
+++ b/svtools/inc/svtools/table/tablesort.hxx
diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/svtools/inc/svtools/table/tabletypes.hxx
index ae20851992e3..2fd5a550b782 100644
--- a/svtools/inc/svtools/table/tabletypes.hxx
+++ b/svtools/inc/svtools/table/tabletypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -67,3 +68,5 @@ namespace svt { namespace table
//........................................................................
#endif // SVTOOLS_INC_TABLE_TABLETYPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx
index b254473c7f19..4fb126e5eefe 100644
--- a/svtools/inc/svtools/taskbar.hxx
+++ b/svtools/inc/svtools/taskbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,20 +31,21 @@
#include "svtools/svtdllapi.h"
#include <tools/time.hxx>
-#ifndef _TOOLS_LIST_HXX
-#include <tools/list.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/status.hxx>
class TaskBar;
class TaskStatusFieldItem;
-class ImplTaskItemList;
-class ImplTaskSBItemList;
class ImplTaskBarFloat;
struct ImplTaskSBFldItem;
+struct ImplTaskItem;
+typedef ::std::vector< ImplTaskItem* > ImplTaskItemList;
+
+struct ImplTaskSBFldItem;
+typedef ::std::vector< ImplTaskSBFldItem* > ImplTaskSBItemList;
+
// -----------------
// - Dokumentation -
// -----------------
@@ -60,18 +62,13 @@ Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend
neu angeordnet werden.
ActivateTask()
-Handler der gerufen wird, wenn ein Task aktiviert werden muss. Mit
-GetTaskItem() kann abgefragt werden, welcher Task aktiviert werden muss.
+Handler der gerufen wird, wenn ein Task aktiviert werden muss.
ContextMenu()
Dieser Handler wird gerufen, wenn ein ContextMenu angezeigt werden soll.
Mit GetTaskMode() kann abgefragt werden, ob fuer einen Task oder ein
Item.
-GetTaskItem()
-Diese Methode liefert das Item zurueck, welches bei UpdateTask an der
-entsprechenden Position eingefuegt wurde.
-
GetContextMenuPos()
Liefert die Position zurueck, wo das Contextmenu angezeigt werden soll.
@@ -158,12 +155,6 @@ public:
{ RemoveItem( nItemId ); }
};
-// ---------------------
-// - TaskToolBox-Types -
-// ---------------------
-
-#define TASKTOOLBOX_TASK_NOTFOUND ((sal_uInt16)0xFFFF)
-
// ---------------
// - TaskToolBox -
// ---------------
@@ -176,14 +167,13 @@ private:
ImplTaskItemList* mpItemList;
TaskBar* mpNotifyTaskBar;
Point maContextMenuPos;
- sal_uLong mnOldItemCount;
+ size_t mnOldItemCount;
long mnMaxTextWidth;
long mnDummy1;
- sal_uInt16 mnUpdatePos;
- sal_uInt16 mnUpdateNewPos;
- sal_uInt16 mnActiveItemId;
- sal_uInt16 mnNewActivePos;
- sal_uInt16 mnTaskItem;
+ size_t mnUpdatePos;
+ size_t mnUpdateNewPos;
+ size_t mnActiveItemId;
+ size_t mnNewActivePos;
sal_uInt16 mnSmallItem;
sal_uInt16 mnDummy2;
sal_Bool mbMinActivate;
@@ -205,7 +195,6 @@ public:
void ActivateTaskItem( sal_uInt16 nItemId,
sal_Bool bMinActivate = sal_False );
- sal_uInt16 GetTaskItem( const Point& rPos ) const;
virtual void ActivateTask();
virtual void ContextMenu();
@@ -223,7 +212,6 @@ public:
void EndUpdateTask();
const Point& GetContextMenuPos() const { return maContextMenuPos; }
- sal_uInt16 GetTaskItem() const { return mnTaskItem; }
sal_Bool IsMinActivate() const { return mbMinActivate; }
void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; }
@@ -232,15 +220,6 @@ public:
const Link& GetContextMenuHdl() const { return maContextMenuHdl; }
};
-inline sal_uInt16 TaskToolBox::GetTaskItem( const Point& rPos ) const
-{
- sal_uInt16 nId = GetItemId( rPos );
- if ( nId )
- return nId-1;
- else
- return TASKTOOLBOX_TASK_NOTFOUND;
-}
-
// ---------------------
// - ITaskStatusNotify -
// ---------------------
@@ -488,3 +467,5 @@ public:
};
#endif // _TASKBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx
index 25d5080bd748..9be90a0eaad6 100644
--- a/svtools/inc/svtools/templatefoldercache.hxx
+++ b/svtools/inc/svtools/templatefoldercache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ namespace svt
//.........................................................................
#endif // SFX2_TEMPLATEFOLDERCACHE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx
index f08f7cc8770d..ba62c3ec5a89 100644
--- a/svtools/inc/svtools/templdlg.hxx
+++ b/svtools/inc/svtools/templdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,4 @@ private:
#endif // _SVTOOLS_TEMPLDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/testtool.hxx b/svtools/inc/svtools/testtool.hxx
index be0f217f4475..0129a326f001 100644
--- a/svtools/inc/svtools/testtool.hxx
+++ b/svtools/inc/svtools/testtool.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ protected:
};
#endif // SVTOOLS_TESTTOOL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx
index e9654cc0378b..97869f2489cd 100644
--- a/svtools/inc/svtools/textdata.hxx
+++ b/svtools/inc/svtools/textdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,3 +184,5 @@ public:
};
#endif // _TEXTDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index 5a50fee0f68b..ba2c440f6d98 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,9 +62,7 @@ class TETextPortion;
#include <tools/string.hxx>
#include <tools/gen.hxx>
-#ifndef _COM_SUN_STAR_LOCALE_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
struct TEIMEInfos;
@@ -332,3 +331,4 @@ public:
#endif // _TEXTENG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index f1f25685e68b..de8da807a3dd 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,7 +77,7 @@ protected:
void ImpShowHideSelection( sal_Bool bShow, const TextSelection* pRange = NULL );
TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent );
- TextPaM ImpDelete( sal_Bool bForward, sal_uInt8 nMode );
+ TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode );
void ImpSetSelection( const TextSelection& rNewSel, sal_Bool bUI );
sal_Bool IsInSelection( const TextPaM& rPaM );
@@ -222,3 +223,5 @@ public:
};
#endif // _TEXTVIEW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/svtools/inc/svtools/textwindowpeer.hxx
index b80eb7ea89f0..a01af5bf4c58 100644
--- a/svtools/inc/svtools/textwindowpeer.hxx
+++ b/svtools/inc/svtools/textwindowpeer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ private:
}
#endif // INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/svtools/inc/svtools/toolbarmenu.hxx
index 92b873158a98..362a57c21f96 100644
--- a/svtools/inc/svtools/toolbarmenu.hxx
+++ b/svtools/inc/svtools/toolbarmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ private:
} // namespace svtools
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx
index 7a49b294759c..af451e5d67bf 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/svtools/inc/svtools/toolboxcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,10 +50,8 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/interfacecontainer.hxx>
//end
-#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
-#define INCLUDED_HASH_MAP
-#endif
+
+#include <boost/unordered_map.hpp>
class ToolBox;
@@ -144,7 +143,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::std::hash_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< ::rtl::OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > URLToDispatchMap;
@@ -156,7 +155,6 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
void unbindListener();
sal_Bool isBound() const;
sal_Bool hasBigImages() const;
- sal_Bool isHighContrast() const;
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const;
@@ -173,3 +171,5 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
}
#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
index da03d7c6c3aa..7c5d7062c51d 100755..100644
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -102,3 +103,5 @@ namespace svt
//........................................................................
#endif // SVT_DECKLAYOUTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
index 0ecf493d0e98..4a196909a178 100644
--- a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -100,3 +101,5 @@ private:
//......................................................................................................................
#endif // SVT_DRAWERLAYOUTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
index 0d24b76e5684..80e1a7e82d36 100644
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -100,3 +101,4 @@ namespace svt
#endif // SVT_PANELTABBAR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/svtools/inc/svtools/toolpanel/refbase.hxx
index 991d6e619090..4ca3ff32bb55 100644
--- a/svtools/inc/svtools/toolpanel/refbase.hxx
+++ b/svtools/inc/svtools/toolpanel/refbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -78,3 +79,5 @@ namespace svt
//........................................................................
#endif // SVT_REFBASE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/svtools/inc/svtools/toolpanel/tabalignment.hxx
index cc3f17469ffe..708e4c9255c7 100644
--- a/svtools/inc/svtools/toolpanel/tabalignment.hxx
+++ b/svtools/inc/svtools/toolpanel/tabalignment.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -45,3 +46,5 @@ namespace svt
//........................................................................
#endif // SVT_TABALIGNMENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
index a1cf9deae9f4..b7aa7e52c0e5 100644
--- a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
+++ b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -46,3 +47,5 @@ namespace svt
//........................................................................
#endif // SVT_TABITEMCONTENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
index 92b36acf9114..18051d636108 100755..100644
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -110,3 +111,5 @@ namespace svt
//........................................................................
#endif // SVT_TABLAYOUTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index d38d8e7d257d..9a6f29784040 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -144,3 +145,5 @@ namespace svt
//........................................................................
#endif // SVT_TOOLPANEL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
index 15367703f39a..8c277c80c9df 100755..100644
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -191,3 +192,5 @@ namespace svt
//........................................................................
#endif // SVT_TOOLPANELDECK_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx
index e50d516f5aa1..af01de65c316 100644
--- a/svtools/inc/svtools/tooltiplbox.hxx
+++ b/svtools/inc/svtools/tooltiplbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,4 @@ protected:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index ce7d1fdc5e47..397dccfc0fe6 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,7 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/io/XInputStream.hpp>
// ------------------------
@@ -589,3 +588,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 6576b6a736b2..6c296d26ea44 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,11 +31,9 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
-#include <tools/list.hxx>
+#include <vector>
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <tools/debug.hxx>
@@ -63,19 +62,89 @@
class SvListEntry;
-class SvTreeEntryList : public List // SvEntryListStd
+//=============================================================================
+
+typedef ::std::vector< SvListEntry* > SvTreeEntryList_impl;
+
+class SVT_DLLPUBLIC SvTreeEntryList
{
+private:
+ SvTreeEntryList_impl maEntryList;
+ size_t maCurrent;
+
public:
- SvTreeEntryList(sal_uInt16 nInitPos=16, sal_uInt16 nResize=16 )
- : List( nInitPos, nResize )
- {}
- SvTreeEntryList(sal_uInt16 BlockSize, sal_uInt16 InitSize, sal_uInt16 Resize )
- : List(BlockSize, InitSize, Resize )
- {}
-
- void DestroyAll();
+ SvTreeEntryList() { maCurrent = 0; };
+ SvTreeEntryList( SvTreeEntryList& rList );
+
+ void DestroyAll();
+ void push_back( SvListEntry* pItem )
+ { maEntryList.push_back( pItem ); }
+ void insert( SvListEntry* pItem, size_t i )
+ {
+ if ( i < maEntryList.size() ) {
+ maEntryList.insert( maEntryList.begin() + i, pItem );
+ } else {
+ maEntryList.push_back( pItem );
+ }
+ }
+ void remove( SvListEntry* pItem )
+ {
+ for ( SvTreeEntryList_impl::iterator it = maEntryList.begin();
+ it < maEntryList.end();
+ ++it
+ ) {
+ if ( *it == pItem ) {
+ maEntryList.erase( it );
+ break;
+ }
+ }
+ }
+ void remove( size_t i )
+ {
+ if ( i < maEntryList.size() ) {
+ maEntryList.erase( maEntryList.begin() + i );
+ }
+ }
+ void replace( SvListEntry* pNew, SvListEntry* pOld )
+ {
+ for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) {
+ if ( maEntryList[ i ] == pOld ) {
+ maEntryList[ i ] = pNew;
+ break;
+ }
+ }
+ }
+ void clear() { maEntryList.clear(); }
+
+ bool empty() { return maEntryList.empty(); }
+
+ size_t size() { return maEntryList.size(); }
+ size_t GetPos( SvListEntry* pItem )
+ {
+ for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) {
+ if ( maEntryList[ i ] == pItem ) {
+ return i;
+ }
+ }
+ return (size_t)~0;
+ }
+
+ SvListEntry* operator[]( size_t i )
+ { return i < maEntryList.size() ? maEntryList[ i ] : NULL; }
+ SvListEntry* First()
+ {
+ maCurrent = 0;
+ return ( maCurrent < maEntryList.size() ) ? maEntryList[ 0 ] : NULL;
+ }
+ SvListEntry* Next()
+ {
+ return ( maCurrent+1 < maEntryList.size() ) ? maEntryList[ ++maCurrent ] : NULL;
+ }
+ SvListEntry* last() { return maEntryList.empty() ? NULL : maEntryList.back(); }
};
+//=============================================================================
+
class SVT_DLLPUBLIC SvListEntry
{
friend class SvTreeList;
@@ -84,31 +153,34 @@ friend class SvListView;
private:
SvListEntry* pParent;
SvTreeEntryList* pChilds;
- sal_uLong nAbsPos;
- sal_uLong nListPos;
+ sal_uLong nAbsPos;
+ sal_uLong nListPos;
void SetListPositions();
void InvalidateChildrensListPositions()
- {
- nListPos |= 0x80000000;
- }
+ {
+ nListPos |= 0x80000000;
+ }
+
public:
SvListEntry();
SvListEntry( const SvListEntry& );
virtual ~SvListEntry();
- sal_Bool HasChilds() { return (sal_Bool)(pChilds!=0); }
- sal_Bool HasChildListPos() const
+ sal_Bool HasChilds() { return (sal_Bool)(pChilds!=0); }
+ sal_Bool HasChildListPos() const
{
if( pParent && !(pParent->nListPos & 0x80000000) )
return sal_True;
else return sal_False;
}
- sal_uLong GetChildListPos() const
+
+ sal_uLong GetChildListPos() const
{
if( pParent && (pParent->nListPos & 0x80000000) )
pParent->SetListPositions();
return ( nListPos & 0x7fffffff );
}
+
virtual void Clone( SvListEntry* pSource );
};
@@ -119,26 +191,38 @@ class SvViewData
friend class SvTreeList;
friend class SvListView;
- sal_uLong nVisPos;
+ sal_uLong nVisPos;
protected:
- sal_uInt16 nFlags;
+ sal_uInt16 nFlags;
public:
- SvViewData();
- SvViewData( const SvViewData& );
- virtual ~SvViewData();
-
- sal_Bool IsSelected() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_SELECTED)!=0; }
- sal_Bool IsExpanded() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_EXPANDED)!=0; }
- sal_Bool HasFocus() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_FOCUSED)!=0; }
- void SetFocus( sal_Bool bFocus)
+ SvViewData();
+ SvViewData( const SvViewData& );
+ virtual ~SvViewData();
+
+ sal_Bool IsSelected() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_SELECTED) != 0; }
+
+ sal_Bool IsExpanded() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_EXPANDED) != 0; }
+
+ sal_Bool HasFocus() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_FOCUSED) != 0; }
+
+ sal_Bool IsCursored() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_CURSORED) != 0; }
+
+ bool IsSelectable() const
+ { return (bool)(nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0; }
+
+ void SetFocus( sal_Bool bFocus)
{
if ( !bFocus )
nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
else
nFlags |= SVLISTENTRYFLAG_FOCUSED;
}
- sal_Bool IsCursored() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_CURSORED)!=0; }
- void SetCursored( sal_Bool bCursored )
+
+ void SetCursored( sal_Bool bCursored )
{
if ( !bCursored )
nFlags &= (~SVLISTENTRYFLAG_CURSORED);
@@ -146,16 +230,16 @@ public:
nFlags |= SVLISTENTRYFLAG_CURSORED;
}
- sal_uInt16 GetFlags() const { return nFlags; }
+ sal_uInt16 GetFlags() const
+ { return nFlags; }
- void SetSelectable( bool bSelectable )
+ void SetSelectable( bool bSelectable )
{
if( bSelectable )
nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
else
nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
}
- bool IsSelectable() const { return (bool)(nFlags&SVLISTENTRYFLAG_NOT_SELECTABLE)==0; }
};
enum SvSortMode { SortAscending, SortDescending, SortNone };
@@ -169,122 +253,143 @@ struct SvSortData
SvListEntry* pRight;
};
+typedef ::std::vector< SvListView* > SvListView_impl;
+
class SVT_DLLPUBLIC SvTreeList
{
- friend class SvListView;
+ friend class SvListView;
- List aViewList;
+ SvListView_impl aViewList;
sal_uLong nEntryCount;
- Link aCloneLink;
- Link aCompareLink;
- SvSortMode eSortMode;
+ Link aCloneLink;
+ Link aCompareLink;
+ SvSortMode eSortMode;
sal_uInt16 nRefCount;
sal_Bool bAbsPositionsValid;
- SvListEntry* FirstVisible() const { return First(); }
- SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const;
- SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
- SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
+ SvListEntry* FirstVisible() const { return First(); }
+ SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const;
+ SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
+ SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
sal_Bool IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const;
+ SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const;
sal_uLong GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const;
sal_uLong GetVisibleCount( const SvListView* ) const;
sal_uLong GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const;
- SvListEntry* FirstSelected( const SvListView*) const;
- SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* PrevSelected( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* LastSelected( const SvListView*) const;
+ SvListEntry* FirstSelected( const SvListView*) const;
+ SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const;
+ SvListEntry* PrevSelected( const SvListView*,SvListEntry* pEntry ) const;
+ SvListEntry* LastSelected( const SvListView*) const;
sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True );
sal_uLong SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect );
- void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
+ void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
- void Expand( SvListView*,SvListEntry* pParent );
- void Collapse( SvListView*,SvListEntry* pParent );
+ void Expand( SvListView*,SvListEntry* pParent );
+ void Collapse( SvListView*,SvListEntry* pParent );
+
+ SVT_DLLPRIVATE void SetAbsolutePositions();
+ SVT_DLLPRIVATE SvTreeEntryList*CloneChilds(
+ SvTreeEntryList* pChilds,
+ SvListEntry* pNewParent,
+ sal_uLong& nCloneCount
+ ) const;
-//#if 0 // _SOLAR__PRIVATE
- SVT_DLLPRIVATE void SetAbsolutePositions();
- SVT_DLLPRIVATE SvTreeEntryList*CloneChilds( SvTreeEntryList* pChilds,
- SvListEntry* pNewParent,
- sal_uLong& nCloneCount ) const;
- SVT_DLLPRIVATE void SetListPositions( SvTreeEntryList* );
+ SVT_DLLPRIVATE void SetListPositions( SvTreeEntryList* );
// rPos wird bei SortModeNone nicht geaendert
- SVT_DLLPRIVATE void GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
- sal_uLong& rPos );
- SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent );
-//#endif /* _SOLAR__PRIVATE */
+ SVT_DLLPRIVATE void GetInsertionPos(
+ SvListEntry* pEntry,
+ SvListEntry* pParent,
+ sal_uLong& rPos
+ );
-protected:
+ SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent );
- SvListEntry* pRootItem;
+protected:
+ SvListEntry* pRootItem;
public:
- SvTreeList();
- virtual ~SvTreeList();
+ SvTreeList();
+ virtual ~SvTreeList();
+
+ void InsertView( SvListView* );
+ void RemoveView( SvListView* );
+ sal_uLong GetViewCount() const
+ { return aViewList.size(); }
+
+ SvListView* GetView( sal_uLong nPos ) const
+ { return ( nPos < aViewList.size() ) ? aViewList[ nPos ] : NULL; }
+
+ void Broadcast(
+ sal_uInt16 nActionId,
+ SvListEntry* pEntry1=0,
+ SvListEntry* pEntry2=0,
+ sal_uLong nPos=0
+ );
- void InsertView( SvListView* );
- void RemoveView( SvListView* );
- sal_uLong GetViewCount() const { return aViewList.Count(); }
- SvListView* GetView(sal_uLong nPos) const {return (SvListView*)aViewList.GetObject(nPos);}
- void Broadcast( sal_uInt16 nActionId, SvListEntry* pEntry1=0,
- SvListEntry* pEntry2=0, sal_uLong nPos=0 );
// informiert alle Listener
- void InvalidateEntry( SvListEntry* );
+ void InvalidateEntry( SvListEntry* );
sal_uLong GetEntryCount() const { return nEntryCount; }
- SvListEntry* First() const;
- SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* Last( sal_uInt16* pDepth=0 ) const;
-
- SvListEntry* FirstChild( SvListEntry* pParent ) const;
- SvListEntry* NextSibling( SvListEntry* pEntry ) const;
- SvListEntry* PrevSibling( SvListEntry* pEntry ) const;
- SvListEntry* LastSibling( SvListEntry* pEntry ) const;
-
- sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=LIST_APPEND);
- sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); }
- void InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
- void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent,
- sal_uLong nListPos );
+ SvListEntry* First() const;
+ SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvListEntry* Last() const;
+
+ SvListEntry* FirstChild( SvListEntry* pParent ) const;
+ SvListEntry* NextSibling( SvListEntry* pEntry ) const;
+ SvListEntry* PrevSibling( SvListEntry* pEntry ) const;
+ SvListEntry* LastSibling( SvListEntry* pEntry ) const;
+
+ sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=ULONG_MAX);
+ sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
+ { return Insert(pEntry, pRootItem, nRootPos ); }
+
+ void InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
+ void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos );
+
// Entries muessen im gleichen Model stehen!
- void Move( SvListEntry* pSource, SvListEntry* pTarget );
+ void Move( SvListEntry* pSource, SvListEntry* pTarget );
+
// erzeugt ggf. Child-List
- sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent,
- sal_uLong nListPos);
- void Copy( SvListEntry* pSource, SvListEntry* pTarget );
- sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent,
- sal_uLong nListPos);
+ sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
+ void Copy( SvListEntry* pSource, SvListEntry* pTarget );
+ sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
sal_Bool Remove( SvListEntry* pEntry );
- void Clear();
+ void Clear();
sal_Bool HasChilds( SvListEntry* pEntry ) const;
- sal_Bool HasParent( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent!=pRootItem); }
+ sal_Bool HasParent( SvListEntry* pEntry ) const
+ { return (sal_Bool)(pEntry->pParent!=pRootItem); }
+
sal_Bool IsChild( SvListEntry* pParent, SvListEntry* pChild ) const;
sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
- SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const;
- SvListEntry* GetEntry( sal_uLong nRootPos ) const;
- SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
- SvListEntry* GetParent( SvListEntry* pEntry ) const;
- SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
- SvTreeEntryList* GetChildList( SvListEntry* pParent ) const;
+ SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const;
+ SvListEntry* GetEntry( sal_uLong nRootPos ) const;
+ SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
+ SvListEntry* GetParent( SvListEntry* pEntry ) const;
+ SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
+ SvTreeEntryList* GetChildList( SvListEntry* pParent ) const;
sal_uLong GetAbsPos( SvListEntry* pEntry ) const;
- sal_uLong GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); }
+ sal_uLong GetRelPos( SvListEntry* pChild ) const
+ { return pChild->GetChildListPos(); }
+
sal_uLong GetChildCount( SvListEntry* pParent ) const;
sal_uInt16 GetDepth( SvListEntry* pEntry ) const;
- sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent==pRootItem); }
+ sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const
+ { return (sal_Bool)(pEntry->pParent==pRootItem); }
// das Model ruft zum Clonen von Entries den Clone-Link auf,
// damit man sich nicht vom Model ableiten muss, wenn man
@@ -292,23 +397,27 @@ public:
// Deklaration des Clone-Handlers:
// DECL_LINK(CloneHdl,SvListEntry*);
// der Handler muss einen SvListEntry* zurueckgeben
- SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const;
- void SetCloneLink( const Link& rLink ) { aCloneLink=rLink; }
- const Link& GetCloneLink() const { return aCloneLink; }
- virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link
- virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries
+ SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const;
+ void SetCloneLink( const Link& rLink )
+ { aCloneLink=rLink; }
+
+ const Link& GetCloneLink() const
+ { return aCloneLink; }
+
+ virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link
+ virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries
sal_uInt16 GetRefCount() const { return nRefCount; }
- void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; }
+ void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; }
- void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
- SvSortMode GetSortMode() const { return eSortMode; }
- virtual StringCompare Compare( SvListEntry*, SvListEntry* ) const;
- void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
- const Link& GetCompareHdl() const { return aCompareLink; }
- void Resort();
+ void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
+ SvSortMode GetSortMode() const { return eSortMode; }
+ virtual StringCompare Compare( SvListEntry*, SvListEntry* ) const;
+ void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
+ const Link& GetCompareHdl() const { return aCompareLink; }
+ void Resort();
- void CheckIntegrity() const;
+ void CheckIntegrity() const;
};
class SVT_DLLPUBLIC SvListView
@@ -319,78 +428,126 @@ class SVT_DLLPUBLIC SvListView
sal_uLong nSelectionCount;
sal_Bool bVisPositionsValid;
-//#if 0 // _SOLAR__PRIVATE
- SVT_DLLPRIVATE void InitTable();
- SVT_DLLPRIVATE void ClearTable();
- SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
-//#endif
+ SVT_DLLPRIVATE void InitTable();
+ SVT_DLLPRIVATE void ClearTable();
+ SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
protected:
- Table aDataTable; // Mapping SvListEntry -> ViewData
- SvTreeList* pModel;
+ Table aDataTable; // Mapping SvListEntry -> ViewData
+ SvTreeList* pModel;
- void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
- void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
- void ActionInserted( SvListEntry* pEntry );
- void ActionInsertedTree( SvListEntry* pEntry );
- void ActionRemoving( SvListEntry* pEntry );
- void ActionRemoved( SvListEntry* pEntry );
- void ActionClear();
+ void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
+ void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
+ void ActionInserted( SvListEntry* pEntry );
+ void ActionInsertedTree( SvListEntry* pEntry );
+ void ActionRemoving( SvListEntry* pEntry );
+ void ActionRemoved( SvListEntry* pEntry );
+ void ActionClear();
public:
- SvListView(); // !!! setzt das Model auf 0
- SvListView( SvTreeList* pModel );
- virtual ~SvListView();
- void Clear();
- SvTreeList* GetModel() const { return pModel; }
- virtual void SetModel( SvTreeList* );
- virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos );
-
- sal_uLong GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );}
- SvListEntry* FirstVisible() const { return pModel->FirstVisible(); }
- SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->NextVisible(this,pEntry,pDepth); }
- SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); }
- SvListEntry* LastVisible( sal_uInt16* pDepth=0 ) const { return pModel->LastVisible(this,pDepth);}
- SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); }
- SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); }
-
- sal_uLong GetSelectionCount() const { return nSelectionCount; }
- SvListEntry* FirstSelected() const { return pModel->FirstSelected(this);}
- SvListEntry* NextSelected( SvListEntry* pEntry ) const { return pModel->NextSelected(this,pEntry); }
- SvListEntry* PrevSelected( SvListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); }
- SvListEntry* LastSelected() const { return pModel->LastSelected(this); }
- SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); }
- sal_uLong GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); }
-
- sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); }
- sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
- void Expand( SvListEntry* pParent ) { pModel->Expand((SvListView*)this,pParent); }
- void Collapse( SvListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); }
- sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True ) { return pModel->Select((SvListView*)this,pEntry,bSelect); }
- sal_uLong SelectChilds( SvListEntry* pParent, sal_Bool bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); }
+ SvListView(); // !!! setzt das Model auf 0
+ SvListView( SvTreeList* pModel );
+ virtual ~SvListView();
+ void Clear();
+ SvTreeList* GetModel() const { return pModel; }
+ virtual void SetModel( SvTreeList* );
+ virtual void ModelNotification(
+ sal_uInt16 nActionId,
+ SvListEntry* pEntry1,
+ SvListEntry* pEntry2,
+ sal_uLong nPos
+ );
+
+ sal_uLong GetVisibleCount() const
+ { return pModel->GetVisibleCount( (SvListView*)this ); }
+
+ SvListEntry* FirstVisible() const
+ { return pModel->FirstVisible(); }
+
+ SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const
+ { return pModel->NextVisible(this,pEntry,pDepth); }
+
+ SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const
+ { return pModel->PrevVisible(this,pEntry,pDepth); }
+
+ SvListEntry* LastVisible( sal_uInt16* pDepth=0 ) const
+ { return pModel->LastVisible(this,pDepth); }
+
+ SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const
+ { return pModel->NextVisible(this,pEntry,rDelta); }
+
+ SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const
+ { return pModel->PrevVisible(this,pEntry,rDelta); }
+
+ sal_uLong GetSelectionCount() const
+ { return nSelectionCount; }
+
+ SvListEntry* FirstSelected() const
+ { return pModel->FirstSelected(this); }
+
+ SvListEntry* NextSelected( SvListEntry* pEntry ) const
+ { return pModel->NextSelected(this,pEntry); }
+
+ SvListEntry* PrevSelected( SvListEntry* pEntry ) const
+ { return pModel->PrevSelected(this,pEntry); }
+
+ SvListEntry* LastSelected() const
+ { return pModel->LastSelected(this); }
+ SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const
+ { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); }
+
+ sal_uLong GetVisiblePos( SvListEntry* pEntry ) const
+ { return pModel->GetVisiblePos((SvListView*)this,pEntry); }
+
+ sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const
+ { return pModel->GetVisibleChildCount((SvListView*)this,pParent); }
+
+ sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const
+ { return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
+
+ void Expand( SvListEntry* pParent )
+ { pModel->Expand((SvListView*)this,pParent); }
+
+ void Collapse( SvListEntry* pParent )
+ { pModel->Collapse((SvListView*)this,pParent); }
+
+ sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True )
+ { return pModel->Select((SvListView*)this,pEntry,bSelect); }
+
+ sal_uLong SelectChilds( SvListEntry* pParent, sal_Bool bSelect )
+ { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); }
+
// ruft nicht Select-Hdl
- virtual void SelectAll( sal_Bool bSelect, sal_Bool ) { pModel->SelectAll((SvListView*)this, bSelect); }
- sal_Bool IsEntryVisible( SvListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); }
+ virtual void SelectAll( sal_Bool bSelect, sal_Bool )
+ { pModel->SelectAll((SvListView*)this, bSelect); }
+
+ sal_Bool IsEntryVisible( SvListEntry* pEntry ) const
+ { return pModel->IsEntryVisible((SvListView*)this,pEntry); }
+
sal_Bool IsExpanded( SvListEntry* pEntry ) const;
sal_Bool IsSelected( SvListEntry* pEntry ) const;
sal_Bool HasEntryFocus( SvListEntry* pEntry ) const;
- void SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const;
- SvViewData* GetViewData( SvListEntry* pEntry ) const;
- sal_Bool HasViewData() const { return aDataTable.Count() > 1;} // eine ROOT gibts immer
+ void SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const;
+ SvViewData* GetViewData( SvListEntry* pEntry ) const;
+ sal_Bool HasViewData() const
+ { return aDataTable.Count() > 1; } // eine ROOT gibts immer
+
virtual SvViewData* CreateViewData( SvListEntry* pEntry );
- virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
-
- virtual void ModelHasCleared();
- virtual void ModelHasInserted( SvListEntry* pEntry );
- virtual void ModelHasInsertedTree( SvListEntry* pEntry );
- virtual void ModelIsMoving( SvListEntry* pSource, SvListEntry* pTargetParent,
- sal_uLong nPos );
- virtual void ModelHasMoved( SvListEntry* pSource );
- virtual void ModelIsRemoving( SvListEntry* pEntry );
- virtual void ModelHasRemoved( SvListEntry* pEntry );
- virtual void ModelHasEntryInvalidated( SvListEntry* pEntry );
+ virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
+
+ virtual void ModelHasCleared();
+ virtual void ModelHasInserted( SvListEntry* pEntry );
+ virtual void ModelHasInsertedTree( SvListEntry* pEntry );
+ virtual void ModelIsMoving(
+ SvListEntry* pSource,
+ SvListEntry* pTargetParent,
+ sal_uLong nPos
+ );
+ virtual void ModelHasMoved( SvListEntry* pSource );
+ virtual void ModelIsRemoving( SvListEntry* pEntry );
+ virtual void ModelHasRemoved( SvListEntry* pEntry );
+ virtual void ModelHasEntryInvalidated( SvListEntry* pEntry );
};
inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const
@@ -400,6 +557,7 @@ inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const
DBG_ASSERT(pData,"Entry not in Table");
return pData->IsExpanded();
}
+
inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
@@ -407,6 +565,7 @@ inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
DBG_ASSERT(pData,"Entry not in Table");
return pData->IsSelected();
}
+
inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
@@ -414,6 +573,7 @@ inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
DBG_ASSERT(pData,"Entry not in Table");
return pData->HasFocus();
}
+
inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const
{
DBG_ASSERT(pEntry,"SetEntryFocus:No Entry");
@@ -445,17 +605,15 @@ inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos )
pParent = pRootItem;
SvListEntry* pRet = 0;
if ( pParent->pChilds )
- pRet = (SvListEntry*)(pParent->pChilds->GetObject(nPos));
+ pRet = (*pParent->pChilds)[ nPos ];
return pRet;
}
inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const
{
- SvListEntry* pRet;
+ SvListEntry* pRet = 0;
if ( nEntryCount )
- pRet = (SvListEntry*)(pRootItem->pChilds->GetObject(nRootPos));
- else
- pRet = 0;
+ pRet = (*pRootItem->pChilds)[ nRootPos ];
return pRet;
}
@@ -475,40 +633,42 @@ inline SvListEntry* SvTreeList::GetParent( SvListEntry* pEntry ) const
}
#define DECLARE_SVTREELIST( ClassName, Type ) \
-class ClassName : public SvTreeList \
-{ \
-public: \
- Type First() const \
- { return (Type)SvTreeList::First(); } \
- Type Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \
- { return (Type)SvTreeList::Next(pEntry,pDepth); } \
- Type Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \
- { return (Type)SvTreeList::Prev(pEntry,pDepth); } \
- Type Last( sal_uInt16* pDepth=0 ) const \
- { return (Type)SvTreeList::Last(pDepth); } \
- \
- Type Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const \
- { return (Type)SvTreeList::Clone(pEntry,nCloneCount); } \
- Type GetEntry( SvListEntry* pParent, sal_uLong nPos ) const \
- { return (Type)SvTreeList::GetEntry(pParent,nPos); } \
+class ClassName : public SvTreeList \
+{ \
+public: \
+ Type First() const \
+ { return (Type)SvTreeList::First(); } \
+ Type Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \
+ { return (Type)SvTreeList::Next(pEntry,pDepth); } \
+ Type Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \
+ { return (Type)SvTreeList::Prev(pEntry,pDepth); } \
+ Type Last() const \
+ { return (Type)SvTreeList::Last(); } \
+ \
+ Type Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const \
+ { return (Type)SvTreeList::Clone(pEntry,nCloneCount); } \
+ Type GetEntry( SvListEntry* pParent, sal_uLong nPos ) const \
+ { return (Type)SvTreeList::GetEntry(pParent,nPos); } \
Type GetEntry( sal_uLong nRootPos ) const \
- { return (Type)SvTreeList::GetEntry(nRootPos); } \
- Type GetParent( SvListEntry* pEntry ) const \
- { return (Type)SvTreeList::GetParent(pEntry); } \
- using SvTreeList::FirstChild; \
- Type FirstChild( Type pParent ) const \
+ { return (Type)SvTreeList::GetEntry(nRootPos); } \
+ Type GetParent( SvListEntry* pEntry ) const \
+ { return (Type)SvTreeList::GetParent(pEntry); } \
+ using SvTreeList::FirstChild; \
+ Type FirstChild( Type pParent ) const \
{ return (Type)SvTreeList::FirstChild(pParent); } \
- using SvTreeList::NextSibling; \
- Type NextSibling( Type pEntry ) const \
+ using SvTreeList::NextSibling; \
+ Type NextSibling( Type pEntry ) const \
{ return (Type)SvTreeList::NextSibling(pEntry); } \
- using SvTreeList::PrevSibling; \
- Type PrevSibling( Type pEntry ) const \
+ using SvTreeList::PrevSibling; \
+ Type PrevSibling( Type pEntry ) const \
{ return (Type)SvTreeList::PrevSibling(pEntry); } \
- using SvTreeList::LastSibling; \
- Type LastSibling( Type pEntry ) const \
+ using SvTreeList::LastSibling; \
+ Type LastSibling( Type pEntry ) const \
{ return (Type)SvTreeList::LastSibling(pEntry); } \
Type GetEntryAtAbsPos( sal_uLong nAbsPos ) const \
{ return (Type)SvTreeList::GetEntryAtAbsPos( nAbsPos); } \
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx
index 1a6802b9a51c..561fd8eae086 100644
--- a/svtools/inc/svtools/ttprops.hxx
+++ b/svtools/inc/svtools/ttprops.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,4 @@ public:
#endif // _SVTOOLS_TTPROPS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx
index 46e0c82b6760..982e9c20be5a 100644
--- a/svtools/inc/svtools/txtattr.hxx
+++ b/svtools/inc/svtools/txtattr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -233,3 +234,5 @@ inline sal_Bool TextCharAttrib::IsEmpty()
}
#endif // _TXTATTR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx
index 7b30b76e69a7..e53a40dca7e7 100644
--- a/svtools/inc/svtools/txtcmp.hxx
+++ b/svtools/inc/svtools/txtcmp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,3 +32,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/unitconv.hxx b/svtools/inc/svtools/unitconv.hxx
index c612506501b2..51aa3aa61f30 100644
--- a/svtools/inc/svtools/unitconv.hxx
+++ b/svtools/inc/svtools/unitconv.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,9 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dlgutil.hxx,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,51 +61,8 @@ SVT_DLLPUBLIC long GetCoreValue( const MetricField& rField, SfxMapUnit eUni
SVT_DLLPUBLIC long PointToTwips( long nIn );
-#if 0
-// to Twips
-SVT_DLLPUBLIC long CMToTwips( long nIn );
-SVT_DLLPUBLIC long MMToTwips( long nIn );
-SVT_DLLPUBLIC long InchToTwips( long nIn );
-SVT_DLLPUBLIC long PicaToTwips( long nIn );
-
-// to CM
-SVT_DLLPUBLIC long TwipsToCM( long nIn );
-SVT_DLLPUBLIC long InchToCM( long nIn );
-SVT_DLLPUBLIC long MMToCM( long nIn );
-SVT_DLLPUBLIC long PointToCM( long nIn );
-SVT_DLLPUBLIC long PicaToCM( long nIn );
-
-// to MM
-SVT_DLLPUBLIC long TwipsToMM( long nIn );
-SVT_DLLPUBLIC long CMToMM( long nIn );
-SVT_DLLPUBLIC long InchToMM( long nIn );
-SVT_DLLPUBLIC long PointToMM( long nIn );
-SVT_DLLPUBLIC long PicaToMM( long nIn );
-
-// to Inch
-SVT_DLLPUBLIC long TwipsToInch(long nIn );
-SVT_DLLPUBLIC long CMToInch(long nIn );
-SVT_DLLPUBLIC long MMToInch(long nIn );
-SVT_DLLPUBLIC long PointToInch(long nIn );
-SVT_DLLPUBLIC long PicaToInch(long nIn );
-
-// to Point
-SVT_DLLPUBLIC long TwipsToPoint(long nIn );
-SVT_DLLPUBLIC long InchToPoint(long nIn );
-SVT_DLLPUBLIC long CMToPoint(long nIn );
-SVT_DLLPUBLIC long MMToPoint(long nIn );
-SVT_DLLPUBLIC long PicaToPoint(long nIn );
-
-// To Pica
-long TwipsToPica(long nIn );
-long InchToPica(long nIn );
-long PointToPica(long nIn );
-long CMToPica(long nIn );
-long MMToPica(long nIn );
-
-#endif
-
SVT_DLLPUBLIC long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx
index 5d5378bf909b..8bf8898d6b2a 100644
--- a/svtools/inc/svtools/unoevent.hxx
+++ b/svtools/inc/svtools/unoevent.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -327,3 +328,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx
index 9ed2afe8dc6c..adf8b7d0c9b9 100644
--- a/svtools/inc/svtools/unoimap.hxx
+++ b/svtools/inc/svtools/unoimap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/urlcontrol.hxx b/svtools/inc/svtools/urlcontrol.hxx
index ce73573d5e71..f5fd8df8150b 100644
--- a/svtools/inc/svtools/urlcontrol.hxx
+++ b/svtools/inc/svtools/urlcontrol.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,4 @@ namespace svt
#endif // SVTOOLS_URLCONTROL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 620f20cffb46..8c61d8517210 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,13 +31,10 @@
#include "svtools/svtdllapi.h"
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/timer.hxx>
+#include <vector>
class MouseEvent;
class TrackingEvent;
@@ -44,9 +42,11 @@ class HelpEvent;
class KeyEvent;
class DataChangedEvent;
class ScrollBar;
-class ValueItemList;
-struct ValueSetItem;
struct ValueSet_Impl;
+
+struct ValueSetItem;
+typedef ::std::vector< ValueSetItem* > ValueItemList;
+
#ifdef _SV_VALUESET_CXX
class ValueSetAcc;
class ValueItemAcc;
@@ -237,8 +237,8 @@ gewuenschten WinBits (vor Show) mit SetStyle() gesetzt werden.
// - ValueSet -
// ------------
-#define VALUESET_APPEND ((sal_uInt16)0xFFFF)
-#define VALUESET_ITEM_NOTFOUND ((sal_uInt16)0xFFFF)
+#define VALUESET_APPEND ((sal_uInt16)-1)
+#define VALUESET_ITEM_NOTFOUND ((sal_uInt16)-1)
class SVT_DLLPUBLIC ValueSet : public Control
{
@@ -257,7 +257,7 @@ private:
sal_uInt16 mnOldItemId;
sal_uInt16 mnSelItemId;
sal_uInt16 mnHighItemId;
- sal_uInt16 mnDropPos;
+ size_t mnDropPos;
sal_uInt16 mnCols;
sal_uInt16 mnCurCol;
sal_uInt16 mnUserCols;
@@ -287,7 +287,7 @@ private:
SVT_DLLPRIVATE void ImplInit();
SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
SVT_DLLPRIVATE void ImplInitScrollBar();
- SVT_DLLPRIVATE void ImplDeleteItems();
+ SVT_DLLPRIVATE void ImplDeleteItems();
SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem );
SVT_DLLPRIVATE void ImplDrawItemText( const XubString& rStr );
SVT_DLLPRIVATE void ImplDrawSelect();
@@ -297,8 +297,8 @@ private:
SVT_DLLPRIVATE void ImplDraw();
using Window::ImplScroll;
SVT_DLLPRIVATE sal_Bool ImplScroll( const Point& rPos );
- SVT_DLLPRIVATE sal_uInt16 ImplGetItem( const Point& rPoint, sal_Bool bMove = sal_False ) const;
- SVT_DLLPRIVATE ValueSetItem* ImplGetItem( sal_uInt16 nPos );
+ SVT_DLLPRIVATE size_t ImplGetItem( const Point& rPoint, sal_Bool bMove = sal_False ) const;
+ SVT_DLLPRIVATE ValueSetItem* ImplGetItem( size_t nPos );
SVT_DLLPRIVATE ValueSetItem* ImplGetFirstItem();
SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
SVT_DLLPRIVATE ValueSetItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos );
@@ -306,8 +306,8 @@ private:
SVT_DLLPRIVATE sal_Bool ImplHasAccessibleListeners();
SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat );
SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, sal_Bool bCancel );
- DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
- DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
+ DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
+ DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
#endif
// Forbidden and not implemented.
@@ -348,27 +348,27 @@ public:
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void InsertItem( sal_uInt16 nItemId, const Image& rImage,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId, const Color& rColor,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId,
const Image& rImage, const XubString& rStr,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId,
const Color& rColor, const XubString& rStr,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void InsertSpace( sal_uInt16 nItemId,
- sal_uInt16 nPos = VALUESET_APPEND );
+ size_t nPos = VALUESET_APPEND );
void RemoveItem( sal_uInt16 nItemId );
void CopyItems( const ValueSet& rValueSet );
void Clear();
- sal_uInt16 GetItemCount() const;
- sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
- sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
+ size_t GetItemCount() const;
+ size_t GetItemPos( sal_uInt16 nItemId ) const;
+ sal_uInt16 GetItemId( size_t nPos ) const;
sal_uInt16 GetItemId( const Point& rPos ) const;
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
@@ -443,3 +443,5 @@ private:
};
#endif // _VALUESET_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx
index e8b45c080198..5fd4ddca4c02 100644
--- a/svtools/inc/svtools/wallitem.hxx
+++ b/svtools/inc/svtools/wallitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
#ifndef _WALLITEM_HXX
#define _WALLITEM_HXX
-#ifndef SHL_HXX
#include <tools/shl.hxx>
-#endif
// -----------------------------------------------------------------------------------------
// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb
@@ -63,3 +62,4 @@ public:
#endif // _WALLITEM_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index 5212fd67aed3..76535089b51b 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <svtools/wizdlg.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/tabpage.hxx>
#include <comphelper/stl_types.hxx>
@@ -392,3 +391,4 @@ namespace svt
#endif // _SVTOOLS_WIZARDMACHINE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx
index cda86da2d249..5e5721551d1c 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/svtools/inc/svtools/wizdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class TabPage;
class Button;
@@ -309,3 +308,5 @@ public:
};
#endif // _SVT_WIZDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx
index 678540beae32..3c1f07774a45 100644
--- a/svtools/inc/svtools/wmf.hxx
+++ b/svtools/inc/svtools/wmf.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,30 @@
#include "svtools/svtdllapi.h"
#include <svtools/fltcall.hxx>
-sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL );
+struct WMF_APMFILEHEADER {
+ sal_uInt32 key;
+ sal_uInt16 hmf;
+ sal_uInt16 left;
+ sal_uInt16 top;
+ sal_uInt16 right;
+ sal_uInt16 bottom;
+ sal_uInt16 inch;
+ sal_uInt32 reserved;
+ sal_uInt16 checksum;
+
+ WMF_APMFILEHEADER() : key(0x9ac6cdd7L),
+ hmf(0),
+ left(0),
+ top(0),
+ right(0),
+ bottom(0),
+ inch(96),
+ reserved(0),
+ checksum(0) {
+ }
+};
+
+sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
@@ -44,3 +68,5 @@ SVT_DLLPUBLIC sal_Bool WriteWindowMetafile( SvStream& rStream, const GDIMetaFile
SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/xtextedt.hxx b/svtools/inc/svtools/xtextedt.hxx
index 6b133fbe8c75..915541824b5c 100644
--- a/svtools/inc/svtools/xtextedt.hxx
+++ b/svtools/inc/svtools/xtextedt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ public:
};
#endif // _XTEXTEDT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
index 7e639904245f..ed4a4c6760b4 100644
--- a/svtools/inc/svtools/xwindowitem.hxx
+++ b/svtools/inc/svtools/xwindowitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,9 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chrtitem.hxx,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,3 +66,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index ff9aa6a9875c..7ac223ae1588 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,2 +1,2 @@
-st svtools : L10N:l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
+st svtools : TRANSLATIONS:translations svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal salhelper sot jvmfwk LIBXSLT:libxslt NULL
st svtools\prj nmake - all st_prj NULL
diff --git a/svtools/qa/unoapi/Test.java b/svtools/qa/unoapi/Test.java
deleted file mode 100644
index b17f870d0b99..000000000000
--- a/svtools/qa/unoapi/Test.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
-
-package org.openoffice.svtools.qa.unoapi;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import org.openoffice.test.Argument;
-import static org.junit.Assert.*;
-
-public final class Test {
- @org.junit.Before public void setUp() throws Exception {
- connection.setUp();
- }
-
- @org.junit.After public void tearDown()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- @org.junit.Test public void test() {
- assertTrue(
- Runner.run(
- "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
- Argument.get("tdoc"), "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 09fe2880fec0..31e4a187574f 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,8 +47,6 @@ DBG_NAME(BrowseBox)
extern const char* BrowseBoxCheckInvariants( const void* pVoid );
-DECLARE_LIST( BrowserColumns, BrowserColumn* )
-
#define SCROLL_FLAGS (SCROLL_CLIP | SCROLL_NOCHILDREN)
#define getDataWindow() ((BrowserDataWin*)pDataWin)
@@ -60,27 +59,6 @@ using namespace svt;
//-------------------------------------------------------------------
-#ifdef DBG_MI
-void DoLog_Impl( const BrowseBox *pThis, const char *pWhat, const char *pWho )
-{
- SvFileStream aLog( "d:\\cursor.log", STREAM_WRITE|STREAM_NOCREATE );
- if ( aLog.IsOpen() )
- {
- aLog.Seek( STREAM_SEEK_TO_END );
- String aEntry( (long) pThis );
- aEntry += "(row=";
- aEntry += pThis->GetCurRow();
- aEntry += "): ";
- aEntry += pWhat;
- aEntry += " from ";
- aEntry += pWho;
- aEntry += " => ";
- aEntry += pThis->GetCursorHideCount();
- aLog.WriteLine( aEntry );
- }
-}
-#endif
-
namespace
{
void disposeAndClearHeaderCell(::svt::BrowseBoxImpl::THeaderCellMap& _rHeaderCell)
@@ -98,7 +76,7 @@ namespace
void BrowseBox::ConstructImpl( BrowserMode nMode )
{
- DBG_TRACE1( "BrowseBox: %p->ConstructImpl", this );
+ OSL_TRACE( "BrowseBox: %p->ConstructImpl", this );
bMultiSelection = sal_False;
pColSel = 0;
pDataWin = 0;
@@ -147,7 +125,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
bHasFocus = HasChildPathFocus();
getDataWindow()->nCursorHidden =
( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 );
- LOG( this, "ConstructImpl", "*" );
}
//-------------------------------------------------------------------
@@ -178,7 +155,7 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode )
BrowseBox::~BrowseBox()
{
DBG_DTOR(BrowseBox,BrowseBoxCheckInvariants);
- DBG_TRACE1( "BrowseBox: %p~", this );
+ OSL_TRACE( "BrowseBox: %p~", this );
if ( m_pImpl->m_pAccessible )
{
@@ -194,8 +171,9 @@ BrowseBox::~BrowseBox()
delete pVScroll;
// free columns-space
- for ( sal_uInt16 n = 0; n < pCols->Count(); ++n )
- delete pCols->GetObject(n);
+ for ( size_t i = 0, n = pCols->size(); i < n; ++i )
+ delete (*pCols)[ i ];
+ pCols->clear();
delete pCols;
delete pColSel;
if ( bMultiSelection )
@@ -211,11 +189,7 @@ short BrowseBox::GetCursorHideCount() const
//-------------------------------------------------------------------
-void BrowseBox::DoShowCursor( const char *
-#ifdef DBG_MI
-pWhoLogs
-#endif
-)
+void BrowseBox::DoShowCursor( const char * )
{
short nHiddenCount = --getDataWindow()->nCursorHidden;
if (PaintCursorIfHiddenOnce())
@@ -228,16 +202,11 @@ pWhoLogs
if (0 == nHiddenCount)
DrawCursor();
}
- LOG( this, "DoShowCursor", pWhoLogs );
}
//-------------------------------------------------------------------
-void BrowseBox::DoHideCursor( const char *
-#ifdef DBG_MI
-pWhoLogs
-#endif
-)
+void BrowseBox::DoHideCursor( const char * )
{
short nHiddenCount = ++getDataWindow()->nCursorHidden;
if (PaintCursorIfHiddenOnce())
@@ -250,7 +219,6 @@ pWhoLogs
if (1 == nHiddenCount)
DrawCursor();
}
- LOG( this, "DoHideCursor", pWhoLogs );
}
//-------------------------------------------------------------------
@@ -282,7 +250,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- pCols->Insert( new BrowserColumn( 0, Image(), String(), nWidth, GetZoom(), 0 ), (sal_uLong) 0 );
+ pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), String(), nWidth, GetZoom(), 0 ) );
FreezeColumn( 0 );
// Headerbar anpassen
@@ -294,9 +262,6 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
);
}
- /*if ( getDataWindow()->pHeaderBar )
- getDataWindow()->pHeaderBar->InsertItem( USHRT_MAX - 1,
- "", nWidth, HIB_FIXEDPOS|HIB_FIXED, 0 );*/
ColumnInserted( 0 );
}
@@ -306,8 +271,16 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const Image& rImage,
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- pCols->Insert( new BrowserColumn( nItemId, rImage, String(), nWidth, GetZoom(), nBits ),
- Min( nPos, (sal_uInt16)(pCols->Count()) ) );
+ if ( nPos < pCols->size() )
+ {
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nPos );
+ pCols->insert( it, new BrowserColumn( nItemId, rImage, String(), nWidth, GetZoom(), nBits ) );
+ }
+ else
+ {
+ pCols->push_back( new BrowserColumn( nItemId, rImage, String(), nWidth, GetZoom(), nBits ) );
+ }
if ( nCurColId == 0 )
nCurColId = nItemId;
if ( getDataWindow()->pHeaderBar )
@@ -329,8 +302,16 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const XubString& rText,
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- pCols->Insert( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom(), nBits ),
- Min( nPos, (sal_uInt16)(pCols->Count()) ) );
+ if ( nPos < pCols->size() )
+ {
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nPos );
+ pCols->insert( it, new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom(), nBits ) );
+ }
+ else
+ {
+ pCols->push_back( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom(), nBits ) );
+ }
if ( nCurColId == 0 )
nCurColId = nItemId;
@@ -355,8 +336,17 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId,
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- pCols->Insert( new BrowserColumn( nItemId, rImage, rText, nWidth, GetZoom(), nBits ),
- Min( nPos, (sal_uInt16)(pCols->Count()) ) );
+ if ( nPos < pCols->size() )
+ {
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nPos );
+ pCols->insert( it, new BrowserColumn( nItemId, rImage, rText, nWidth, GetZoom(), nBits ) );
+ }
+ else
+ {
+ pCols->push_back( new BrowserColumn( nItemId, rImage, rText, nWidth, GetZoom(), nBits ) );
+ }
+
if ( nCurColId == 0 )
nCurColId = nItemId;
if ( getDataWindow()->pHeaderBar )
@@ -384,7 +374,7 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn()
{
DoHideCursor( "ToggleSelectedColumn" );
ToggleSelection();
- nSelectedColId = pCols->GetObject(pColSel->FirstSelected())->GetId();
+ nSelectedColId = (*pCols)[ pColSel->FirstSelected() ]->GetId();
pColSel->SelectAll(sal_False);
}
return nSelectedColId;
@@ -396,7 +386,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
{
pColSel->Select( GetColumnPos( _nSelectedColumnId ) );
ToggleSelection();
- DBG_TRACE1( "BrowseBox: %p->SetToggledSelectedColumn", this );
+ OSL_TRACE( "BrowseBox: %p->SetToggledSelectedColumn", this );
DoShowCursor( "SetToggledSelectedColumn" );
}
}
@@ -410,13 +400,13 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
return;
// get the position in the current array
- sal_uInt16 nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->Count() )
+ size_t nItemPos = GetColumnPos( nItemId );
+ if ( nItemPos >= pCols->size() )
// not available!
return;
// doesn't the state change?
- if ( pCols->GetObject(nItemPos)->IsFrozen() == bFreeze )
+ if ( (*pCols)[ nItemPos ]->IsFrozen() == bFreeze )
return;
// remark the column selection
@@ -426,14 +416,18 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
if ( bFreeze )
{
// to be moved?
- if ( nItemPos != 0 && !pCols->GetObject(nItemPos-1)->IsFrozen() )
+ if ( nItemPos != 0 && !(*pCols)[ nItemPos-1 ]->IsFrozen() )
{
// move to the right of the last frozen column
sal_uInt16 nFirstScrollable = FrozenColCount();
- BrowserColumn *pColumn = pCols->GetObject(nItemPos);
- pCols->Remove( (sal_uLong) nItemPos );
+ BrowserColumn *pColumn = (*pCols)[ nItemPos ];
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nItemPos );
+ pCols->erase( it );
nItemPos = nFirstScrollable;
- pCols->Insert( pColumn, (sal_uLong) nItemPos );
+ it = pCols->begin();
+ ::std::advance( it, nItemPos );
+ pCols->insert( it, pColumn );
}
// adjust the number of the first scrollable and visible column
@@ -443,14 +437,18 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
else
{
// to be moved?
- if ( nItemPos != FrozenColCount()-1 )
+ if ( (sal_Int32)nItemPos != FrozenColCount()-1 )
{
// move to the leftmost scrollable colum
sal_uInt16 nFirstScrollable = FrozenColCount();
- BrowserColumn *pColumn = pCols->GetObject(nItemPos);
- pCols->Remove( (sal_uLong) nItemPos );
+ BrowserColumn *pColumn = (*pCols)[ nItemPos ];
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nItemPos );
+ pCols->erase( it );
nItemPos = nFirstScrollable;
- pCols->Insert( pColumn, (sal_uLong) nItemPos );
+ it = pCols->begin();
+ ::std::advance( it, nItemPos );
+ pCols->insert( it, pColumn );
}
// adjust the number of the first scrollable and visible column
@@ -458,7 +456,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
}
// toggle the freeze-state of the column
- pCols->GetObject(nItemPos)->Freeze( bFreeze );
+ (*pCols)[ nItemPos ]->Freeze( bFreeze );
// align the scrollbar-range
UpdateScrollbars();
@@ -480,12 +478,12 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
return;
// do not move handle column
- if (nPos == 0 && !pCols->GetObject(0)->GetId())
+ if (nPos == 0 && !(*pCols)[ 0 ]->GetId())
return;
// get the position in the current array
sal_uInt16 nOldPos = GetColumnPos( nColumnId );
- if ( nOldPos >= pCols->Count() )
+ if ( nOldPos >= pCols->size() )
// not available!
return;
@@ -507,11 +505,19 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
if ( nOldPos > nPos )
nNextPos = nOldPos - 1;
- BrowserColumn *pNextCol = pCols->GetObject(nNextPos);
+ BrowserColumn *pNextCol = (*pCols)[ nNextPos ];
Rectangle aNextRect(GetFieldRect( pNextCol->GetId() ));
// move column internally
- pCols->Insert( pCols->Remove( nOldPos ), nPos );
+ {
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nOldPos );
+ BrowserColumn* pTemp = *it;
+ pCols->erase( it );
+ it = pCols->begin();
+ ::std::advance( it, nPos );
+ pCols->insert( it, pTemp );
+ }
// determine new column area
Rectangle aToRect( GetFieldRect( nColumnId ) );
@@ -597,13 +603,13 @@ void BrowseBox::SetColumnMode( sal_uInt16 nColumnId, BrowserColumnMode nFlags )
return;
// get the position in the current array
- sal_uInt16 nColumnPos = GetColumnPos( nColumnId );
- if ( nColumnPos >= pCols->Count() )
+ size_t nColumnPos = GetColumnPos( nColumnId );
+ if ( nColumnPos >= pCols->size() )
// not available!
return;
// does the state change?
- BrowserColumn *pCol = pCols->GetObject(nColumnPos);
+ BrowserColumn *pCol = (*pCols)[ nColumnPos ];
if ( pCol->Flags() != nFlags )
{
pCol->Flags() = sal::static_int_cast< HeaderBarItemBits >(nFlags);
@@ -627,12 +633,12 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle )
// get the position in the current array
sal_uInt16 nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->Count() )
+ if ( nItemPos >= pCols->size() )
// not available!
return;
// does the state change?
- BrowserColumn *pCol = pCols->GetObject(nItemPos);
+ BrowserColumn *pCol = (*pCols)[ nItemPos ];
if ( pCol->Title() != rTitle )
{
::rtl::OUString sNew(rTitle);
@@ -669,18 +675,18 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// get the position in the current array
- sal_uInt16 nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->Count() )
+ size_t nItemPos = GetColumnPos( nItemId );
+ if ( nItemPos >= pCols->size() )
return;
// does the state change?
nWidth = QueryColumnResize( nItemId, nWidth );
- if ( nWidth >= LONG_MAX || pCols->GetObject(nItemPos)->Width() != nWidth )
+ if ( nWidth >= LONG_MAX || (*pCols)[ nItemPos ]->Width() != nWidth )
{
- long nOldWidth = pCols->GetObject(nItemPos)->Width();
+ long nOldWidth = (*pCols)[ nItemPos ]->Width();
// ggf. letzte Spalte anpassen
- if ( IsVisible() && nItemPos == pCols->Count() - 1 )
+ if ( IsVisible() && nItemPos == pCols->size() - 1 )
{
long nMaxWidth = pDataWin->GetSizePixel().Width();
nMaxWidth -= getDataWindow()->bAutoSizeLastCol
@@ -702,7 +708,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
// soll die Aenderung sofort dargestellt werden?
sal_Bool bUpdate = GetUpdateMode() &&
- ( pCols->GetObject(nItemPos)->IsFrozen() || nItemPos >= nFirstCol );
+ ( (*pCols)[ nItemPos ]->IsFrozen() || nItemPos >= nFirstCol );
if ( bUpdate )
{
@@ -714,15 +720,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
}
// Breite setzen
- pCols->GetObject(nItemPos)->SetWidth(nWidth, GetZoom());
-#if 0
- if ( nItemPos != pCols->Count() - 1 )
- {
- long nLastColMaxWidth = pDataWin->GetSizePixel().Width() -
- GetFieldRect(GetColumnId(pCols->Count()-1)).Left();
- pCols->GetObject(pCols->Count()-1)->Width() = nLastColMaxWidth;
- }
-#endif
+ (*pCols)[ nItemPos ]->SetWidth(nWidth, GetZoom());
// scroll and invalidate
if ( bUpdate )
@@ -731,7 +729,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
long nX = 0;
for ( sal_uInt16 nCol = 0; nCol < nItemPos; ++nCol )
{
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
nX += pCol->Width();
}
@@ -774,7 +772,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
nItemId ? nItemId : USHRT_MAX - 1, nWidth );
// adjust last column
- if ( nItemPos != pCols->Count() - 1 )
+ if ( nItemPos != pCols->size() - 1 )
AutoSizeLastColumn();
}
@@ -787,7 +785,7 @@ void BrowseBox::AutoSizeLastColumn()
if ( getDataWindow()->bAutoSizeLastCol &&
getDataWindow()->GetUpdateMode() )
{
- sal_uInt16 nId = GetColumnId( (sal_uInt16)pCols->Count() - 1 );
+ sal_uInt16 nId = GetColumnId( (sal_uInt16)pCols->size() - 1 );
SetColumnWidth( nId, LONG_MAX );
ColumnResized( nId );
}
@@ -814,7 +812,10 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
nCurColId = 0;
// Spalte entfernen
- delete( pCols->Remove( (sal_uLong) nPos ));
+ BrowserColumns::iterator it = pCols->begin();
+ ::std::advance( it, nPos );
+ delete *it;
+ pCols->erase( it );
// OJ #93534#
if ( nFirstCol >= nPos && nFirstCol > FrozenColCount() )
{
@@ -881,10 +882,12 @@ void BrowseBox::RemoveColumns()
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- unsigned int nOldCount = pCols->Count();
+ size_t nOldCount = pCols->size();
+
// alle Spalten entfernen
- while ( pCols->Count() )
- delete ( pCols->Remove( (sal_uLong) 0 ));
+ for ( size_t i = 0; i < nOldCount; ++i )
+ delete (*pCols)[ i ];
+ pCols->clear();
// Spaltenselektion korrigieren
if ( pColSel )
@@ -912,7 +915,7 @@ void BrowseBox::RemoveColumns()
if ( isAccessibleAlive() )
{
- if ( pCols->Count() != nOldCount )
+ if ( pCols->size() != nOldCount )
{
// all columns should be removed, so we remove the column header bar and append it again
// to avoid to notify every column remove
@@ -952,9 +955,9 @@ String BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nItemPos = GetColumnPos( nId );
- if ( nItemPos >= pCols->Count() )
+ if ( nItemPos >= pCols->size() )
return String();
- return pCols->GetObject(nItemPos)->Title();
+ return (*pCols)[ nItemPos ]->Title();
}
//-------------------------------------------------------------------
@@ -970,7 +973,7 @@ sal_uInt16 BrowseBox::ColCount() const
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- return (sal_uInt16) pCols->Count();
+ return (sal_uInt16) pCols->size();
}
//-------------------------------------------------------------------
@@ -1013,8 +1016,7 @@ long BrowseBox::ScrollColumns( long nCols )
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( nFirstCol + nCols < 0 ||
- nFirstCol + nCols >= (long)pCols->Count() )
- //?MI: pCols->GetObject( nFirstCol + nCols )->IsFrozen() )
+ nFirstCol + nCols >= (long)pCols->size() )
return 0;
// implicitly hides cursor while scrolling
@@ -1036,7 +1038,7 @@ long BrowseBox::ScrollColumns( long nCols )
}
else
{
- long nDelta = pCols->GetObject(nFirstCol-1)->Width();
+ long nDelta = (*pCols)[ nFirstCol-1 ]->Width();
long nFrozenWidth = GetFrozenWidth();
Rectangle aScrollRect( Point( nFrozenWidth + nDelta, 0 ),
@@ -1082,7 +1084,7 @@ long BrowseBox::ScrollColumns( long nCols )
}
else
{
- long nDelta = pCols->GetObject(nFirstCol)->Width();
+ long nDelta = (*pCols)[ nFirstCol ]->Width();
long nFrozenWidth = GetFrozenWidth();
Rectangle aScrollRect( Point( nFrozenWidth, 0 ),
@@ -1121,13 +1123,13 @@ long BrowseBox::ScrollColumns( long nCols )
if ( getDataWindow()->pHeaderBar )
{
long nWidth = 0;
- for ( sal_uInt16 nCol = 0;
- nCol < pCols->Count() && nCol < nFirstCol;
+ for ( size_t nCol = 0;
+ nCol < pCols->size() && nCol < nFirstCol;
++nCol )
{
// HandleColumn nicht
- if ( pCols->GetObject(nCol)->GetId() )
- nWidth += pCols->GetObject(nCol)->Width();
+ if ( (*pCols)[ nCol ]->GetId() )
+ nWidth += (*pCols)[ nCol ]->Width();
}
getDataWindow()->pHeaderBar->SetOffset( nWidth );
@@ -1313,16 +1315,6 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
if ( nNumRows <= 0 )
return;
-#if 0
- // Zerlegung in einzelne RowInserted-Aufrufe:
- if (nNumRows > 1)
- {
- for (long i = 0; i < nNumRows; i++)
- RowInserted(nRow + i,1,bDoPaint);
- return;
- }
-#endif
-
// adjust total row count
sal_Bool bLastRow = nRow >= nRowCount;
nRowCount += nNumRows;
@@ -1435,7 +1427,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
if ( bDoPaint )
{
// hide cursor and selection
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
DoHideCursor( "RowRemoved" );
}
@@ -1514,7 +1506,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
{
// reshow cursor and selection
ToggleSelection();
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
DoShowCursor( "RowRemoved" );
// adjust the vertical scrollbar
@@ -1711,7 +1703,7 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_
if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, sal_True)))
{
sal_uInt16 nNewPos = GetColumnPos(nColId);
- BrowserColumn* pColumn = pCols->GetObject( nNewPos );
+ BrowserColumn* pColumn = (nNewPos < pCols->size()) ? (*pCols)[ nNewPos ] : NULL;
DBG_ASSERT( pColumn, "no column object - invalid id?" );
if ( !pColumn )
return sal_False;
@@ -1786,7 +1778,7 @@ void BrowseBox::SetNoSelection()
// nothing to do
return;
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
// unselect all
@@ -1802,7 +1794,7 @@ void BrowseBox::SetNoSelection()
bSelect = sal_True;
// restore screen
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
if ( isAccessibleAlive() )
{
@@ -1822,7 +1814,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel )
DBG_ASSERT( bMultiSelection, "SetSelection only allowed with Multi-Selection-Mode" );
// prepare inverted areas
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
// assign Selection
@@ -1839,7 +1831,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel )
// restore screen
ToggleSelection();
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
if ( isAccessibleAlive() )
{
@@ -1860,7 +1852,7 @@ void BrowseBox::SelectAll()
if ( !bMultiSelection )
return;
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
// select all rows
@@ -1869,7 +1861,7 @@ void BrowseBox::SelectAll()
uRow.pSel->SelectAll(sal_True);
// Handle-Column nicht highlighten
- BrowserColumn *pFirstCol = pCols->GetObject(0);
+ BrowserColumn *pFirstCol = (*pCols)[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
// highlight the row selection
@@ -1893,7 +1885,7 @@ void BrowseBox::SelectAll()
bSelect = sal_True;
// restore screen
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
if ( isAccessibleAlive() )
{
@@ -1932,7 +1924,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
return;
}
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
// remove old selection?
if ( !bExpand || !bMultiSelection )
@@ -1958,7 +1950,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
)
{
// Handle-Column nicht highlighten
- BrowserColumn *pFirstCol = pCols->GetObject(0);
+ BrowserColumn *pFirstCol = (*pCols)[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
// highlight only newly selected part
@@ -1974,7 +1966,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
bSelect = sal_True;
// restore screen
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
if ( isAccessibleAlive() )
{
@@ -2014,16 +2006,16 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
if ( !bMultiSelection )
{
if ( _bSelect )
- GoToColumnId( pCols->GetObject(nNewColPos)->GetId(), bMakeVisible );
+ GoToColumnId( (*pCols)[ nNewColPos ]->GetId(), bMakeVisible );
return;
}
else
{
- if ( !GoToColumnId( pCols->GetObject( nNewColPos )->GetId(), bMakeVisible ) )
+ if ( !GoToColumnId( (*pCols)[ nNewColPos ]->GetId(), bMakeVisible ) )
return;
}
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
if ( bMultiSelection )
uRow.pSel->SelectAll(sal_False);
@@ -2040,7 +2032,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, sal_False ) );
Rectangle aRect(
Point( aFieldRectPix.Left() - MIN_COLUMNWIDTH, 0 ),
- Size( pCols->GetObject(nNewColPos)->Width(),
+ Size( (*pCols)[ nNewColPos ]->Width(),
pDataWin->GetOutputSizePixel().Height() ) );
pDataWin->Invalidate( aRect );
if ( !bSelecting )
@@ -2065,7 +2057,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
}
// restore screen
- DBG_TRACE1( "BrowseBox: %p->ShowCursor", this );
+ OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
}
//-------------------------------------------------------------------
@@ -2324,14 +2316,14 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
// compute the X-coordinte realtiv to DataWin by accumulation
long nColX = 0;
sal_uInt16 nFrozenCols = FrozenColCount();
- sal_uInt16 nCol;
+ size_t nCol;
for ( nCol = 0;
- nCol < pCols->Count() && pCols->GetObject(nCol)->GetId() != nColumnId;
+ nCol < pCols->size() && (*pCols)[ nCol ]->GetId() != nColumnId;
++nCol )
- if ( pCols->GetObject(nCol)->IsFrozen() || nCol >= nFirstCol )
- nColX += pCols->GetObject(nCol)->Width();
+ if ( (*pCols)[ nCol ]->IsFrozen() || nCol >= nFirstCol )
+ nColX += (*pCols)[ nCol ]->Width();
- if ( nCol >= pCols->Count() || ( nCol >= nFrozenCols && nCol < nFirstCol ) )
+ if ( nCol >= pCols->size() || ( nCol >= nFrozenCols && nCol < nFirstCol ) )
return Rectangle();
// compute the Y-coordinate relative to DataWin
@@ -2342,7 +2334,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
// assemble the Rectangle relative to DataWin
return Rectangle(
Point( nColX + MIN_COLUMNWIDTH, nRowY ),
- Size( pCols->GetObject(nCol)->Width() - 2*MIN_COLUMNWIDTH,
+ Size( (*pCols)[ nCol ]->Width() - 2*MIN_COLUMNWIDTH,
GetDataRowHeight() - 1 ) );
}
@@ -2384,10 +2376,9 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
// accumulate the withds of the visible columns
long nColX = 0;
- sal_uInt16 nCol;
- for ( nCol = 0; nCol < sal_uInt16(pCols->Count()); ++nCol )
+ for ( size_t nCol = 0; nCol < pCols->size(); ++nCol )
{
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
nColX += pCol->Width();
@@ -2430,27 +2421,6 @@ void BrowseBox::SetMode( BrowserMode nMode )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
-#ifdef DBG_MIx
- Sound::Beep();
- nMode =
-// BROWSER_COLUMNSELECTION |
-// BROWSER_MULTISELECTION |
- BROWSER_THUMBDRAGGING |
- BROWSER_KEEPHIGHLIGHT |
- BROWSER_HLINES |
- BROWSER_VLINES |
-// BROWSER_HIDECURSOR |
-// BROWSER_NO_HSCROLL |
-// BROWSER_NO_SCROLLBACK |
- BROWSER_AUTO_VSCROLL |
- BROWSER_AUTO_HSCROLL |
- BROWSER_TRACKING_TIPS |
-// BROWSER_HIGHLIGHT_NONE |
- BROWSER_HEADERBAR_NEW |
-// BROWSER_AUTOSIZE_LASTCOL |
- 0;
-#endif
-
getDataWindow()->bAutoHScroll = BROWSER_AUTO_HSCROLL == ( nMode & BROWSER_AUTO_HSCROLL );
getDataWindow()->bAutoVScroll = BROWSER_AUTO_VSCROLL == ( nMode & BROWSER_AUTO_VSCROLL );
getDataWindow()->bNoHScroll = BROWSER_NO_HSCROLL == ( nMode & BROWSER_NO_HSCROLL );
@@ -2536,7 +2506,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
if ( bColumnCursor )
{
pColSel = pOldColSel ? pOldColSel : new MultiSelection;
- pColSel->SetTotalRange( Range( 0, pCols->Count()-1 ) );
+ pColSel->SetTotalRange( Range( 0, pCols->size()-1 ) );
}
else
{
@@ -2718,11 +2688,11 @@ void BrowseBox::CursorMoved()
void BrowseBox::LoseFocus()
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- DBG_TRACE1( "BrowseBox: %p->LoseFocus", this );
+ OSL_TRACE( "BrowseBox: %p->LoseFocus", this );
if ( bHasFocus )
{
- DBG_TRACE1( "BrowseBox: %p->HideCursor", this );
+ OSL_TRACE( "BrowseBox: %p->HideCursor", this );
DoHideCursor( "LoseFocus" );
if ( !bKeepHighlight )
@@ -2741,7 +2711,7 @@ void BrowseBox::LoseFocus()
void BrowseBox::GetFocus()
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- DBG_TRACE1( "BrowseBox: %p->GetFocus", this );
+ OSL_TRACE( "BrowseBox: %p->GetFocus", this );
if ( !bHasFocus )
{
@@ -2759,3 +2729,4 @@ void BrowseBox::GetFocus()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index c37fb6915725..9c9796baa90b 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,8 +34,6 @@
#include <svtools/colorcfg.hxx>
#include <vcl/salgtype.hxx>
-#ifndef GCC
-#endif
#include <tools/multisel.hxx>
#include <algorithm>
@@ -51,8 +50,6 @@ DBG_NAMEEX(BrowseBox)
extern const char* BrowseBoxCheckInvariants( const void * pVoid );
-DECLARE_LIST( BrowserColumns, BrowserColumn* )
-
//===================================================================
void BrowseBox::StartDrag( sal_Int8 /* _nAction */, const Point& /* _rPosPixel */ )
@@ -205,11 +202,11 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
pHeaderBar->SetZoom(GetZoom());
// let the cols calc their new widths and adjust the header bar
- for ( sal_uInt16 nPos = 0; nPos < pCols->Count(); ++nPos )
+ for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
{
- pCols->GetObject(nPos)->ZoomChanged(GetZoom());
+ (*pCols)[ nPos ]->ZoomChanged(GetZoom());
if ( pHeaderBar )
- pHeaderBar->SetItemSize( pCols->GetObject(nPos)->GetId(), pCols->GetObject(nPos)->Width() );
+ pHeaderBar->SetItemSize( (*pCols)[ nPos ]->GetId(), (*pCols)[ nPos ]->Width() );
}
// all our controls have to be repositioned
@@ -218,7 +215,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
else if (STATE_CHANGE_ENABLE == nStateChange)
{
// do we have a handle column?
- sal_Bool bHandleCol = pCols->Count() && (0 == pCols->GetObject(0)->GetId());
+ sal_Bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId());
// do we have a header bar
sal_Bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar);
@@ -310,7 +307,6 @@ void BrowseBox::ColumnMoved( sal_uInt16 )
void BrowseBox::StartScroll()
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- //((Control*)pDataWin)->HideFocus();
DoHideCursor( "StartScroll" );
}
@@ -351,7 +347,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
long nLastRowInRect = 0; // fuer den CFront
// Handle-Column nicht highlighten
- BrowserColumn *pFirstCol = pCols->GetObject(0);
+ BrowserColumn *pFirstCol = pCols->empty() ? NULL : (*pCols)[ 0 ];
long nOfsX = (!pFirstCol || pFirstCol->GetId()) ? 0 : pFirstCol->Width();
// accumulate old row selection
@@ -369,20 +365,21 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
Rectangle aAddRect(
Point( nOfsX, (nRow-nTopRow)*GetDataRowHeight() ),
Size( pDataWin->GetSizePixel().Width(), GetDataRowHeight() ) );
- if ( aHighlightList.Count() && nLastRowInRect == ( nRow - 1 ) )
- aHighlightList.First()->Union( aAddRect );
+ if ( aHighlightList.size() && nLastRowInRect == ( nRow - 1 ) )
+ aHighlightList[ 0 ]->Union( aAddRect );
else
- aHighlightList.Insert( new Rectangle( aAddRect ), (sal_uLong) 0 );
+ aHighlightList.insert( aHighlightList.begin(), new Rectangle( aAddRect ) );
nLastRowInRect = nRow;
}
// unhighlight the old selection (if any)
- while ( aHighlightList.Count() )
+ for ( size_t i = aHighlightList.size(); i > 0; )
{
- Rectangle *pRect = aHighlightList.Remove( aHighlightList.Count() - 1 );
+ Rectangle *pRect = aHighlightList[ --i ];
pDataWin->Invalidate( *pRect );
delete pRect;
}
+ aHighlightList.clear();
// unhighlight old column selection (if any)
for ( long nColId = pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
@@ -390,7 +387,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
nColId = pColSel->NextSelected() )
{
Rectangle aRect( GetFieldRectPixel(nCurRow,
- pCols->GetObject(nColId)->GetId(),
+ (*pCols)[ nColId ]->GetId(),
sal_False ) );
aRect.Left() -= MIN_COLUMNWIDTH;
aRect.Right() += MIN_COLUMNWIDTH;
@@ -437,15 +434,14 @@ void BrowseBox::DrawCursor()
if ( bColumnCursor )
{
aCursor = GetFieldRectPixel( nCurRow, nCurColId, sal_False );
- //! --aCursor.Bottom();
aCursor.Left() -= MIN_COLUMNWIDTH;
aCursor.Right() += 1;
aCursor.Bottom() += 1;
}
else
aCursor = Rectangle(
- Point( ( pCols->Count() && pCols->GetObject(0)->GetId() == 0 ) ?
- pCols->GetObject(0)->Width() : 0,
+ Point( ( !pCols->empty() && (*pCols)[ 0 ]->GetId() == 0 ) ?
+ (*pCols)[ 0 ]->Width() : 0,
(nCurRow - nTopRow) * GetDataRowHeight() + 1 ),
Size( pDataWin->GetOutputSizePixel().Width() + 1,
GetDataRowHeight() - 2 ) );
@@ -456,8 +452,6 @@ void BrowseBox::DrawCursor()
--aCursor.Bottom();
}
- //!mi_mac pDataWin->Update();
-
if (m_aCursorColor == COL_TRANSPARENT)
{
// auf diesem Plattformen funktioniert der StarView-Focus richtig
@@ -486,9 +480,9 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nItemPos = GetColumnPos( nId );
- if ( nItemPos >= pCols->Count() )
+ if ( nItemPos >= pCols->size() )
return 0;
- return pCols->GetObject(nItemPos)->Width();
+ return (*pCols)[ nItemPos ]->Width();
}
//-------------------------------------------------------------------
@@ -497,9 +491,9 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- if ( nPos >= pCols->Count() )
+ if ( nPos >= pCols->size() )
return 0;
- return pCols->GetObject(nPos)->GetId();
+ return (*pCols)[ nPos ]->GetId();
}
//-------------------------------------------------------------------
@@ -508,8 +502,8 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- for ( sal_uInt16 nPos = 0; nPos < pCols->Count(); ++nPos )
- if ( pCols->GetObject(nPos)->GetId() == nId )
+ for ( sal_uInt16 nPos = 0; nPos < pCols->size(); ++nPos )
+ if ( (*pCols)[ nPos ]->GetId() == nId )
return nPos;
return BROWSER_INVALIDID;
}
@@ -520,9 +514,9 @@ sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- for ( sal_uInt16 nPos = 0; nPos < pCols->Count(); ++nPos )
- if ( pCols->GetObject(nPos)->GetId() == nColumnId )
- return pCols->GetObject(nPos)->IsFrozen();
+ for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
+ if ( (*pCols)[ nPos ]->GetId() == nColumnId )
+ return (*pCols)[ nPos ]->IsFrozen();
return sal_False;
}
@@ -599,7 +593,7 @@ void BrowseBox::Resize()
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bBootstrapped && IsReallyVisible() )
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
- if ( !pCols->Count() )
+ if ( pCols->empty() )
{
getDataWindow()->bResizeOnPaint = sal_True;
return;
@@ -619,7 +613,7 @@ void BrowseBox::Resize()
// did we need a horiz. scroll bar oder gibt es eine Control Area?
if ( !getDataWindow()->bNoHScroll &&
- ( ( pCols->Count() - FrozenColCount() ) > 1 ) )
+ ( ( pCols->size() - FrozenColCount() ) > 1 ) )
aHScroll.Show();
else
aHScroll.Hide();
@@ -659,7 +653,7 @@ void BrowseBox::Resize()
if ( pHeaderBar )
{
// Handle-Column beruecksichtigen
- BrowserColumn *pFirstCol = pCols->GetObject(0);
+ BrowserColumn *pFirstCol = (*pCols)[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
pHeaderBar->SetPosSizePixel( Point( nOfsX, 0 ), Size( GetOutputSizePixel().Width() - nOfsX, GetTitleHeight() ) );
}
@@ -677,10 +671,10 @@ void BrowseBox::Paint( const Rectangle& rRect )
// initializations
if ( !bBootstrapped && IsReallyVisible() )
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
- if ( !pCols->Count() )
+ if ( pCols->empty() )
return;
- BrowserColumn *pFirstCol = pCols->GetObject(0);
+ BrowserColumn *pFirstCol = (*pCols)[ 0 ];
sal_Bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0;
sal_Bool bHeaderBar = getDataWindow()->pHeaderBar != NULL;
@@ -709,20 +703,20 @@ void BrowseBox::Paint( const Rectangle& rRect )
{
// iterate through columns to redraw
long nX = 0;
- sal_uInt16 nCol;
+ size_t nCol;
for ( nCol = 0;
- nCol < pCols->Count() && nX < rRect.Right();
+ nCol < pCols->size() && nX < rRect.Right();
++nCol )
{
// skip invisible colums between frozen and scrollable area
- if ( nCol < nFirstCol && !pCols->GetObject(nCol)->IsFrozen() )
+ if ( nCol < nFirstCol && !(*pCols)[ nCol ]->IsFrozen() )
nCol = nFirstCol;
// nur die HandleCol ?
if (bHeaderBar && bHandleCol && nCol > 0)
break;
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
// draw the column and increment position
if ( pCol->Width() > 4 )
@@ -749,7 +743,7 @@ void BrowseBox::Paint( const Rectangle& rRect )
}
// retouching
- if ( !bHeaderBar && nCol == pCols->Count() )
+ if ( !bHeaderBar && nCol == pCols->size() )
{
const StyleSettings &rSettings = GetSettings().GetStyleSettings();
Color aColFace( rSettings.GetFaceColor() );
@@ -820,10 +814,10 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
nDataRowHeight = nForeignHeightPixel;
// this counts for the column widths, too
- sal_uInt16 nPos;
- for ( nPos = 0; nPos < pCols->Count(); ++nPos )
+ size_t nPos;
+ for ( nPos = 0; nPos < pCols->size(); ++nPos )
{
- BrowserColumn* pCurrent = pCols->GetObject(nPos);
+ BrowserColumn* pCurrent = (*pCols)[ nPos ];
long nWidthLogic = PixelToLogic(Size(pCurrent->Width(), 0), MAP_10TH_MM).Width();
long nForeignWidthPixel = pDev->LogicToPixel(Size(nWidthLogic, 0), MAP_10TH_MM).Width();
@@ -846,7 +840,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
long nTitleHeight = PixelToLogic(Size(0, GetTitleHeight()), MAP_10TH_MM).Height();
nTitleHeight = pDev->LogicToPixel(Size(0, nTitleHeight), MAP_10TH_MM).Height();
- BrowserColumn* pFirstCol = pCols->Count() ? pCols->GetObject(0) : NULL;
+ BrowserColumn* pFirstCol = !pCols->empty() ? (*pCols)[ 0 ] : NULL;
Point aHeaderPos(pFirstCol && (pFirstCol->GetId() == 0) ? pFirstCol->Width() : 0, 0);
Size aHeaderSize(aRealSize.Width() - aHeaderPos.X(), nTitleHeight);
@@ -900,9 +894,9 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
// restore the column widths/data row height
nDataRowHeight = nOriginalHeight;
- for ( nPos = 0; nPos < pCols->Count(); ++nPos )
+ for ( nPos = 0; nPos < pCols->size(); ++nPos )
{
- BrowserColumn* pCurrent = pCols->GetObject(nPos);
+ BrowserColumn* pCurrent = (*pCols)[ nPos ];
long nForeignWidthLogic = pDev->PixelToLogic(Size(pCurrent->Width(), 0), MAP_10TH_MM).Width();
long nWidthPixel = LogicToPixel(Size(nForeignWidthLogic, 0), MAP_10TH_MM).Width();
@@ -939,15 +933,12 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
Color aOldTextColor = _rOut.GetTextColor();
Color aOldFillColor = _rOut.GetFillColor();
Color aOldLineColor = _rOut.GetLineColor();
- long nHLineX = 0 == pCols->GetObject(0)->GetId()
- ? pCols->GetObject(0)->Width()
- : 0;
+ long nHLineX = 0 == (*pCols)[ 0 ]->GetId() ? (*pCols)[ 0 ]->Width() : 0;
nHLineX += aOverallAreaPos.X();
Color aDelimiterLineColor( ::svtools::ColorConfig().GetColorValue( ::svtools::CALCGRID ).nColor );
// redraw the invalid fields
- sal_Bool bRetouching = sal_False;
for ( sal_uLong nRelRow = nRelTopRow;
nRelRow <= nRelBottomRow && (sal_uLong)nTopRow+nRelRow < (sal_uLong)nRowCount;
++nRelRow, aPos.Y() += nDataRowHeigt )
@@ -961,7 +952,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
// prepare row
sal_uLong nRow = nTopRow+nRelRow;
if ( !SeekRow( nRow) ) {
- DBG_ERROR("BrowseBox::ImplPaintData: SeekRow gescheitert");
+ OSL_FAIL("BrowseBox::ImplPaintData: SeekRow gescheitert");
}
_rOut.SetClipRegion();
aPos.X() = aOverallAreaPos.X();
@@ -985,11 +976,11 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
}
// iterate through columns to redraw
- sal_uInt16 nCol;
- for ( nCol = 0; nCol < pCols->Count(); ++nCol )
+ size_t nCol;
+ for ( nCol = 0; nCol < pCols->size(); ++nCol )
{
// get column
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
// at end of invalid area
if ( aPos.X() >= _rRect.Right() )
@@ -999,11 +990,11 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
if ( nCol < nFirstCol && !pCol->IsFrozen() )
{
nCol = nFirstCol;
- pCol = pCols->GetObject(nCol);
+ pCol = (nCol < pCols->size() ) ? (*pCols)[ nCol ] : NULL;
if (!pCol)
{ // FS - 21.05.99 - 66325
// ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ...
- DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !");
+ OSL_FAIL("BrowseBox::PaintData : nFirstCol is probably invalid !");
break;
}
}
@@ -1066,9 +1057,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
aPos.X() += pCol->Width();
}
- if ( nCol == pCols->Count() )
- bRetouching = sal_True;
-
// reset auto-highlight
if ( bRowSelected )
{
@@ -1103,14 +1091,14 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
aOldLineColor = _rOut.GetLineColor();
aOldFillColor = _rOut.GetFillColor();
_rOut.SetFillColor( rSettings.GetFaceColor() );
- if ( pCols->Count() && ( pCols->GetObject(0)->GetId() == 0 ) && ( aPos.Y() <= _rRect.Bottom() ) )
+ if ( !pCols->empty() && ( (*pCols)[ 0 ]->GetId() == 0 ) && ( aPos.Y() <= _rRect.Bottom() ) )
{
// fill rectangle gray below handle column
// DG: fill it only until the end of the drawing rect and not to the end, as this may overpaint handle columns
_rOut.SetLineColor( Color( COL_BLACK ) );
_rOut.DrawRect( Rectangle(
Point( aOverallAreaPos.X() - 1, aPos.Y() - 1 ),
- Point( aOverallAreaPos.X() + pCols->GetObject(0)->Width() - 1,
+ Point( aOverallAreaPos.X() + (*pCols)[ 0 ]->Width() - 1,
_rRect.Bottom() + 1) ) );
}
_rOut.SetFillColor( aOldFillColor );
@@ -1129,16 +1117,16 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
_rOut.SetLineColor( aDelimiterLineColor );
Point aVertPos( aOverallAreaPos.X() - 1, aOverallAreaPos.Y() );
long nDeltaY = aOverallAreaBRPos.Y();
- for ( sal_uInt16 nCol = 0; nCol < pCols->Count(); ++nCol )
+ for ( size_t nCol = 0; nCol < pCols->size(); ++nCol )
{
// get column
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
// skip invisible colums between frozen and scrollable area
if ( nCol < nFirstCol && !pCol->IsFrozen() )
{
nCol = nFirstCol;
- pCol = pCols->GetObject(nCol);
+ pCol = (*pCols)[ nCol ];
}
// skip column
@@ -1171,7 +1159,7 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
// initializations
- if ( !pCols || !pCols->Count() || !rWin.IsUpdateMode() )
+ if ( !pCols || pCols->empty() || !rWin.IsUpdateMode() )
return;
if ( getDataWindow()->bResizeOnPaint )
Resize();
@@ -1231,7 +1219,7 @@ void BrowseBox::UpdateScrollbars()
sal_uInt16 nFrozenCols = FrozenColCount();
sal_Bool bNeedsHScroll = getDataWindow()->bAutoHScroll
- ? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols->Count() )
+ ? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols->size() )
: !getDataWindow()->bNoHScroll;
if ( !bNeedsHScroll )
{
@@ -1260,19 +1248,11 @@ void BrowseBox::UpdateScrollbars()
Size( aDataWinSize.Width() - nHScrX, nCornerSize ) );
// Scrollable Columns insgesamt
- short nScrollCols = short(pCols->Count()) - (short)nFrozenCols;
- /*short nVisibleHSize= std::max(nLastCol == BROWSER_INVALIDID
- ? pCols->Count() - nFirstCol -1
- : nLastCol - nFirstCol - 1, 0);
-
- aHScroll.SetVisibleSize( nVisibleHSize );
- aHScroll.SetRange( Range( 0, Max( std::min(nScrollCols, nVisibleHSize), (short)0 ) ) );
- if ( bNeedsHScroll && !aHScroll.IsVisible() )
- aHScroll.Show();*/
+ short nScrollCols = short(pCols->size()) - (short)nFrozenCols;
// Sichtbare Columns
short nVisibleHSize = nLastCol == BROWSER_INVALIDID
- ? (short)( pCols->Count() - nFirstCol )
+ ? (short)( pCols->size() - nFirstCol )
: (short)( nLastCol - nFirstCol );
short nRange = Max( nScrollCols, (short)0 );
@@ -1287,7 +1267,7 @@ void BrowseBox::UpdateScrollbars()
if ( nTopRow > nRowCount )
{
nTopRow = nRowCount - 1;
- DBG_ERROR("BrowseBox: nTopRow > nRowCount");
+ OSL_FAIL("BrowseBox: nTopRow > nRowCount");
}
if ( pVScroll->GetThumbPos() != nTopRow )
@@ -1338,13 +1318,13 @@ void BrowseBox::UpdateScrollbars()
if ( getDataWindow()->pHeaderBar )
{
long nWidth = 0;
- for ( sal_uInt16 nCol = 0;
- nCol < pCols->Count() && nCol < nFirstCol;
+ for ( size_t nCol = 0;
+ nCol < pCols->size() && nCol < nFirstCol;
++nCol )
{
// HandleColumn nicht
- if ( pCols->GetObject(nCol)->GetId() )
- nWidth += pCols->GetObject(nCol)->Width();
+ if ( (*pCols)[ nCol ]->GetId() )
+ nWidth += (*pCols)[ nCol ]->Width();
}
getDataWindow()->pHeaderBar->SetOffset( nWidth );
@@ -1406,10 +1386,10 @@ long BrowseBox::GetFrozenWidth() const
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
long nWidth = 0;
- for ( sal_uInt16 nCol = 0;
- nCol < pCols->Count() && pCols->GetObject(nCol)->IsFrozen();
+ for ( size_t nCol = 0;
+ nCol < pCols->size() && (*pCols)[ nCol ]->IsFrozen();
++nCol )
- nWidth += pCols->GetObject(nCol)->Width();
+ nWidth += (*pCols)[ nCol ]->Width();
return nWidth;
}
@@ -1431,7 +1411,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nCol;
for ( nCol = 0;
- nCol < pCols->Count() && pCols->GetObject(nCol)->IsFrozen();
+ nCol < pCols->size() && (*pCols)[ nCol ]->IsFrozen();
++nCol )
/* empty loop */;
return nCol;
@@ -1469,9 +1449,8 @@ IMPL_LINK( BrowseBox,EndScrollHdl,ScrollBar*, EMPTYARG )
// kein Focus grabben!
/// GrabFocus();
- if ( /*pBar->GetDelta() <= 0 &&*/ getDataWindow()->bNoScrollBack )
+ if ( getDataWindow()->bNoScrollBack )
{
- // UpdateScrollbars();
EndScroll();
return 0;
}
@@ -1506,10 +1485,10 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
long nX = 0;
long nWidth = GetOutputSizePixel().Width();
- for ( sal_uInt16 nCol = 0; nCol < pCols->Count() && nX < nWidth; ++nCol )
+ for ( size_t nCol = 0; nCol < pCols->size() && nX < nWidth; ++nCol )
{
// is this column visible?
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
{
// compute right end of column
@@ -1539,7 +1518,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
}
}
- // event occured out of data area
+ // event occurred out of data area
if ( rEvt.IsRight() )
pDataWin->Command(
CommandEvent( Point( 1, LONG_MAX ), COMMAND_CONTEXTMENU, sal_True ) );
@@ -1556,20 +1535,20 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
void BrowseBox::MouseMove( const MouseEvent& rEvt )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
- DBG_TRACE( "BrowseBox::MouseMove( MouseEvent )" );
+ OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" );
Pointer aNewPointer;
sal_uInt16 nX = 0;
- for ( sal_uInt16 nCol = 0;
- nCol < sal_uInt16(pCols->Count()) &&
- ( nX + pCols->GetObject(nCol)->Width() ) < sal_uInt16(GetOutputSizePixel().Width());
+ for ( size_t nCol = 0;
+ nCol < pCols->size() &&
+ ( nX + (*pCols)[ nCol ]->Width() ) < sal_uInt16(GetOutputSizePixel().Width());
++nCol )
// is this column visible?
- if ( pCols->GetObject(nCol)->IsFrozen() || nCol >= nFirstCol )
+ if ( (*pCols)[ nCol ]->IsFrozen() || nCol >= nFirstCol )
{
// compute right end of column
- BrowserColumn *pCol = pCols->GetObject(nCol);
+ BrowserColumn *pCol = (*pCols)[ nCol ];
sal_uInt16 nR = (sal_uInt16)(nX + pCol->Width() - 1);
// show resize-pointer?
@@ -1618,7 +1597,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
// width changed?
nDragX = Max( rEvt.GetPosPixel().X(), nMinResizeX );
- if ( (nDragX - nResizeX) != (long)pCols->GetObject(nResizeCol)->Width() )
+ if ( (nDragX - nResizeX) != (long)(*pCols)[ nResizeCol ]->Width() )
{
// resize column
long nMaxX = pDataWin->GetSizePixel().Width();
@@ -1666,7 +1645,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
{
if ( bColumnCursor && rEvt.GetColumn() != 0 )
{
- if ( rEvt.GetColumn() < pCols->Count() )
+ if ( rEvt.GetColumn() < pCols->size() )
SelectColumnPos( rEvt.GetColumn(), sal_True, sal_False);
}
}
@@ -2175,3 +2154,4 @@ Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,sal_uInt16 _nColId,
// ------------------------------------------------------------------------- EOF
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 966f8e8596fc..929aa3303a77 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -267,7 +268,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
#endif
break;
default:
- OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!");
+ OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!");
}
return aRetText;
}
@@ -374,7 +375,7 @@ void BrowseBox::FillAccessibleStateSet(
case ::svt::BBTYPE_ROWHEADERCELL:
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::svt::BBTYPE_CHECKBOXCELL:
- OSL_ENSURE(0,"Illegal call here!");
+ OSL_FAIL("Illegal call here!");
break;
}
}
@@ -566,3 +567,5 @@ Window* BrowseBox::GetWindowInstance()
{
return this;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index b517f6d931e5..a0a0f01f8251 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,6 @@
#include <svtools/brwhead.hxx>
#include <svtools/brwbox.hxx>
-#ifndef GCC
-#endif
-
//===================================================================
BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )
@@ -117,3 +115,4 @@ void BrowserHeader::EndDrag()
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 3c9ddb2876f7..d1540550117a 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ namespace svt
}
catch( const ::com::sun::star::uno::Exception& )
{
- OSL_ENSURE( sal_False, "THeaderCellMapFunctorDispose: caught an exception!" );
+ OSL_FAIL( "THeaderCellMapFunctorDispose: caught an exception!" );
}
}
};
@@ -85,3 +86,5 @@ namespace svt
}
#endif // _SVTOOLS_BRWIMPL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 377180653780..f944908c269d 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,24 +31,13 @@
#include "datwin.hxx"
-#ifndef GCC
-#endif
-
-#ifndef _APP_HXX //autogen
#include <vcl/svapp.hxx>
-#endif
-#ifndef _HELP_HXX
#include <vcl/help.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <tools/debug.hxx>
-DECLARE_LIST( BrowserColumns, BrowserColumn* )
-
//===================================================================
void ButtonFrame::Draw( OutputDevice& rDev )
{
@@ -242,6 +232,10 @@ BrowserDataWin::~BrowserDataWin()
{
if( pDtorNotify )
*pDtorNotify = sal_True;
+
+ for ( size_t i = 0, n = aInvalidRegion.size(); i < n; ++i )
+ delete aInvalidRegion[ i ];
+ aInvalidRegion.clear();
}
//-------------------------------------------------------------------
@@ -325,7 +319,7 @@ void BrowserDataWin::Paint( const Rectangle& rRect )
{
if ( bInPaint )
{
- aInvalidRegion.Insert( new Rectangle( rRect ) );
+ aInvalidRegion.push_back( new Rectangle( rRect ) );
return;
}
bInPaint = sal_True;
@@ -334,7 +328,7 @@ void BrowserDataWin::Paint( const Rectangle& rRect )
DoOutstandingInvalidations();
}
else
- aInvalidRegion.Insert( new Rectangle( rRect ) );
+ aInvalidRegion.push_back( new Rectangle( rRect ) );
}
//-------------------------------------------------------------------
@@ -352,28 +346,28 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
// find column under mouse
long nMouseX = rPosPixel.X();
long nColX = 0;
- sal_uInt16 nCol;
+ size_t nCol;
for ( nCol = 0;
- nCol < pBox->pCols->Count() && nColX < GetSizePixel().Width();
+ nCol < pBox->pCols->size() && nColX < GetSizePixel().Width();
++nCol )
- if ( pBox->pCols->GetObject(nCol)->IsFrozen() || nCol >= pBox->nFirstCol )
+ if ( (*pBox->pCols)[ nCol ]->IsFrozen() || nCol >= pBox->nFirstCol )
{
- nColX += pBox->pCols->GetObject(nCol)->Width();
+ nColX += (*pBox->pCols)[ nCol ]->Width();
if ( nMouseX < nColX )
break;
}
sal_uInt16 nColId = BROWSER_INVALIDID;
- if ( nCol < pBox->pCols->Count() )
- nColId = pBox->pCols->GetObject(nCol)->GetId();
+ if ( nCol < pBox->pCols->size() )
+ nColId = (*pBox->pCols)[ nCol ]->GetId();
// compute the field rectangle and field relative MouseEvent
Rectangle aFieldRect;
- if ( nCol < pBox->pCols->Count() )
+ if ( nCol < pBox->pCols->size() )
{
- nColX -= pBox->pCols->GetObject(nCol)->Width();
+ nColX -= (*pBox->pCols)[ nCol ]->Width();
aFieldRect = Rectangle(
Point( nColX, nRelRow * pBox->GetDataRowHeight() ),
- Size( pBox->pCols->GetObject(nCol)->Width(),
+ Size( (*pBox->pCols)[ nCol ]->Width(),
pBox->GetDataRowHeight() ) );
}
@@ -695,8 +689,7 @@ BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const
void BrowserDataWin::SetUpdateMode( sal_Bool bMode )
{
- DBG_ASSERT( !bUpdateMode || aInvalidRegion.Count() == 0,
- "invalid region not empty" );
+ DBG_ASSERT( !bUpdateMode || aInvalidRegion.empty(), "invalid region not empty" );
if ( bMode == bUpdateMode )
return;
@@ -708,14 +701,11 @@ void BrowserDataWin::SetUpdateMode( sal_Bool bMode )
//-------------------------------------------------------------------
void BrowserDataWin::DoOutstandingInvalidations()
{
- for ( Rectangle* pRect = aInvalidRegion.First();
- pRect;
- pRect = aInvalidRegion.Next() )
- {
- Control::Invalidate( *pRect );
- delete pRect;
+ for ( size_t i = 0, n = aInvalidRegion.size(); i < n; ++i ) {
+ Control::Invalidate( *aInvalidRegion[ i ] );
+ delete aInvalidRegion[ i ];
}
- aInvalidRegion.Clear();
+ aInvalidRegion.clear();
}
//-------------------------------------------------------------------
@@ -724,12 +714,10 @@ void BrowserDataWin::Invalidate( sal_uInt16 nFlags )
{
if ( !GetUpdateMode() )
{
- for ( Rectangle* pRect = aInvalidRegion.First();
- pRect;
- pRect = aInvalidRegion.Next() )
- delete pRect;
- aInvalidRegion.Clear();
- aInvalidRegion.Insert( new Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
+ for ( size_t i = 0, n = aInvalidRegion.size(); i < n; ++i )
+ delete aInvalidRegion[ i ];
+ aInvalidRegion.clear();
+ aInvalidRegion.push_back( new Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
}
else
Window::Invalidate( nFlags );
@@ -740,7 +728,7 @@ void BrowserDataWin::Invalidate( sal_uInt16 nFlags )
void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
{
if ( !GetUpdateMode() )
- aInvalidRegion.Insert( new Rectangle( rRect ) );
+ aInvalidRegion.push_back( new Rectangle( rRect ) );
else
Window::Invalidate( rRect, nFlags );
}
@@ -781,3 +769,4 @@ void BrowserScrollBar::EndScroll()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 91b22d764bb0..1aeb06b6a085 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,23 +29,19 @@
#ifndef _SFXDATWIN_HXX
#define _SFXDATWIN_HXX
-#ifndef _BRWBOX_HXX
#include <svtools/brwbox.hxx>
-#endif
#include <svtools/brwhead.hxx>
#include <vcl/timer.hxx>
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
-#include <tools/list.hxx>
#include <svtools/transfer.hxx>
+#include <vector>
//===================================================================
#define MIN_COLUMNWIDTH 2
#define DRAG_CRITICAL 4
-DECLARE_LIST( RectangleList, Rectangle* )
+typedef ::std::vector< Rectangle* > RectangleList;
//===================================================================
@@ -133,21 +130,21 @@ public:
String aRealRowCount; // zur Anzeige im VScrollBar
RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode
- FASTBOOL bInPaint; // sal_True while in Paint
- FASTBOOL bInCommand; // sal_True while in Command
- FASTBOOL bNoScrollBack; // nur vorwaerts scrollen
- FASTBOOL bNoHScroll; // kein horizontaler Scrollbar
- FASTBOOL bNoVScroll; // no vertical scrollbar
- FASTBOOL bAutoHScroll; // autohide horizontaler Scrollbar
- FASTBOOL bAutoVScroll; // autohide horizontaler Scrollbar
- FASTBOOL bUpdateMode; // nicht SV-UpdateMode wegen Invalidate()
- FASTBOOL bAutoSizeLastCol;// last column always fills up window
- FASTBOOL bResizeOnPaint; // outstanding resize-event
- FASTBOOL bUpdateOnUnlock; // Update() while locked
- FASTBOOL bInUpdateScrollbars; // Rekursionsschutz
- FASTBOOL bHadRecursion; // Rekursion war aufgetreten
- FASTBOOL bOwnDataChangedHdl; // dont change colors in DataChanged
- FASTBOOL bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently
+ bool bInPaint; // TRUE while in Paint
+ bool bInCommand; // TRUE while in Command
+ bool bNoScrollBack; // nur vorwaerts scrollen
+ bool bNoHScroll; // kein horizontaler Scrollbar
+ bool bNoVScroll; // no vertical scrollbar
+ bool bAutoHScroll; // autohide horizontaler Scrollbar
+ bool bAutoVScroll; // autohide horizontaler Scrollbar
+ bool bUpdateMode; // nicht SV-UpdateMode wegen Invalidate()
+ bool bAutoSizeLastCol; // last column always fills up window
+ bool bResizeOnPaint; // outstanding resize-event
+ bool bUpdateOnUnlock; // Update() while locked
+ bool bInUpdateScrollbars; // Rekursionsschutz
+ bool bHadRecursion; // Rekursion war aufgetreten
+ bool bOwnDataChangedHdl; // dont change colors in DataChanged
+ bool bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently
sal_uInt16 nUpdateLock; // lock count, dont call Control::Update()!
short nCursorHidden; // new conuter for DoHide/ShowCursor
@@ -185,7 +182,7 @@ public:
const String& GetRealRowCount() const { return aRealRowCount; }
void SetUpdateMode( sal_Bool bMode );
- FASTBOOL GetUpdateMode() const { return bUpdateMode; }
+ bool GetUpdateMode() const { return bUpdateMode; }
void EnterUpdateLock() { ++nUpdateLock; }
void LeaveUpdateLock();
void Update();
@@ -238,17 +235,6 @@ void InitSettings_Impl( Window *pWin,
//===================================================================
-#ifdef DBG_MI
-
-void DoLog_Impl( const BrowseBox *pThis, const char *pWhat, const char *pWho );
-#define LOG(pThis,what,who) DoLog_Impl(pThis,what,who)
-
-#else
-
-#define LOG(pThis,what,who)
-
-#endif
-
-
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 9f870a9f0681..7b679aed53b2 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -626,3 +627,4 @@ namespace svt
// .......................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 04bb47c2ab3e..dc568cfec7e9 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,26 +30,18 @@
#include "precompiled_svtools.hxx"
#include <svtools/editbrowsebox.hxx>
-#ifndef _SVTOOLS_EDITBROWSEBOX_HRC_
#include "editbrowsebox.hrc"
-#endif
-#ifndef _APP_HXX //autogen
#include <vcl/svapp.hxx>
-#endif
#include <tools/debug.hxx>
#include <vcl/window.hxx>
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <tools/resid.hxx>
#include <vcl/spinfld.hxx>
#include <svtools/svtdata.hxx>
-#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
-#endif
#include <algorithm>
#include <tools/multisel.hxx>
@@ -64,13 +57,6 @@ namespace svt
namespace
{
//..............................................................
- sal_Bool isHiContrast(Window* _pWindow)
- {
- OSL_ENSURE(_pWindow,"Window must be not null!");
- return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode();
- }
-
- //..............................................................
sal_uInt16 getRealGetFocusFlags( Window* _pWindow )
{
sal_uInt16 nFlags = 0;
@@ -144,7 +130,6 @@ namespace svt
void EditBrowseBox::impl_construct()
{
m_aImpl = ::std::auto_ptr<EditBrowseBoxImpl>(new EditBrowseBoxImpl());
- m_aImpl->m_bHiContrast = isHiContrast(&GetDataWindow());
SetCompoundControl(sal_True);
SetGridLineColor( Color( COL_LIGHTGRAY ) );
@@ -309,11 +294,9 @@ namespace svt
//------------------------------------------------------------------------------
Image EditBrowseBox::GetImage(RowStatus eStatus) const
{
- sal_Bool bHiContrast = isHiContrast(&GetDataWindow());
- if ( !m_aStatusImages.GetImageCount() || (bHiContrast != m_aImpl->m_bHiContrast) )
+ if ( !m_aStatusImages.GetImageCount() )
{
- m_aImpl->m_bHiContrast = bHiContrast;
- const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList(SvtResId(bHiContrast ? RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H : RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX));
+ const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX ) );
}
Image aImage;
@@ -518,7 +501,6 @@ namespace svt
// we are about to leave the current cell. If there is a "this cell has been modified" notification
// pending (asynchronously), this may be deadly -> do it synchronously
- // 95826 - 2002-10-14 - fs@openoffice.org
if ( nCellModifiedEvent )
{
Application::RemoveUserEvent( nCellModifiedEvent );
@@ -529,7 +511,6 @@ namespace svt
if (0 == rEvt.GetColumnId())
{ // it was the handle column. save the current cell content if necessary
// (clicking on the handle column results in selecting the current row)
- // 23.01.2001 - 82797 - FS
if (IsEditing() && aController->IsModified())
SaveModified();
}
@@ -1435,3 +1416,4 @@ namespace svt
} // namespace svt
// .......................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index 6511d97ea86a..beb2236ab2c8 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.src
@@ -42,25 +42,15 @@ ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
Blue = 0xFFFF;
};
IdList = {
- IMG_EBB_CURRENT; IMG_EBB_MODIFIED;
- IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW;
- IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER;
- };
- IdCount = { 9; };
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H
-{
- Prefix = "edh";
- MaskColor = Color {
- Red = 0xFFFF;
- Green = 0x0000;
- Blue = 0xFFFF;
- };
- IdList = {
- IMG_EBB_CURRENT; IMG_EBB_MODIFIED;
- IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW;
- IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER;
+ IMG_EBB_CURRENT;
+ IMG_EBB_MODIFIED;
+ IMG_EBB_NEW;
+ IMG_EBB_DELETED;
+ IMG_EBB_CURRENTNEW;
+ IMG_EBB_PRIMARYKEY;
+ IMG_EBB_CURRENT_PRIMARYKEY;
+ IMG_EBB_FILTER;
+ IMG_EBB_HEADERFOOTER;
};
IdCount = { 9; };
};
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 9f247a580fc9..56f33bac499b 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,7 +133,7 @@ void EditBrowseBoxImpl::clearActiveCell()
}
catch(const Exception&)
{
- OSL_ENSURE( sal_False, "EditBrowseBoxImpl::clearActiveCell: caught an exception while disposing the AccessibleCell!" );
+ OSL_FAIL( "EditBrowseBoxImpl::clearActiveCell: caught an exception while disposing the AccessibleCell!" );
}
m_xActiveCell = NULL;
@@ -220,3 +221,4 @@ sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumn
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index 724da694b9c1..cb7303fcfba6 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,10 +37,10 @@ namespace svt
{
public:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xActiveCell;
- sal_Bool m_bHiContrast;
void clearActiveCell();
};
}
#endif // SVTOOLS_EDITBROWSEBOX_IMPL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 1cd368df0f5f..94cfd764a4d4 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,21 +37,11 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
-#endif
-#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
#include <comphelper/configurationhelper.hxx>
-#endif
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
#include <unotools/processfactory.hxx>
-#endif
-#ifndef _SVT_LOGHELPER_HXX_
#include <unotools/loghelper.hxx>
-#endif
#include <svl/smplhint.hxx>
@@ -61,8 +52,8 @@
#include <itemholder2.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+
namespace css = com::sun::star;
#define HELP_TIP_TIMEOUT 0xffff // max. timeout setting to pretend a non-timeout
@@ -559,12 +550,12 @@ void SvtAccessibilityOptions::Commit()
sal_Bool SvtAccessibilityOptions::GetIsForDrawings() const
{
- DBG_ERROR( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
+ OSL_FAIL( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
return sal_False;
}
sal_Bool SvtAccessibilityOptions::GetIsForBorders() const
{
- DBG_ERROR( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
+ OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
return sal_False;
}
sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
@@ -647,3 +638,5 @@ void SvtAccessibilityOptions::SetVCLSettings()
sm_pSingleImplConfig->SetVCLSettings();
}
// -----------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 1c581dbf8f53..7dc3ef20cfc8 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,6 +36,7 @@
#include "vcl/settings.hxx"
#include "vcl/svapp.hxx"
#include <rtl/logfile.hxx>
+#include <sal/macros.h>
#define DEFAULT_LOOKNFEEL 0
#define DEFAULT_DRAGMODE 2
@@ -47,20 +49,17 @@ using namespace ::com::sun::star::uno;
sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
SvtTabAppearanceCfg::SvtTabAppearanceCfg()
- :ConfigItem(OUString::createFromAscii("Office.Common/View"))
+ :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View")))
,nDragMode ( DEFAULT_DRAGMODE )
,nScaleFactor ( DEFAULT_SCALEFACTOR )
,nSnapMode ( DEFAULT_SNAPMODE )
,nMiddleMouse ( MOUSE_MIDDLE_AUTOSCROLL )
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT )
#endif
,bMenuMouseFollow(sal_False)
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
,bFontAntialiasing ( sal_True )
#endif
{
@@ -84,7 +83,7 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
case 2: bMenuMouseFollow = *(sal_Bool*)pValues->getValue(); break; //"Menu/FollowMouse",
case 3: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
case 4: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
case 5: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break; // "FontAntialising/Enabled",
case 6: *pValues >>= nAAMinPixelHeight; break; // "FontAntialising/MinPixelHeight",
#endif
@@ -93,15 +92,11 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
}
}
}
-/* -----------------------------22.05.01 11:53--------------------------------
- ---------------------------------------------------------------------------*/
SvtTabAppearanceCfg::~SvtTabAppearanceCfg( )
{
}
-/* -----------------------------22.05.01 11:54--------------------------------
- ---------------------------------------------------------------------------*/
const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
{
static Sequence<OUString> aNames;
@@ -114,12 +109,12 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
,"Menu/FollowMouse" // 2
,"Dialog/MousePositioning" // 3
,"Dialog/MiddleMouseButton" // 4
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
,"FontAntiAliasing/Enabled" // 5
,"FontAntiAliasing/MinPixelHeight" // 6
#endif
};
- const int nCount = sizeof( aPropNames ) / sizeof( aPropNames[0] );
+ const int nCount = SAL_N_ELEMENTS( aPropNames );
aNames.realloc(nCount);
const sal_Char** pAsciiNames = aPropNames;
@@ -129,9 +124,7 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
}
return aNames;
}
-/* -----------------------------22.05.01 11:54--------------------------------
- ---------------------------------------------------------------------------*/
void SvtTabAppearanceCfg::Commit()
{
const Sequence<OUString>& rNames = GetPropertyNames();
@@ -148,7 +141,7 @@ void SvtTabAppearanceCfg::Commit()
case 2: pValues[nProp].setValue(&bMenuMouseFollow, rType); break; //"Menu/FollowMouse",
case 3: pValues[nProp] <<= nSnapMode; break; //"Dialog/MousePositioning",
case 4: pValues[nProp] <<= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
case 5: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
case 6: pValues[nProp] <<= nAAMinPixelHeight; break; // "FontAntialising/MinPixelHeight",
#endif
@@ -161,46 +154,29 @@ void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUSt
{
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SvtTabAppearanceCfg::SetDragMode ( sal_uInt16 nSet )
{
nDragMode = nSet;
SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SvtTabAppearanceCfg::SetScaleFactor ( sal_uInt16 nSet )
{
nScaleFactor = nSet;
SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SvtTabAppearanceCfg::SetSnapMode ( sal_uInt16 nSet )
{
nSnapMode = nSet;
SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
+
void SvtTabAppearanceCfg::SetMiddleMouseButton ( sal_uInt16 nSet )
{
nMiddleMouse = nSet;
SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
{
@@ -221,7 +197,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
hAppStyle.SetScreenZoom( nScaleFactor );
hAppStyle.SetScreenFontZoom( nScaleFactor );
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
// font anti aliasing
hAppStyle.SetAntialiasingMinPixelHeight( nAAMinPixelHeight );
hAppStyle.SetDisplayOptions( bFontAntialiasing ? 0 : DISPLAY_OPTION_AA_DISABLE );
@@ -270,3 +246,4 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 91e93cc65998..ebefe664dd18 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <svl/poolitem.hxx> //Any2Bool
#include <svl/smplhint.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <itemholder2.hxx>
@@ -53,9 +54,10 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+
namespace svtools
{
@@ -71,8 +73,6 @@ namespace
ColorConfig_Impl* ColorConfig::m_pImpl = NULL;
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
class ColorConfig_Impl : public utl::ConfigItem
{
ColorConfigValue m_aConfigValues[ColorConfigEntryCount];
@@ -113,9 +113,6 @@ public:
void ImplUpdateApplicationSettings();
};
-/* -----------------------------16.01.01 15:36--------------------------------
-
- ---------------------------------------------------------------------------*/
uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
{
uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
@@ -140,6 +137,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
{ RTL_CONSTASCII_USTRINGPARAM("/Anchor") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/Spell") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/SmartTags") ,sal_False },
+ { RTL_CONSTASCII_USTRINGPARAM("/Shadow") , sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterTextGrid") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings") ,sal_True },
@@ -198,9 +196,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
aNames.realloc(nIndex);
return aNames;
}
-/* -----------------------------22.03.2002 14:37------------------------------
- ---------------------------------------------------------------------------*/
ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
ConfigItem(C2U("Office.UI/ColorScheme")),
m_bEditMode(bEditMode),
@@ -220,17 +216,13 @@ ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
::Application::AddEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
}
-/* -----------------------------25.03.2002 12:28------------------------------
- ---------------------------------------------------------------------------*/
ColorConfig_Impl::~ColorConfig_Impl()
{
// #100822#
::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
{
rtl::OUString sScheme(rScheme);
@@ -263,18 +255,14 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
m_aConfigValues[i / 2].bIsVisible = Any2Bool(pColors[nIndex++]);
}
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfig_Impl::Notify( const uno::Sequence<OUString>& )
{
//loading via notification always uses the default setting
Load(::rtl::OUString());
NotifyListeners(0);
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfig_Impl::Commit()
{
uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme);
@@ -306,9 +294,7 @@ void ColorConfig_Impl::Commit()
CommitCurrentSchemeName();
}
-/* -----------------11.12.2002 10:42-----------------
- *
- * --------------------------------------------------*/
+
void ColorConfig_Impl::CommitCurrentSchemeName()
{
//save current scheme name
@@ -318,9 +304,7 @@ void ColorConfig_Impl::CommitCurrentSchemeName()
aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
PutProperties(aCurrent, aCurrentVal);
}
-/* -----------------------------25.03.2002 12:19------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorConfigValue& rValue )
{
if(rValue != m_aConfigValues[eValue])
@@ -329,16 +313,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC
SetModified();
}
}
-/* -----------------------------25.03.2002 15:22------------------------------
- ---------------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames()
{
return GetNodeNames(C2U("ColorSchemes"));
}
-/* -----------------------------09.04.2002 17:19------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
{
if(ConfigItem::AddNode(C2U("ColorSchemes"), rScheme))
@@ -349,29 +329,23 @@ sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
}
return sal_False;
}
-/* -----------------------------09.04.2002 17:19------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
{
uno::Sequence< rtl::OUString > aElements(1);
aElements.getArray()[0] = rScheme;
return ClearNodeElements(C2U("ColorSchemes"), aElements);
}
-/* -----------------------------2002/06/20 13:03------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfig_Impl::SettingsChanged()
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
ImplUpdateApplicationSettings();
NotifyListeners(0);
}
-/* -----------------------------2002/08/16 12:07 -----------------------------
- #100822#
- --------------------------------------------------------------------------- */
+
IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
{
if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
@@ -428,9 +402,7 @@ ColorConfig::ColorConfig()
++nColorRefCount_Impl;
m_pImpl->AddListener(this);
}
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
ColorConfig::~ColorConfig()
{
::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
@@ -441,9 +413,7 @@ ColorConfig::~ColorConfig()
m_pImpl = 0;
}
}
-/* -----------------------------11.04.2002 11:49------------------------------
- ---------------------------------------------------------------------------*/
Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
{
static const sal_Int32 aAutoColors[] =
@@ -459,6 +429,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
0, // ANCHOR
0xff0000, // SPELL
COL_LIGHTMAGENTA,// SMARTTAGS
+ COL_GRAY, // SHADOWCOLOR
0xc0c0c0, // WRITERTEXTGRID
0xc0c0c0, // WRITERFIELDSHADIN
0xc0c0c0, // WRITERIDXSHADINGS
@@ -510,17 +481,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
case SPELL :
case DRAWDRAWING :
case SMARTTAGS :
- {
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- aRet = rStyleSettings.GetHighContrastMode() ?
- rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
- }
- break;
+ aRet = aAutoColors[eEntry];
+ break;
case DRAWFILL :
- aRet = /*rStyleSettings.GetHighContrastMode() ?
- rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry];
- break;
+ aRet = aAutoColors[eEntry];
+ break;
case FONTCOLOR :
aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
@@ -539,9 +505,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
}
return aRet;
}
-/* -----------------------------11.04.2002 11:49------------------------------
- ---------------------------------------------------------------------------*/
ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart)const
{
ColorConfigValue aRet = m_pImpl->GetColorConfigValue(eEntry);
@@ -562,18 +526,14 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bS
return aRet;
}
-/* -----------------------------25.03.2002 12:01------------------------------
- ---------------------------------------------------------------------------*/
EditableColorConfig::EditableColorConfig() :
m_pImpl(new ColorConfig_Impl),
m_bModified(sal_False)
{
m_pImpl->BlockBroadcasts(sal_True);
}
-/*-- 25.03.2002 12:03:08---------------------------------------------------
- -----------------------------------------------------------------------*/
EditableColorConfig::~EditableColorConfig()
{
m_pImpl->BlockBroadcasts(sal_False);
@@ -584,30 +544,21 @@ EditableColorConfig::~EditableColorConfig()
delete m_pImpl;
}
-/*-- 25.03.2002 12:03:15---------------------------------------------------
-
- -----------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString > EditableColorConfig::GetSchemeNames() const
{
return m_pImpl->GetSchemeNames();
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
{
m_pImpl->RemoveScheme(rScheme);
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme )
{
m_pImpl->AddScheme(rScheme);
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
{
if(m_bModified)
@@ -620,32 +571,25 @@ sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
m_pImpl->CommitCurrentSchemeName();
return sal_True;
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const
{
return m_pImpl->GetLoadedScheme();
}
-/* -----------------11.12.2002 10:56-----------------
- * changes the name of the current scheme but doesn't load it!
- * --------------------------------------------------*/
+
+// Changes the name of the current scheme but doesn't load it!
void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
{
m_pImpl->SetCurrentSchemeName(rScheme);
m_pImpl->CommitCurrentSchemeName();
}
-/*-- 25.03.2002 12:03:17---------------------------------------------------
- -----------------------------------------------------------------------*/
const ColorConfigValue& EditableColorConfig::GetColorValue(
ColorConfigEntry eEntry)const
{
return m_pImpl->GetColorConfigValue(eEntry);
}
-/*-- 25.03.2002 12:03:17---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableColorConfig::SetColorValue(
ColorConfigEntry eEntry, const ColorConfigValue& rValue)
{
@@ -653,16 +597,12 @@ void EditableColorConfig::SetColorValue(
m_pImpl->ClearModified();
m_bModified = sal_True;
}
-/* -----------------------------10.04.2002 13:22------------------------------
- ---------------------------------------------------------------------------*/
void EditableColorConfig::SetModified()
{
m_bModified = sal_True;
}
-/* -----------------15.10.2002 14:51-----------------
- *
- * --------------------------------------------------*/
+
void EditableColorConfig::Commit()
{
if(m_bModified)
@@ -684,3 +624,5 @@ void EditableColorConfig::EnableBroadcast()
// -----------------------------------------------------------------------------
}//namespace svtools
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 35d0276144ec..59bb82aa2c56 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <svl/poolitem.hxx> //Any2Bool
#include <svl/smplhint.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
/* #100822# ----
#include <vcl/wrkwin.hxx>
@@ -53,9 +54,10 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+
namespace svtools
{
@@ -69,8 +71,6 @@ namespace
ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL;
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
{
DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, TDisplayNames);
@@ -123,7 +123,7 @@ public:
aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) );
aMessage.append( "\nname: " );
aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) );
- OSL_ENSURE( 0, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
return ExtendedColorConfigValue();
}
@@ -151,9 +151,6 @@ public:
DECL_LINK( DataChangedEventListener, VclWindowEvent* );
};
-/* -----------------------------16.01.01 15:36--------------------------------
-
- ---------------------------------------------------------------------------*/
uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
{
uno::Sequence< OUString> aNames(GetNodeNames(rScheme));
@@ -212,10 +209,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
sRet = m_aConfigValuesPos[_nPos]->first;
return sRet;
}
-// -----------------------------------------------------------------------------
-/* -----------------------------22.03.2002 14:37------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool ExtendedColorConfig_Impl::m_bLockBroadcast = sal_False;
sal_Bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False;
ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) :
@@ -235,9 +229,7 @@ ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) :
::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) );
}
-/* -----------------------------25.03.2002 12:28------------------------------
- ---------------------------------------------------------------------------*/
ExtendedColorConfig_Impl::~ExtendedColorConfig_Impl()
{
// #100822#
@@ -260,9 +252,7 @@ sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast()
{
return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void lcl_addString(uno::Sequence < ::rtl::OUString >& _rSeq,const ::rtl::OUString& _sAdd)
{
::rtl::OUString* pIter = _rSeq.getArray();
@@ -338,12 +328,12 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
{
aComponentNames = GetPropertyNames(sBase);
FillComponentColors(aComponentNames,aDisplayNameMap);
- } // if ( bFound )
+ }
if ( !m_sLoadedScheme.getLength() )
m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
- if ( !sScheme.equalsAscii("default") )
+ if ( !sScheme.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("default")) )
{
::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default"));
if ( ExistsScheme(sDefault) )
@@ -352,7 +342,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
aComponentNames = GetPropertyNames(sBaseDefault);
FillComponentColors(aComponentNames,aDisplayNameMap);
}
- } // if ( !sScheme.equalsAscii("default") )
+ }
if ( !bFound && sScheme.getLength() )
{
AddScheme(sScheme);
@@ -424,15 +414,13 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
}
}
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rPropertyNames*/)
{
//loading via notification always uses the default setting
Load(::rtl::OUString());
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
if(m_bLockBroadcast)
{
@@ -441,9 +429,7 @@ void ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rProp
else
Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
}
-/* -----------------------------22.03.2002 14:38------------------------------
- ---------------------------------------------------------------------------*/
void ExtendedColorConfig_Impl::Commit()
{
if ( !m_sLoadedScheme.getLength() )
@@ -490,9 +476,7 @@ void ExtendedColorConfig_Impl::Commit()
CommitCurrentSchemeName();
}
-/* -----------------11.12.2002 10:42-----------------
- *
- * --------------------------------------------------*/
+
void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
{
//save current scheme name
@@ -515,10 +499,7 @@ sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeN
;
return pCompIter != pCompEnd;
}
-// -----------------------------------------------------------------------------
-/* -----------------------------25.03.2002 12:19------------------------------
- ---------------------------------------------------------------------------*/
void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue )
{
TComponents::iterator aFind = m_aConfigValues.find(_sName);
@@ -530,16 +511,12 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName
SetModified();
}
}
-/* -----------------------------25.03.2002 15:22------------------------------
- ---------------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString> ExtendedColorConfig_Impl::GetSchemeNames()
{
return GetNodeNames(C2U("ExtendedColorScheme/ColorSchemes"));
}
-/* -----------------------------09.04.2002 17:19------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
{
if(ConfigItem::AddNode(C2U("ExtendedColorScheme/ColorSchemes"), rScheme))
@@ -550,34 +527,26 @@ sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
}
return sal_False;
}
-/* -----------------------------09.04.2002 17:19------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
{
uno::Sequence< rtl::OUString > aElements(1);
aElements.getArray()[0] = rScheme;
return ClearNodeElements(C2U("ExtendedColorScheme/ColorSchemes"), aElements);
}
-/* -----------------------------2002/06/20 13:03------------------------------
- ---------------------------------------------------------------------------*/
void ExtendedColorConfig_Impl::SettingsChanged()
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
Broadcast( SfxSimpleHint( SFX_HINT_COLORS_CHANGED ) );
}
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
+
void ExtendedColorConfig_Impl::LockBroadcast()
{
m_bLockBroadcast = sal_True;
}
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
+
void ExtendedColorConfig_Impl::UnlockBroadcast()
{
if ( m_bBroadcastWhenUnlocked )
@@ -594,9 +563,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast()
}
m_bLockBroadcast = sal_False;
}
-/* -----------------------------2002/08/16 12:07 -----------------------------
- #100822#
- --------------------------------------------------------------------------- */
+
IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
{
if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
@@ -625,9 +592,7 @@ ExtendedColorConfig::ExtendedColorConfig()
++nExtendedColorRefCount_Impl;
StartListening( *m_pImpl);
}
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
ExtendedColorConfig::~ExtendedColorConfig()
{
::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
@@ -638,9 +603,7 @@ ExtendedColorConfig::~ExtendedColorConfig()
m_pImpl = 0;
}
}
-/* -----------------------------11.04.2002 11:49------------------------------
- ---------------------------------------------------------------------------*/
ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const
{
return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
@@ -670,28 +633,21 @@ ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const
{
return m_pImpl->GetComponentDisplayName(_sComponentName);
}
-// -----------------------------------------------------------------------------
-/* -----------------------------12.04.2002 09:25------------------------------
- ---------------------------------------------------------------------------*/
void ExtendedColorConfig::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
Broadcast( rHint );
}
-/* -----------------------------25.03.2002 12:01------------------------------
- ---------------------------------------------------------------------------*/
EditableExtendedColorConfig::EditableExtendedColorConfig() :
m_pImpl(new ExtendedColorConfig_Impl),
m_bModified(sal_False)
{
m_pImpl->LockBroadcast();
}
-/*-- 25.03.2002 12:03:08---------------------------------------------------
- -----------------------------------------------------------------------*/
EditableExtendedColorConfig::~EditableExtendedColorConfig()
{
m_pImpl->UnlockBroadcast();
@@ -702,30 +658,22 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig()
delete m_pImpl;
}
-/*-- 25.03.2002 12:03:15---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString > EditableExtendedColorConfig::GetSchemeNames() const
{
return m_pImpl->GetSchemeNames();
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableExtendedColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
{
m_pImpl->RemoveScheme(rScheme);
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableExtendedColorConfig::AddScheme(const ::rtl::OUString& rScheme )
{
m_pImpl->AddScheme(rScheme);
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
{
if(m_bModified)
@@ -738,32 +686,25 @@ sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme
m_pImpl->CommitCurrentSchemeName();
return sal_True;
}
-/*-- 25.03.2002 12:03:16---------------------------------------------------
- -----------------------------------------------------------------------*/
const ::rtl::OUString& EditableExtendedColorConfig::GetCurrentSchemeName()const
{
return m_pImpl->GetLoadedScheme();
}
-/* -----------------11.12.2002 10:56-----------------
- * changes the name of the current scheme but doesn't load it!
- * --------------------------------------------------*/
+
+// Changes the name of the current scheme but doesn't load it!
void EditableExtendedColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
{
m_pImpl->SetCurrentSchemeName(rScheme);
m_pImpl->CommitCurrentSchemeName();
}
-/*-- 25.03.2002 12:03:17---------------------------------------------------
- -----------------------------------------------------------------------*/
ExtendedColorConfigValue EditableExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,
const ::rtl::OUString& _sName)const
{
return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
}
-/*-- 25.03.2002 12:03:17---------------------------------------------------
- -----------------------------------------------------------------------*/
void EditableExtendedColorConfig::SetColorValue(
const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue)
{
@@ -771,16 +712,12 @@ void EditableExtendedColorConfig::SetColorValue(
m_pImpl->ClearModified();
m_bModified = sal_True;
}
-/* -----------------------------10.04.2002 13:22------------------------------
- ---------------------------------------------------------------------------*/
void EditableExtendedColorConfig::SetModified()
{
m_bModified = sal_True;
}
-/* -----------------15.10.2002 14:51-----------------
- *
- * --------------------------------------------------*/
+
void EditableExtendedColorConfig::Commit()
{
if(m_bModified)
@@ -825,3 +762,5 @@ ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigVal
return m_pImpl->GetComponentDisplayName(_sComponentName);
}
}//namespace svtools
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index bf372902fb6f..95dce21ddd45 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,11 +40,12 @@
#include <rtl/logfile.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString::createFromAscii(cChar)
const sal_Char cReplacement[] = "Replacement";
@@ -63,11 +65,9 @@ struct SvtFontSubstConfig_Impl
{
SubstitutionStructArr aSubstArr;
};
-/* -----------------------------18.01.01 12:04--------------------------------
- ---------------------------------------------------------------------------*/
SvtFontSubstConfig::SvtFontSubstConfig() :
- ConfigItem(C2U("Office.Common/Font/Substitution")),
+ ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/Substitution"))),
bIsEnabled(sal_False),
pImpl(new SvtFontSubstConfig_Impl)
{
@@ -86,13 +86,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
Sequence<OUString> aPropNames(aNodeNames.getLength() * 4);
OUString* pNames = aPropNames.getArray();
sal_Int32 nName = 0;
- sPropPrefix += C2U("/");
+ sPropPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
sal_Int32 nNode;
for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
{
OUString sStart(sPropPrefix);
sStart += pNodeNames[nNode];
- sStart += C2U("/");
+ sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
pNames[nName] = sStart; pNames[nName++] += C2U(cReplaceFont);
pNames[nName] = sStart; pNames[nName++] += C2U(cSubstituteFont);
pNames[nName] = sStart; pNames[nName++] += C2U(cAlways);
@@ -111,16 +111,12 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
pImpl->aSubstArr.Insert(pInsert, pImpl->aSubstArr.Count());
}
}
-/* -----------------------------18.01.01 12:06--------------------------------
- ---------------------------------------------------------------------------*/
SvtFontSubstConfig::~SvtFontSubstConfig()
{
delete pImpl;
}
-/*-- 18.01.01 12:08:00---------------------------------------------------
- -----------------------------------------------------------------------*/
void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
{
}
@@ -168,23 +164,17 @@ void SvtFontSubstConfig::Commit()
ReplaceSetProperties(sNode, aSetValues);
}
}
-/*-- 18.01.01 12:08:00---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SvtFontSubstConfig::SubstitutionCount() const
{
return pImpl->aSubstArr.Count();
}
-/*-- 18.01.01 12:08:00---------------------------------------------------
- -----------------------------------------------------------------------*/
void SvtFontSubstConfig::ClearSubstitutions()
{
pImpl->aSubstArr.DeleteAndDestroy(0, pImpl->aSubstArr.Count());
}
-/*-- 18.01.01 12:08:00---------------------------------------------------
- -----------------------------------------------------------------------*/
const SubstitutionStruct* SvtFontSubstConfig::GetSubstitution(sal_Int32 nPos)
{
DBG_ASSERT(nPos >= 0 && nPos < pImpl->aSubstArr.Count(), "illegal array index");
@@ -192,9 +182,7 @@ const SubstitutionStruct* SvtFontSubstConfig::GetSubstitution(sal_Int32 nPos)
return pImpl->aSubstArr[(sal_uInt16)nPos];
return 0;
}
-/*-- 18.01.01 12:08:01---------------------------------------------------
- -----------------------------------------------------------------------*/
void SvtFontSubstConfig::AddSubstitution(const SubstitutionStruct& rToAdd)
{
SubstitutionStructPtr pInsert = new SubstitutionStruct(rToAdd);
@@ -227,3 +215,5 @@ void SvtFontSubstConfig::Apply()
OutputDevice::EndFontSubstitution();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 091bf50c4787..6e80db6fcf6c 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,10 +43,11 @@
#include "itemholder2.hxx"
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star;
+using ::rtl::OUString;
+
static SvtHelpOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
@@ -165,7 +167,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
// -----------------------------------------------------------------------
SvtHelpOptions_Impl::SvtHelpOptions_Impl()
- : ConfigItem( OUString::createFromAscii("Office.Common/Help") )
+ : ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Help" )) )
, pList( 0 )
, bExtendedHelp( sal_False )
, bHelpTips( sal_True )
@@ -200,7 +202,9 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
{
for ( int nProp = 0; nProp < rPropertyNames.getLength(); nProp++ )
{
- DBG_ASSERT( pValues[nProp].hasValue(), "property value missing" );
+#if OSL_DEBUG_LEVEL > 1
+ OSL_ASSERT( pValues[nProp].hasValue(), "property value missing" );
+#endif
if ( pValues[nProp].hasValue() )
{
sal_Bool bTmp = sal_Bool();
@@ -262,8 +266,8 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
}
else
{
- DBG_ERRORFILE( "Wrong Type!" );
- }
+ DBG_ERRORFILE( "Wrong Type!" );
+ }
}
}
if ( IsHelpTips() != Help::IsQuickHelpEnabled() )
@@ -278,10 +282,10 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
{
// the ignore counters for the help agent URLs
- const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
- const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
- const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
- const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+ const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+ const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+ const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
// get the names of all the nodes containing ignore counters
// collect the node names we have to ask
@@ -338,10 +342,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
{
::osl::MutexGuard aGuard(aIgnoreCounterSafety);
- const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
- const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
- const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
- const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+ const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+ const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+ const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
// get the current URL/counter pairs (as they're persistent at the moment)
Sequence< ::rtl::OUString > aNodeNames;
@@ -425,7 +429,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
::rtl::OUString sNewNodeName;
Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
Sequence< Any > aNewCounterDataValues(2);
- const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL");
+ const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" ));
for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
aCollectNew != aURLIgnoreCounters.end();
++aCollectNew
@@ -762,3 +766,4 @@ void SvtHelpOptions::SetHelpStyleSheet(const String& rStyleSheet)
pImp->SetHelpStyleSheet(rStyleSheet);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 1be097f17ab5..338fd0d6e40c 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,8 +33,10 @@
#include <svtools/parhtml.hxx>
#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <tools/link.hxx>
+#include <sal/macros.h>
+#include <rtl/instance.hxx>
+#include <list>
// -----------------------------------------------------------------------
#define HTMLCFG_UNKNOWN_TAGS 0x01
@@ -47,20 +50,15 @@
#define HTMLCFG_NUMBERS_ENGLISH_US 0x100
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
-static SvxHtmlOptions* pOptions = 0;
-
-DECLARE_LIST( LinkList, Link * )
+using ::rtl::OUString;
#define C2U(cChar) OUString::createFromAscii(cChar)
-/* -----------------------------23.11.00 11:39--------------------------------
- ---------------------------------------------------------------------------*/
struct HtmlOptions_Impl
{
- LinkList aList;
+ ::std::list<Link> aList;
sal_Int32 nFlags;
sal_Int32 nExportMode;
sal_Int32 aFontSizeArr[HTML_FONT_COUNT];
@@ -83,9 +81,6 @@ struct HtmlOptions_Impl
}
};
-/* -----------------------------23.11.00 11:39--------------------------------
-
- ---------------------------------------------------------------------------*/
const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
{
static Sequence<OUString> aNames;
@@ -110,7 +105,7 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
"Export/Encoding", // 14
"Import/NumbersEnglishUS" // 15
};
- const int nCount = sizeof(aPropNames) / sizeof(aPropNames[0]);
+ const int nCount = SAL_N_ELEMENTS(aPropNames);
aNames.realloc(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -164,13 +159,11 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
case 9://"Export/Browser",
{
sal_Int32 nExpMode = 0;
-// pValues[nProp] >>= pImp->nExportMode;
pValues[nProp] >>= nExpMode;
switch( nExpMode )
{
case 0: nExpMode = HTML_CFG_HTML32; break;
case 1: nExpMode = HTML_CFG_MSIE_40; break;
-// case 2: nExpMode = HTML_CFG_NS30; break; depricated
case 3: nExpMode = HTML_CFG_WRITER; break;
case 4: nExpMode = HTML_CFG_NS40; break;
case 5: nExpMode = HTML_CFG_MSIE_40_OLD;break;
@@ -216,11 +209,9 @@ void SvxHtmlOptions::Commit()
{
const Sequence<OUString>& aNames = GetPropertyNames();
-// const OUString* pNames = aNames.getConstArray();
Sequence<Any> aValues(aNames.getLength());
Any* pValues = aValues.getArray();
-// const Type& rType = ::getBooleanCppuType();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
sal_Bool bSet = sal_False;
@@ -243,7 +234,6 @@ void SvxHtmlOptions::Commit()
{
case HTML_CFG_HTML32: nExpMode = 0; break;
case HTML_CFG_MSIE_40: nExpMode = 1; break;
-// case HTML_CFG_NS30: nExpMode = 2; break; depricated
case HTML_CFG_WRITER: nExpMode = 3; break;
case HTML_CFG_NS40: nExpMode = 4; break;
case HTML_CFG_MSIE_40_OLD: nExpMode = 5; break;
@@ -271,16 +261,16 @@ void SvxHtmlOptions::Commit()
void SvxHtmlOptions::AddListenerLink( const Link& rLink )
{
- pImp->aList.Insert( new Link( rLink ) );
+ pImp->aList.push_back( rLink );
}
void SvxHtmlOptions::RemoveListenerLink( const Link& rLink )
{
- for ( sal_uInt16 n=0; n<pImp->aList.Count(); n++ )
+ for ( ::std::list<Link>::iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter )
{
- if ( (*pImp->aList.GetObject(n) ) == rLink )
+ if ( *iter == rLink )
{
- delete pImp->aList.Remove(n);
+ pImp->aList.erase(iter);
break;
}
}
@@ -288,8 +278,8 @@ void SvxHtmlOptions::RemoveListenerLink( const Link& rLink )
void SvxHtmlOptions::CallListeners()
{
- for ( sal_uInt16 n = 0; n < pImp->aList.Count(); ++n )
- pImp->aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = pImp->aList.begin(); iter != pImp->aList.end(); ++iter )
+ iter->Call( this );
}
@@ -379,17 +369,11 @@ void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
SetModified();
}
-/*-----------------14.02.97 08.34-------------------
-
---------------------------------------------------*/
-
sal_Bool SvxHtmlOptions::IsSaveGraphicsLocal() const
{
return 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF) ;
}
-/*-----------------14.02.97 08.34-------------------
---------------------------------------------------*/
void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
{
if(bSet)
@@ -399,10 +383,6 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
SetModified();
}
-/*-----------------10/21/97 08:34am-----------------
-
---------------------------------------------------*/
-
sal_Bool SvxHtmlOptions::IsPrintLayoutExtension() const
{
sal_Bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
@@ -417,9 +397,7 @@ sal_Bool SvxHtmlOptions::IsPrintLayoutExtension() const
}
return bRet;
}
-/*-----------------10/21/97 08:34am-----------------
---------------------------------------------------*/
void SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
{
if(bSet)
@@ -429,17 +407,11 @@ void SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
SetModified();
}
-/*-----------------10.07.98 10.02-------------------
-
---------------------------------------------------*/
-
sal_Bool SvxHtmlOptions::IsIgnoreFontFamily() const
{
return 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY) ;
}
-/*-----------------10.07.98 10.02-------------------
---------------------------------------------------*/
void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
{
if(bSet)
@@ -448,16 +420,12 @@ void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
pImp->nFlags &= ~HTMLCFG_IGNORE_FONT_FAMILY;
SetModified();
}
-/* -----------------05.02.99 09:03-------------------
- *
- * --------------------------------------------------*/
+
sal_Bool SvxHtmlOptions::IsStarBasicWarning() const
{
return 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING) ;
}
-/* -----------------05.02.99 09:03-------------------
- *
- * --------------------------------------------------*/
+
void SvxHtmlOptions::SetStarBasicWarning(sal_Bool bSet)
{
if(bSet)
@@ -467,9 +435,6 @@ void SvxHtmlOptions::SetStarBasicWarning(sal_Bool bSet)
SetModified();
}
-/*-----------------19.02.2001 18:40-----------------
- *
- * --------------------------------------------------*/
rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
{
rtl_TextEncoding eRet;
@@ -480,39 +445,33 @@ rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
return eRet;
}
-/*-----------------19.02.2001 18:40-----------------
- *
- * --------------------------------------------------*/
void SvxHtmlOptions::SetTextEncoding( rtl_TextEncoding eEnc )
{
pImp->eEncoding = eEnc;
pImp->bIsEncodingDefault = sal_False;
SetModified();
}
-/* -----------------------------15.08.2001 12:01------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SvxHtmlOptions::IsDefaultTextEncoding() const
{
return pImp->bIsEncodingDefault;
}
-SvxHtmlOptions* SvxHtmlOptions::Get()
+namespace
{
- if ( !pOptions )
- pOptions = new SvxHtmlOptions;
- return pOptions;
+ class theSvxHtmlOptions : public rtl::Static<SvxHtmlOptions, theSvxHtmlOptions> {};
}
+SvxHtmlOptions& SvxHtmlOptions::Get()
+{
+ return theSvxHtmlOptions::get();
+}
-/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
sal_Bool SvxHtmlOptions::IsNumbersEnglishUS() const
{
return 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US) ;
}
-
-/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
void SvxHtmlOptions::SetNumbersEnglishUS(sal_Bool bSet)
{
if(bSet)
@@ -521,3 +480,5 @@ void SvxHtmlOptions::SetNumbersEnglishUS(sal_Bool bSet)
pImp->nFlags &= ~HTMLCFG_NUMBERS_ENGLISH_US;
SetModified();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 2382bf3ad7a3..7f57664af5f1 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ ItemHolder2::ItemHolder2()
{
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
css::uno::Reference< css::lang::XComponent > xCfg(
- xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+ xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
css::uno::UNO_QUERY);
if (xCfg.is())
xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
@@ -85,7 +86,7 @@ ItemHolder2::ItemHolder2()
sMsg += ::rtl::OString(rEx.Message.getStr(),
rEx.Message.getLength(),
RTL_TEXTENCODING_ASCII_US);
- DBG_ERROR(sMsg.getStr());
+ OSL_FAIL(sMsg.getStr());
}
}
#else
@@ -207,3 +208,5 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
rItem.pItem = 0;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 9314021b5750..884536d89bb0 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ class ItemHolder2 : private ItemHolderMutexBase
#undef css
#endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 28f52fe2b23b..a70be005dcca 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,12 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
#include <svtools/menuoptions.hxx>
#include <unotools/configmgr.hxx>
@@ -45,6 +40,8 @@
#include <rtl/logfile.hxx>
#include "itemholder2.hxx"
+#include <list>
+
//_________________________________________________________________________________________________________________
// namespaces
//_________________________________________________________________________________________________________________
@@ -76,8 +73,6 @@ using namespace ::com::sun::star::uno ;
#define PROPERTYCOUNT 4
#include <tools/link.hxx>
-#include <tools/list.hxx>
-DECLARE_LIST( LinkList, Link * )
//_________________________________________________________________________________________________________________
// private declarations!
@@ -90,7 +85,7 @@ class SvtMenuOptions_Impl : public ConfigItem
//-------------------------------------------------------------------------------------------------------------
private:
- LinkList aList;
+ ::std::list<Link> aList;
sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section
@@ -152,8 +147,8 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************//**
@short access method to get internal values
- @descr These method give us a chance to regulate acces to ouer internal values.
- It's not used in the moment - but it's possible for the feature!
+ @descr These methods give us a chance to regulate access to our internal values.
+ It's not used in the moment - but it's possible for the future!
@seealso -
@@ -176,8 +171,8 @@ class SvtMenuOptions_Impl : public ConfigItem
{
m_bDontHideDisabledEntries = bState;
SetModified();
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
- aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( this );
Commit();
}
@@ -185,17 +180,17 @@ class SvtMenuOptions_Impl : public ConfigItem
{
m_bFollowMouse = bState;
SetModified();
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
- aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( this );
Commit();
}
- void SetMenuIconsState ( sal_Int16 bState )
+ void SetMenuIconsState ( sal_Int16 nState )
{
- m_nMenuIcons = bState;
+ m_nMenuIcons = nState;
SetModified();
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
- aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( this );
Commit();
}
@@ -206,7 +201,7 @@ class SvtMenuOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of fix key names of ouer configuration management which represent oue module tree
+ @short return list of fix key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -245,10 +240,17 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
- sal_Bool bMenuIcons = true;
- sal_Bool bSystemMenuIcons = true;
+ sal_Bool bMenuIcons = sal_True;
+ sal_Bool bSystemMenuIcons = sal_True;
+ if (m_nMenuIcons == 2)
+ bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus());
+ else
+ {
+ bSystemMenuIcons = sal_False;
+ bMenuIcons = m_nMenuIcons ? sal_True : sal_False;
+ }
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength() ;
sal_Int32 nProperty = 0 ;
for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
@@ -256,6 +258,10 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
// Safe impossible cases.
// Check any for valid value.
DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
+
+ if (!seqValues[nProperty].hasValue())
+ continue;
+
switch( nProperty )
{
case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : {
@@ -298,9 +304,6 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
{
Commit();
}
-
- for ( sal_uInt16 n=0; n<aList.Count(); )
- delete aList.Remove(n);
}
//*****************************************************************************************************************
@@ -342,12 +345,12 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
- bMenuSettingsChanged = seqValues[nProperty] >>= bMenuIcons;
+ bMenuSettingsChanged |= seqValues[nProperty] >>= bMenuIcons;
}
else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
- bMenuSettingsChanged = seqValues[nProperty] >>= bSystemMenuIcons;
+ bMenuSettingsChanged |= seqValues[nProperty] >>= bSystemMenuIcons;
}
#if OSL_DEBUG_LEVEL > 1
@@ -358,8 +361,8 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
if ( bMenuSettingsChanged )
m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
- aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( this );
}
//*****************************************************************************************************************
@@ -422,16 +425,16 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
void SvtMenuOptions_Impl::AddListenerLink( const Link& rLink )
{
- aList.Insert( new Link( rLink ) );
+ aList.push_back( rLink );
}
void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink )
{
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
+ for ( ::std::list<Link>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
{
- if ( (*aList.GetObject(n) ) == rLink )
+ if ( *iter == rLink )
{
- delete aList.Remove(n);
+ aList.erase(iter);
break;
}
}
@@ -452,9 +455,9 @@ SvtMenuOptions::SvtMenuOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
@@ -471,10 +474,10 @@ SvtMenuOptions::~SvtMenuOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -549,7 +552,7 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
@@ -570,3 +573,5 @@ void SvtMenuOptions::RemoveListenerLink( const Link& rLink )
{
m_pDataContainer->RemoveListenerLink( rLink );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 9668a2144ebf..6d10da9cff19 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,16 +39,18 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/link.hxx>
-#include <tools/list.hxx>
#include <tools/wldcrd.hxx>
#include <tools/urlobj.hxx>
#include <rtl/logfile.hxx>
+#include <rtl/instance.hxx>
#include "itemholder2.hxx"
#include <svtools/imgdef.hxx>
#include <vcl/svapp.hxx>
+#include <list>
+
//_________________________________________________________________________________________________________________
// namespaces
//_________________________________________________________________________________________________________________
@@ -78,13 +81,21 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_SYMBOLSTYLE 4
#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog")
#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
-
-#define PROPERTYCOUNT 6
+#define PROPERTYNAME_TRYODMADIALOG ASCII_STR("TryODMADialog")
+#define PROPERTYHANDLE_TRYODMADIALOG 6
+#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
+#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
+#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8
+#define PROPERTYNAME_ALWAYSALLOWSAVE ASCII_STR("AlwaysAllowSave")
+#define PROPERTYHANDLE_ALWAYSALLOWSAVE 9
+#define PROPERTYNAME_EXPERIMENTALMODE ASCII_STR("ExperimentalMode")
+#define PROPERTYHANDLE_EXPERIMENTALMODE 10
+
+#define PROPERTYCOUNT 11
#define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx>
-DECLARE_LIST( LinkList, Link * )
-
//_________________________________________________________________________________________________________________
// private declarations!
//_________________________________________________________________________________________________________________
@@ -96,9 +107,11 @@ class SvtMiscOptions_Impl : public ConfigItem
//-------------------------------------------------------------------------------------------------------------
private:
- LinkList aList;
+ ::std::list<Link> aList;
sal_Bool m_bUseSystemFileDialog;
sal_Bool m_bIsUseSystemFileDialogRO;
+ sal_Bool m_bTryODMADialog;
+ sal_Bool m_bIsTryODMADialogRO;
sal_Bool m_bPluginsEnabled;
sal_Bool m_bIsPluginsEnabledRO;
sal_Int16 m_nSymbolsSize;
@@ -108,6 +121,11 @@ class SvtMiscOptions_Impl : public ConfigItem
sal_Bool m_bIsToolboxStyleRO;
sal_Bool m_bUseSystemPrintDialog;
sal_Bool m_bIsUseSystemPrintDialogRO;
+ sal_Bool m_bShowLinkWarningDialog;
+ sal_Bool m_bIsShowLinkWarningDialogRO;
+ sal_Bool m_bDisableUICustomization;
+ sal_Bool m_bAlwaysAllowSave;
+ sal_Bool m_bExperimentalMode;
//-------------------------------------------------------------------------------------------------------------
// public methods
@@ -176,6 +194,30 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemFileDialogReadOnly() const
{ return m_bIsUseSystemFileDialogRO; }
+ inline sal_Bool TryODMADialog() const
+ { return m_bTryODMADialog; }
+
+ inline void SetTryODMADialog( sal_Bool bSet )
+ { m_bTryODMADialog = bSet; SetModified(); }
+
+ inline sal_Bool IsTryUseODMADialogReadOnly() const
+ { return m_bIsTryODMADialogRO; }
+
+ inline sal_Bool DisableUICustomization() const
+ { return m_bDisableUICustomization; }
+
+ inline void SetSaveAlwaysAllowed( sal_Bool bSet )
+ { m_bAlwaysAllowSave = bSet; SetModified(); }
+
+ inline sal_Bool IsSaveAlwaysAllowed() const
+ { return m_bAlwaysAllowSave; }
+
+ inline void SetExperimentalMode( sal_Bool bSet )
+ { m_bExperimentalMode = bSet; SetModified(); }
+
+ inline sal_Bool IsExperimentalMode() const
+ { return m_bExperimentalMode; }
+
inline sal_Bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
@@ -224,6 +266,15 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemPrintDialogReadOnly() const
{ return m_bIsUseSystemPrintDialogRO; }
+ inline sal_Bool ShowLinkWarningDialog() const
+ { return m_bShowLinkWarningDialog; }
+
+ void SetShowLinkWarningDialog( sal_Bool bSet )
+ { m_bShowLinkWarningDialog = bSet; SetModified(); }
+
+ sal_Bool IsShowLinkWarningDialogReadOnly() const
+ { return m_bIsShowLinkWarningDialogRO; }
+
void AddListenerLink( const Link& rLink );
void RemoveListenerLink( const Link& rLink );
void CallListeners();
@@ -262,6 +313,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bUseSystemFileDialog( sal_False )
, m_bIsUseSystemFileDialogRO( sal_False )
+ , m_bTryODMADialog( sal_False )
+ , m_bIsTryODMADialogRO( sal_False )
, m_bPluginsEnabled( sal_False )
, m_bIsPluginsEnabledRO( sal_False )
, m_nSymbolsSize( 0 )
@@ -271,6 +324,10 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bIsToolboxStyleRO( sal_False )
, m_bUseSystemPrintDialog( sal_False )
, m_bIsUseSystemPrintDialogRO( sal_False )
+ , m_bShowLinkWarningDialog( sal_True )
+ , m_bIsShowLinkWarningDialogRO( sal_False )
+ , m_bAlwaysAllowSave( sal_False )
+ , m_bExperimentalMode( sal_False )
{
// Use our static list of configuration keys to get his values.
@@ -288,16 +345,15 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- // Safe impossible cases.
- // Check any for valid value.
- DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()\nInvalid property value detected!\n" );
+ if (seqValues[nProperty].hasValue()==sal_False)
+ continue;
switch( nProperty )
{
case PROPERTYHANDLE_PLUGINSENABLED :
{
if( !(seqValues[nProperty] >>= m_bPluginsEnabled) )
{
- DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" );
}
m_bIsPluginsEnabledRO = seqRO[nProperty];
break;
@@ -307,7 +363,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
{
if( !(seqValues[nProperty] >>= m_nSymbolsSize) )
{
- DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" );
}
m_bIsSymbolsSizeRO = seqRO[nProperty];
break;
@@ -317,7 +373,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
{
if( !(seqValues[nProperty] >>= m_nToolboxStyle) )
{
- DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" );
}
m_bIsToolboxStyleRO = seqRO[nProperty];
break;
@@ -327,7 +383,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
{
if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) )
{
- DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" );
}
m_bIsUseSystemFileDialogRO = seqRO[nProperty];
break;
@@ -337,12 +393,32 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
{
if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) )
{
- DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" );
}
m_bIsUseSystemPrintDialogRO = seqRO[nProperty];
break;
}
+ case PROPERTYHANDLE_TRYODMADIALOG :
+ {
+ if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
+ {
+ OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
+ }
+ m_bIsTryODMADialogRO = seqRO[nProperty];
+ break;
+ }
+
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
+ {
+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
+ {
+ OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
+ }
+ m_bIsShowLinkWarningDialogRO = seqRO[nProperty];
+ break;
+ }
+
case PROPERTYHANDLE_SYMBOLSTYLE :
{
::rtl::OUString aSymbolsStyle;
@@ -350,11 +426,30 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
SetSymbolsStyleName( aSymbolsStyle );
else
{
- DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" );
}
m_bIsSymbolsStyleRO = seqRO[nProperty];
break;
}
+
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+ {
+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+ OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" );
+ break;
+ }
+ case PROPERTYHANDLE_ALWAYSALLOWSAVE :
+ {
+ if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) )
+ OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" );
+ break;
+ }
+ case PROPERTYHANDLE_EXPERIMENTALMODE :
+ {
+ if( !(seqValues[nProperty] >>= m_bExperimentalMode) )
+ OSL_FAIL("Wrong type of \"Misc\\ExperimentalMode\"!" );
+ break;
+ }
}
}
@@ -373,14 +468,8 @@ SvtMiscOptions_Impl::~SvtMiscOptions_Impl()
{
Commit();
}
-
- for ( sal_uInt16 n=0; n<aList.Count(); )
- delete aList.Remove(n);
}
-/*-- 25.02.2005 13:22:04---------------------------------------------------
-
- -----------------------------------------------------------------------*/
static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
{
@@ -406,43 +495,56 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- // Safe impossible cases.
- // Check any for valid value.
- DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()\nInvalid property value detected!\n" );
+ if (seqValues[nProperty].hasValue()==sal_False)
+ continue;
switch( lcl_MapPropertyName(rPropertyNames[nProperty], aInternalPropertyNames) )
{
case PROPERTYHANDLE_PLUGINSENABLED : {
if( !(seqValues[nProperty] >>= m_bPluginsEnabled) )
{
- DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" );
}
}
break;
case PROPERTYHANDLE_SYMBOLSET : {
if( !(seqValues[nProperty] >>= m_nSymbolsSize) )
{
- DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" );
}
}
break;
case PROPERTYHANDLE_TOOLBOXSTYLE : {
if( !(seqValues[nProperty] >>= m_nToolboxStyle) )
{
- DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" );
}
}
break;
case PROPERTYHANDLE_USESYSTEMFILEDIALOG : {
if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) )
{
- DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" );
}
}
break;
case PROPERTYHANDLE_USESYSTEMPRINTDIALOG : {
if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) )
{
- DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" );
+ }
+ }
+ break;
+ case PROPERTYHANDLE_TRYODMADIALOG : {
+ if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
+ {
+ OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
+ }
+ }
+ break;
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : {
+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
+ {
+ OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
}
}
break;
@@ -452,26 +554,37 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
SetSymbolsStyleName( aSymbolsStyle );
else
{
- DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" );
+ OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" );
}
}
break;
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : {
+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+ OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" );
+ }
+ break;
+ case PROPERTYHANDLE_ALWAYSALLOWSAVE:
+ {
+ if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) )
+ OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" );
+ }
+ break;
}
}
}
void SvtMiscOptions_Impl::AddListenerLink( const Link& rLink )
{
- aList.Insert( new Link( rLink ) );
+ aList.push_back( rLink );
}
void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
{
- for ( sal_uInt16 n=0; n<aList.Count(); n++ )
+ for ( ::std::list<Link>::iterator iter = aList.begin(); iter != aList.end(); ++iter )
{
- if ( (*aList.GetObject(n) ) == rLink )
+ if ( *iter == rLink )
{
- delete aList.Remove(n);
+ aList.erase(iter);
break;
}
}
@@ -479,8 +592,8 @@ void SvtMiscOptions_Impl::RemoveListenerLink( const Link& rLink )
void SvtMiscOptions_Impl::CallListeners()
{
- for ( sal_uInt16 n = 0; n < aList.Count(); ++n )
- aList.GetObject(n)->Call( this );
+ for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
+ iter->Call( this );
}
void SvtMiscOptions_Impl::SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified )
@@ -592,6 +705,13 @@ void SvtMiscOptions_Impl::Commit()
break;
}
+ case PROPERTYHANDLE_TRYODMADIALOG :
+ {
+ if ( !m_bIsTryODMADialogRO )
+ seqValues[nProperty] <<= m_bTryODMADialog;
+ break;
+ }
+
case PROPERTYHANDLE_SYMBOLSTYLE :
{
if ( !m_bIsSymbolsStyleRO )
@@ -605,6 +725,29 @@ void SvtMiscOptions_Impl::Commit()
seqValues[nProperty] <<= m_bUseSystemPrintDialog;
break;
}
+
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
+ {
+ if ( !m_bIsShowLinkWarningDialogRO )
+ seqValues[nProperty] <<= m_bShowLinkWarningDialog;
+ break;
+ }
+
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+ {
+ seqValues[nProperty] <<= m_bDisableUICustomization;
+ break;
+ }
+ case PROPERTYHANDLE_ALWAYSALLOWSAVE :
+ {
+ seqValues[nProperty] <<= m_bAlwaysAllowSave;
+ break;
+ }
+ case PROPERTYHANDLE_EXPERIMENTALMODE :
+ {
+ seqValues[nProperty] <<= m_bExperimentalMode;
+ break;
+ }
}
}
// Set properties in configuration.
@@ -616,19 +759,24 @@ void SvtMiscOptions_Impl::Commit()
//*****************************************************************************************************************
Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
{
- // Build static list of configuration key names.
- static const OUString pProperties[] =
+ // Build list of configuration key names.
+ const OUString pProperties[] =
{
PROPERTYNAME_PLUGINSENABLED,
PROPERTYNAME_SYMBOLSET,
PROPERTYNAME_TOOLBOXSTYLE,
PROPERTYNAME_USESYSTEMFILEDIALOG,
PROPERTYNAME_SYMBOLSTYLE,
- PROPERTYNAME_USESYSTEMPRINTDIALOG
+ PROPERTYNAME_USESYSTEMPRINTDIALOG,
+ PROPERTYNAME_TRYODMADIALOG,
+ PROPERTYNAME_SHOWLINKWARNINGDIALOG,
+ PROPERTYNAME_DISABLEUICUSTOMIZATION,
+ PROPERTYNAME_ALWAYSALLOWSAVE,
+ PROPERTYNAME_EXPERIMENTALMODE
};
// Initialize return sequence with these list ...
- static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
+ const Sequence< OUString > seqPropertyNames( pProperties, SAL_N_ELEMENTS( pProperties ) );
// ... and return it.
return seqPropertyNames;
}
@@ -692,6 +840,21 @@ sal_Bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
return m_pDataContainer->IsUseSystemFileDialogReadOnly();
}
+sal_Bool SvtMiscOptions::TryODMADialog() const
+{
+ return m_pDataContainer->TryODMADialog();
+}
+
+void SvtMiscOptions::SetTryODMADialog( sal_Bool bEnable )
+{
+ m_pDataContainer->SetTryODMADialog( bEnable );
+}
+
+sal_Bool SvtMiscOptions::IsTryUseODMADialogReadOnly() const
+{
+ return m_pDataContainer->IsTryUseODMADialogReadOnly();
+}
+
sal_Bool SvtMiscOptions::IsPluginsEnabled() const
{
return m_pDataContainer->IsPluginsEnabled();
@@ -770,6 +933,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
return m_pDataContainer->IsGetSymbolsStyleReadOnly();
}
+sal_Bool SvtMiscOptions::DisableUICustomization() const
+{
+ return m_pDataContainer->DisableUICustomization();
+}
+
sal_Int16 SvtMiscOptions::GetToolboxStyle() const
{
return m_pDataContainer->GetToolboxStyle();
@@ -795,29 +963,50 @@ void SvtMiscOptions::SetUseSystemPrintDialog( sal_Bool bEnable )
m_pDataContainer->SetUseSystemPrintDialog( bEnable );
}
-//*****************************************************************************************************************
-// private method
-//*****************************************************************************************************************
+sal_Bool SvtMiscOptions::ShowLinkWarningDialog() const
+{
+ return m_pDataContainer->ShowLinkWarningDialog();
+}
+
+void SvtMiscOptions::SetShowLinkWarningDialog( sal_Bool bSet )
+{
+ m_pDataContainer->SetShowLinkWarningDialog( bSet );
+}
+
+sal_Bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
+{
+ return m_pDataContainer->IsShowLinkWarningDialogReadOnly();
+}
+
+void SvtMiscOptions::SetSaveAlwaysAllowed( sal_Bool bSet )
+{
+ m_pDataContainer->SetSaveAlwaysAllowed( bSet );
+}
+
+sal_Bool SvtMiscOptions::IsSaveAlwaysAllowed() const
+{
+ return m_pDataContainer->IsSaveAlwaysAllowed();
+}
+
+void SvtMiscOptions::SetExperimentalMode( sal_Bool bSet )
+{
+ m_pDataContainer->SetExperimentalMode( bSet );
+}
+
+sal_Bool SvtMiscOptions::IsExperimentalMode() const
+{
+ return m_pDataContainer->IsExperimentalMode();
+}
+
+namespace
+{
+ class theSvtMiscOptionsMutex :
+ public rtl::Static< osl::Mutex, theSvtMiscOptionsMutex > {};
+}
+
Mutex & SvtMiscOptions::GetInitMutex()
{
- // Initialize static mutex only for one time!
- static Mutex* pMutex = NULL;
- // If these method first called (Mutex not already exist!) ...
- if( pMutex == NULL )
- {
- // ... we must create a new one. Protect follow code with the global mutex -
- // It must be - we create a static variable!
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
- if( pMutex == NULL )
- {
- // Create the new mutex and set it for return on static variable.
- static Mutex aMutex;
- pMutex = &aMutex;
- }
- }
- // Return new created or already existing mutex object.
- return *pMutex;
+ return theSvtMiscOptionsMutex::get();
}
void SvtMiscOptions::AddListenerLink( const Link& rLink )
@@ -829,3 +1018,5 @@ void SvtMiscOptions::RemoveListenerLink( const Link& rLink )
{
m_pDataContainer->RemoveListenerLink( rLink );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 57cf1cd8ad5b..410c430810b2 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/