summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 21:53:02 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 21:53:02 -0600
commitf30f134bbf481e197d1f5d3b5d4ff7117cafbed9 (patch)
treea80523e092a4ff514d0d8c8988843e9cb590d67d
parent732d55e3e871cf44ff461701f36ea1c11bc0d0b6 (diff)
merge non-conflicting changes in sfx2
-rw-r--r--sfx2/inc/about.hxx7
-rw-r--r--sfx2/inc/arrdecl.hxx14
-rw-r--r--sfx2/inc/bitset.hxx2
-rw-r--r--sfx2/inc/configmgr.hxx6
-rw-r--r--sfx2/inc/docvor.hxx15
-rw-r--r--sfx2/inc/frmload.hxx3
-rw-r--r--sfx2/inc/fwkhelper.hxx7
-rw-r--r--sfx2/inc/guisaveas.hxx2
-rw-r--r--sfx2/inc/idpool.hxx2
-rw-r--r--sfx2/inc/inettbc.hxx4
-rw-r--r--sfx2/inc/macro.hxx3
-rw-r--r--sfx2/inc/msgnodei.hxx3
-rw-r--r--sfx2/inc/orgmgr.hxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.cxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx3
-rw-r--r--sfx2/inc/progind.hxx2
-rw-r--r--sfx2/inc/resmgr.hxx2
-rw-r--r--sfx2/inc/sfx2/DocumentMetadataAccess.hxx2
-rw-r--r--sfx2/inc/sfx2/Metadatable.hxx3
-rw-r--r--sfx2/inc/sfx2/QuerySaveDocument.hxx2
-rw-r--r--sfx2/inc/sfx2/XmlIdRegistry.hxx6
-rw-r--r--sfx2/inc/sfx2/app.hxx19
-rw-r--r--sfx2/inc/sfx2/appuno.hxx3
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx6
-rw-r--r--sfx2/inc/sfx2/basmgr.hxx3
-rw-r--r--sfx2/inc/sfx2/bindings.hxx8
-rw-r--r--sfx2/inc/sfx2/chalign.hxx3
-rw-r--r--sfx2/inc/sfx2/childwin.hxx24
-rw-r--r--sfx2/inc/sfx2/controlwrapper.hxx4
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx4
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx7
-rw-r--r--sfx2/inc/sfx2/dinfedt.hxx4
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx4
-rw-r--r--sfx2/inc/sfx2/dllapi.h3
-rw-r--r--sfx2/inc/sfx2/docfac.hxx5
-rw-r--r--sfx2/inc/sfx2/docfile.hxx10
-rw-r--r--sfx2/inc/sfx2/docfilt.hxx2
-rw-r--r--sfx2/inc/sfx2/docinf.hxx2
-rw-r--r--sfx2/inc/sfx2/docinsert.hxx6
-rw-r--r--sfx2/inc/sfx2/dockwin.hxx7
-rw-r--r--sfx2/inc/sfx2/docmacromode.hxx3
-rw-r--r--sfx2/inc/sfx2/docstoragemodifylistener.hxx11
-rw-r--r--sfx2/inc/sfx2/doctdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/doctempl.hxx2
-rw-r--r--sfx2/inc/sfx2/event.hxx3
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx23
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx9
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx11
-rw-r--r--sfx2/inc/sfx2/frame.hxx32
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx2
-rw-r--r--sfx2/inc/sfx2/frmhtml.hxx2
-rw-r--r--sfx2/inc/sfx2/frmhtmlw.hxx2
-rw-r--r--sfx2/inc/sfx2/genlink.hxx3
-rw-r--r--sfx2/inc/sfx2/hintpost.hxx5
-rw-r--r--sfx2/inc/sfx2/htmlmode.hxx2
-rw-r--r--sfx2/inc/sfx2/imagemgr.hxx1
-rw-r--r--sfx2/inc/sfx2/imgdef.hxx2
-rw-r--r--sfx2/inc/sfx2/imgmgr.hxx19
-rw-r--r--sfx2/inc/sfx2/ipclient.hxx2
-rw-r--r--sfx2/inc/sfx2/itemconnect.hxx2
-rw-r--r--sfx2/inc/sfx2/itemwrapper.hxx2
-rw-r--r--sfx2/inc/sfx2/layout-post.hxx3
-rw-r--r--sfx2/inc/sfx2/layout-pre.hxx3
-rw-r--r--sfx2/inc/sfx2/layout-tabdlg.hxx2
-rw-r--r--sfx2/inc/sfx2/layout.hxx15
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx6
-rw-r--r--sfx2/inc/sfx2/linksrc.hxx9
-rw-r--r--sfx2/inc/sfx2/lnkbase.hxx11
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx20
-rw-r--r--sfx2/inc/sfx2/mailmodelapi.hxx33
-rw-r--r--sfx2/inc/sfx2/mgetempl.hxx6
-rw-r--r--sfx2/inc/sfx2/mieclip.hxx2
-rw-r--r--sfx2/inc/sfx2/minarray.hxx4
-rw-r--r--sfx2/inc/sfx2/minfitem.hxx3
-rw-r--r--sfx2/inc/sfx2/minstack.hxx2
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx35
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx5
-rw-r--r--sfx2/inc/sfx2/module.hxx7
-rw-r--r--sfx2/inc/sfx2/msg.hxx21
-rw-r--r--sfx2/inc/sfx2/msgpool.hxx2
-rw-r--r--sfx2/inc/sfx2/navigat.hxx2
-rw-r--r--sfx2/inc/sfx2/new.hxx18
-rw-r--r--sfx2/inc/sfx2/newstyle.hxx6
-rw-r--r--sfx2/inc/sfx2/objface.hxx9
-rw-r--r--sfx2/inc/sfx2/objitem.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx78
-rw-r--r--sfx2/inc/sfx2/objuno.hxx3
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx2
-rw-r--r--sfx2/inc/sfx2/passwd.hxx5
-rw-r--r--sfx2/inc/sfx2/printer.hxx5
-rw-r--r--sfx2/inc/sfx2/printopt.hxx13
-rw-r--r--sfx2/inc/sfx2/prnmon.hxx3
-rw-r--r--sfx2/inc/sfx2/progress.hxx6
-rw-r--r--sfx2/inc/sfx2/querystatus.hxx3
-rw-r--r--sfx2/inc/sfx2/request.hxx11
-rwxr-xr-xsfx2/inc/sfx2/securitypage.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx4
-rw-r--r--sfx2/inc/sfx2/sfxdefs.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxhelp.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx9
-rw-r--r--sfx2/inc/sfx2/sfxmodelfactory.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxresid.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc5
-rw-r--r--sfx2/inc/sfx2/sfxstatuslistener.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxuno.hxx5
-rw-r--r--sfx2/inc/sfx2/shell.hxx14
-rw-r--r--sfx2/inc/sfx2/signaturestate.hxx3
-rw-r--r--sfx2/inc/sfx2/stbitem.hxx5
-rw-r--r--sfx2/inc/sfx2/styfitem.hxx34
-rw-r--r--sfx2/inc/sfx2/styledlg.hxx4
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx8
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx30
-rw-r--r--sfx2/inc/sfx2/templdlg.hxx2
-rw-r--r--sfx2/inc/sfx2/unoctitm.hxx4
-rw-r--r--sfx2/inc/sfx2/userinputinterception.hxx3
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx5
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx18
-rw-r--r--sfx2/inc/sfxbasic.hxx2
-rw-r--r--sfx2/inc/sorgitm.hxx6
-rw-r--r--sfx2/inc/srchdlg.hxx8
-rw-r--r--sfx2/qa/cppunit/makefile.mk86
-rw-r--r--sfx2/qa/cppunit/version.map34
-rw-r--r--sfx2/sdi/appslots.sdi7
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfx.sdi35
-rw-r--r--sfx2/source/appl/app.cxx11
-rw-r--r--sfx2/source/appl/app.hrc29
-rw-r--r--sfx2/source/appl/app.src2
-rw-r--r--sfx2/source/appl/appbas.cxx127
-rwxr-xr-xsfx2/source/appl/appbaslib.cxx10
-rw-r--r--sfx2/source/appl/appcfg.cxx14
-rw-r--r--sfx2/source/appl/appchild.cxx2
-rw-r--r--sfx2/source/appl/appdata.cxx3
-rw-r--r--sfx2/source/appl/appdde.cxx19
-rw-r--r--sfx2/source/appl/appinit.cxx31
-rw-r--r--sfx2/source/appl/appmain.cxx8
-rw-r--r--sfx2/source/appl/appmisc.cxx11
-rw-r--r--sfx2/source/appl/appopen.cxx64
-rw-r--r--sfx2/source/appl/appquit.cxx3
-rw-r--r--sfx2/source/appl/appreg.cxx6
-rw-r--r--sfx2/source/appl/appserv.cxx119
-rw-r--r--sfx2/source/appl/appuno.cxx32
-rw-r--r--sfx2/source/appl/childwin.cxx45
-rw-r--r--sfx2/source/appl/fileobj.cxx6
-rw-r--r--sfx2/source/appl/fileobj.hxx2
-rw-r--r--sfx2/source/appl/fwkhelper.cxx7
-rw-r--r--sfx2/source/appl/helpdispatch.cxx2
-rw-r--r--sfx2/source/appl/helpdispatch.hxx2
-rw-r--r--sfx2/source/appl/helpinterceptor.cxx58
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx11
-rw-r--r--sfx2/source/appl/imagemgr.cxx34
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx4
-rw-r--r--sfx2/source/appl/imestatuswindow.hxx3
-rw-r--r--sfx2/source/appl/impldde.cxx58
-rw-r--r--sfx2/source/appl/impldde.hxx7
-rw-r--r--sfx2/source/appl/linkmgr2.cxx51
-rw-r--r--sfx2/source/appl/linksrc.cxx15
-rw-r--r--sfx2/source/appl/lnkbase2.cxx117
-rw-r--r--sfx2/source/appl/module.cxx60
-rw-r--r--sfx2/source/appl/newhelp.cxx113
-rw-r--r--sfx2/source/appl/newhelp.hxx4
-rw-r--r--sfx2/source/appl/newhelp.src141
-rw-r--r--sfx2/source/appl/opengrf.cxx1
-rw-r--r--sfx2/source/appl/panelist.hxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx125
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx21
-rw-r--r--sfx2/source/appl/shutdownicon.cxx81
-rw-r--r--sfx2/source/appl/shutdownicon.hxx7
-rw-r--r--sfx2/source/appl/shutdowniconOs2.cxx2
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm7
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx137
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx7
-rw-r--r--sfx2/source/appl/workwin.cxx410
-rw-r--r--sfx2/source/appl/xpackcreator.cxx8
-rw-r--r--sfx2/source/appl/xpackcreator.hxx2
-rw-r--r--sfx2/source/bastyp/bastyp.hrc14
-rw-r--r--sfx2/source/bastyp/bitset.cxx4
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx194
-rw-r--r--sfx2/source/bastyp/fltlst.cxx9
-rw-r--r--sfx2/source/bastyp/fltlst.hxx3
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx23
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx34
-rw-r--r--sfx2/source/bastyp/helper.cxx113
-rw-r--r--sfx2/source/bastyp/mieclip.cxx2
-rw-r--r--sfx2/source/bastyp/minarray.cxx93
-rw-r--r--sfx2/source/bastyp/misc.cxx5
-rw-r--r--sfx2/source/bastyp/progress.cxx182
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx76
-rw-r--r--sfx2/source/bastyp/sfxresid.cxx4
-rw-r--r--sfx2/source/config/evntconf.cxx51
-rw-r--r--sfx2/source/control/bindings.cxx386
-rw-r--r--sfx2/source/control/ctrlitem.cxx162
-rwxr-xr-xsfx2/source/control/dispatch.cxx879
-rw-r--r--sfx2/source/control/macrconf.cxx163
-rw-r--r--sfx2/source/control/macro.cxx421
-rw-r--r--sfx2/source/control/minfitem.cxx6
-rw-r--r--sfx2/source/control/msg.cxx2
-rw-r--r--sfx2/source/control/msgpool.cxx73
-rw-r--r--sfx2/source/control/objface.cxx84
-rw-r--r--sfx2/source/control/querystatus.cxx15
-rw-r--r--sfx2/source/control/request.cxx13
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx12
-rw-r--r--sfx2/source/control/shell.cxx8
-rw-r--r--sfx2/source/control/sorgitm.cxx14
-rw-r--r--sfx2/source/control/statcach.cxx11
-rw-r--r--sfx2/source/control/unoctitm.cxx59
-rw-r--r--sfx2/source/dialog/about.cxx89
-rw-r--r--sfx2/source/dialog/alienwarn.cxx5
-rw-r--r--sfx2/source/dialog/basedlgs.cxx4
-rw-r--r--sfx2/source/dialog/dialog.hrc2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx53
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfdlg.src5
-rw-r--r--sfx2/source/dialog/dinfedt.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx21
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx88
-rw-r--r--sfx2/source/dialog/filedlghelper.src5
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx20
-rw-r--r--sfx2/source/dialog/filtergrouping.hxx2
-rw-r--r--sfx2/source/dialog/intro.cxx5
-rw-r--r--sfx2/source/dialog/itemconnect.cxx2
-rw-r--r--sfx2/source/dialog/mailmodel.cxx72
-rw-r--r--sfx2/source/dialog/mgetempl.cxx25
-rw-r--r--sfx2/source/dialog/navigat.cxx5
-rw-r--r--sfx2/source/dialog/newstyle.cxx4
-rw-r--r--sfx2/source/dialog/partwnd.cxx4
-rw-r--r--sfx2/source/dialog/passwd.cxx24
-rw-r--r--sfx2/source/dialog/passwd.hrc1
-rw-r--r--sfx2/source/dialog/passwd.src16
-rw-r--r--sfx2/source/dialog/printopt.cxx73
-rw-r--r--sfx2/source/dialog/recfloat.cxx5
-rw-r--r--sfx2/source/dialog/recfloat.src1
-rwxr-xr-xsfx2/source/dialog/sfxdlg.cxx7
-rw-r--r--sfx2/source/dialog/splitwin.cxx13
-rw-r--r--sfx2/source/dialog/srchdlg.cxx2
-rw-r--r--sfx2/source/dialog/styfitem.cxx49
-rw-r--r--sfx2/source/dialog/styledlg.cxx5
-rw-r--r--sfx2/source/dialog/tabdlg.cxx26
-rw-r--r--sfx2/source/dialog/taskpane.src47
-rw-r--r--sfx2/source/dialog/templdlg.cxx193
-rw-r--r--sfx2/source/dialog/templdlg.src15
-rw-r--r--sfx2/source/dialog/titledockwin.src39
-rw-r--r--sfx2/source/dialog/tplcitem.cxx6
-rw-r--r--sfx2/source/dialog/tplpitem.cxx16
-rw-r--r--sfx2/source/dialog/versdlg.cxx59
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx201
-rw-r--r--sfx2/source/doc/Metadatable.cxx53
-rw-r--r--sfx2/source/doc/QuerySaveDocument.cxx3
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx245
-rw-r--r--sfx2/source/doc/doc.hrc12
-rw-r--r--sfx2/source/doc/doc.src16
-rw-r--r--sfx2/source/doc/docfac.cxx5
-rw-r--r--sfx2/source/doc/docfile.cxx324
-rw-r--r--sfx2/source/doc/docfilt.cxx5
-rw-r--r--sfx2/source/doc/docinf.cxx30
-rw-r--r--sfx2/source/doc/docinsert.cxx4
-rw-r--r--sfx2/source/doc/docmacromode.cxx60
-rw-r--r--sfx2/source/doc/docstoragemodifylistener.cxx11
-rw-r--r--sfx2/source/doc/doctdlg.cxx3
-rw-r--r--sfx2/source/doc/doctempl.cxx244
-rw-r--r--sfx2/source/doc/doctemplates.cxx150
-rw-r--r--sfx2/source/doc/doctemplateslocal.cxx14
-rw-r--r--sfx2/source/doc/doctemplateslocal.hxx4
-rw-r--r--sfx2/source/doc/docvor.cxx102
-rw-r--r--sfx2/source/doc/docvor.hrc4
-rw-r--r--sfx2/source/doc/docvor.src53
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/graphhelp.cxx26
-rw-r--r--sfx2/source/doc/graphhelp.hxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx129
-rw-r--r--sfx2/source/doc/iframe.cxx13
-rw-r--r--sfx2/source/doc/new.cxx18
-rw-r--r--sfx2/source/doc/objcont.cxx138
-rw-r--r--sfx2/source/doc/objembed.cxx2
-rw-r--r--sfx2/source/doc/objitem.cxx23
-rw-r--r--sfx2/source/doc/objmisc.cxx40
-rw-r--r--sfx2/source/doc/objserv.cxx11
-rw-r--r--sfx2/source/doc/objstor.cxx79
-rw-r--r--sfx2/source/doc/objuno.cxx75
-rw-r--r--sfx2/source/doc/objxtor.cxx114
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/oleprops.cxx3
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/oleprops.hxx7
-rw-r--r--sfx2/source/doc/ownsubfilterservice.cxx8
-rw-r--r--sfx2/source/doc/plugin.cxx17
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/printhelper.cxx13
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/printhelper.hxx3
-rw-r--r--sfx2/source/doc/querytemplate.cxx2
-rw-r--r--sfx2/source/doc/querytemplate.hxx2
-rw-r--r--sfx2/source/doc/sfxacldetect.hxx39
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx207
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx3
-rw-r--r--sfx2/source/doc/syspath.hxx44
-rw-r--r--sfx2/source/explorer/nochaos.cxx3
-rw-r--r--sfx2/source/inc/SfxDocumentMetaData.hxx13
-rw-r--r--sfx2/source/inc/alienwarn.hxx4
-rw-r--r--sfx2/source/inc/appbas.hxx2
-rw-r--r--sfx2/source/inc/appbaslib.hxx2
-rw-r--r--sfx2/source/inc/appdata.hxx2
-rw-r--r--sfx2/source/inc/doctemplates.hxx3
-rw-r--r--sfx2/source/inc/eventsupplier.hxx5
-rw-r--r--sfx2/source/inc/fltfnc.hxx2
-rw-r--r--sfx2/source/inc/fltoptint.hxx1
-rw-r--r--sfx2/source/inc/helper.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/helpid.hrc0
-rw-r--r--sfx2/source/inc/hexplwnd.hxx2
-rw-r--r--sfx2/source/inc/iframe.hxx3
-rw-r--r--sfx2/source/inc/intro.hxx2
-rw-r--r--sfx2/source/inc/mailmodel.hxx3
-rw-r--r--sfx2/source/inc/mnucfga.hxx4
-rw-r--r--sfx2/source/inc/nfltdlg.hxx4
-rw-r--r--sfx2/source/inc/nochaos.hxx2
-rw-r--r--sfx2/source/inc/objmnctl.hxx5
-rw-r--r--sfx2/source/inc/objshimp.hxx7
-rw-r--r--sfx2/source/inc/openflag.hxx3
-rw-r--r--sfx2/source/inc/ownsubfilterservice.hxx4
-rw-r--r--sfx2/source/inc/partwnd.hxx2
-rw-r--r--sfx2/source/inc/plugin.hxx3
-rw-r--r--sfx2/source/inc/preview.hxx3
-rw-r--r--sfx2/source/inc/recfloat.hxx2
-rw-r--r--sfx2/source/inc/referers.hxx3
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx3
-rw-r--r--sfx2/source/inc/sfxtypes.hxx14
-rw-r--r--sfx2/source/inc/sfxurlrelocator.hxx2
-rw-r--r--sfx2/source/inc/slotserv.hxx3
-rw-r--r--sfx2/source/inc/splitwin.hxx4
-rw-r--r--sfx2/source/inc/statcach.hxx7
-rw-r--r--sfx2/source/inc/templdgi.hxx10
-rw-r--r--sfx2/source/inc/tplcitem.hxx3
-rw-r--r--sfx2/source/inc/tplcomp.hxx11
-rw-r--r--sfx2/source/inc/versdlg.hxx9
-rw-r--r--sfx2/source/inc/virtmenu.hxx8
-rw-r--r--sfx2/source/inc/workwin.hxx9
-rw-r--r--sfx2/source/inet/inettbc.cxx27
-rw-r--r--sfx2/source/layout/factory.cxx3
-rw-r--r--sfx2/source/layout/sfxdialog.cxx3
-rw-r--r--sfx2/source/layout/sfxtabdialog.cxx3
-rw-r--r--sfx2/source/layout/sfxtabpage.cxx26
-rw-r--r--sfx2/source/menu/mnuitem.cxx53
-rwxr-xr-xsfx2/source/menu/mnumgr.cxx5
-rw-r--r--sfx2/source/menu/objmnctl.cxx3
-rw-r--r--sfx2/source/menu/virtmenu.cxx73
-rw-r--r--sfx2/source/notify/eventsupplier.cxx80
-rw-r--r--sfx2/source/notify/hintpost.cxx14
-rw-r--r--sfx2/source/statbar/stbitem.cxx26
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx140
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx74
-rw-r--r--sfx2/source/view/frame.cxx29
-rw-r--r--sfx2/source/view/frmload.cxx7
-rw-r--r--sfx2/source/view/impframe.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx11
-rw-r--r--sfx2/source/view/orgmgr.cxx8
-rw-r--r--sfx2/source/view/printer.cxx5
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx72
-rw-r--r--sfx2/source/view/userinputinterception.cxx3
-rw-r--r--sfx2/source/view/viewfac.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx54
-rw-r--r--sfx2/source/view/viewimp.hxx2
-rw-r--r--sfx2/source/view/viewprn.cxx38
-rw-r--r--sfx2/source/view/viewsh.cxx76
-rw-r--r--sfx2/util/sfx.xml2
-rw-r--r--sfx2/workben/custompanel/makefile.mk120
362 files changed, 5214 insertions, 5717 deletions
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
index 7a4d1c5f31..a957ea6597 100644
--- a/sfx2/inc/about.hxx
+++ b/sfx2/inc/about.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,9 +36,11 @@
#include <svtools/svmedit.hxx>
#include <tools/list.hxx>
#include <svtools/stdctrl.hxx>
+#include "svtools/fixedhyper.hxx"
#include <sfx2/basedlgs.hxx> // SfxModalDialog
+#include <vector>
-DECLARE_LIST( AccelList, Accelerator* )
+typedef ::std::vector< Accelerator* > AccelList;
// class AboutDialog -----------------------------------------------------
@@ -76,8 +79,10 @@ public:
DECL_LINK( TimerHdl, Timer * );
DECL_LINK( AccelSelectHdl, Accelerator * );
+ DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
};
#endif // #ifndef _ABOUT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 7c6d924a90..3c4eba5291 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.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,6 +31,7 @@
#include <tools/list.hxx>
#include <svl/svarray.hxx>
#include <sfx2/minarray.hxx>
+#include <vector>
struct CntUpdateResult;
@@ -70,22 +72,16 @@ class SfxFrame;
typedef SfxFrame* SfxFramePtr;
SV_DECL_PTRARR( SfxFrameArr_Impl, SfxFramePtr, 4, 4 )
-DECLARE_LIST( SfxFilterList_Impl, SfxFilter* )
+typedef ::std::vector< SfxFilter* > SfxFilterList_Impl;
struct SfxExternalLib_Impl;
typedef SfxExternalLib_Impl* SfxExternalLibPtr;
SV_DECL_PTRARR_DEL( SfxExternalLibArr_Impl, SfxExternalLibPtr, 2, 2 )
-//class XEventListenerRef;
-//typedef XEventListenerRef* XEventListenerPtr;
-//SV_DECL_PTRARR_DEL( XEventListenerArr_Impl, XEventListenerPtr, 4, 4 )
-
-//class XFrameRef;
-//typedef XFrameRef* XFramePtr;
-//SV_DECL_PTRARR_DEL( XFrameArr_Impl, XFramePtr, 4, 4 )
-
class SfxSlot;
typedef SfxSlot* SfxSlotPtr;
SV_DECL_PTRARR( SfxSlotArr_Impl, SfxSlotPtr, 20, 20 )
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index f2e0a88cd7..ecf64ebf30 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.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.
@@ -255,3 +256,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index e629a239f3..f09485e962 100644
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/configmgr.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,8 +33,7 @@ namespace utl{
class ConfigManager;
}
-/* -----------------------------05.09.00 16:42--------------------------------
- appdata.cxx
- ---------------------------------------------------------------------------*/
utl::ConfigManager* GetUtlConfigManager();
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 8b84c0a028..87c62f952f 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.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 _SFXDOCVOR_HXX
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <svtools/svtreebx.hxx>
#include <sfx2/objsh.hxx>
@@ -58,11 +57,6 @@ friend class SfxOrganizeDlg_Impl;
Image aOpenedDocBmp;
Image aClosedDocBmp;
- Image aOpenedFolderBmpHC;
- Image aClosedFolderBmpHC;
- Image aOpenedDocBmpHC;
- Image aClosedDocBmpHC;
-
SfxOrganizeMgr* pMgr;
SfxOrganizeDlg_Impl* pDlg;
@@ -103,8 +97,8 @@ public:
void SetMgr(SfxOrganizeMgr *pM) { pMgr = pM; }
void Reset();
inline void SetBitmaps(
- const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp,
- const Image &rOFolderBmpHC, const Image &rCFolderBmpHC, const Image &rODocBmpHC, const Image &rCDocBmpHC );
+ const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp
+ );
const Image &GetClosedBmp(USHORT nLevel) const;
const Image &GetOpenedBmp(USHORT nLevel) const;
@@ -145,7 +139,6 @@ friend class SfxOrganizeListBox_Impl;
class SfxOrganizeDlg_Impl *pImp;
-// virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
SfxTemplateOrganizeDlg(Window * pParent, SfxDocumentTemplates* = 0);
~SfxTemplateOrganizeDlg();
@@ -156,3 +149,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 3f3fe029b6..3ab32a502e 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.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.
@@ -151,3 +152,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index 74c55471f7..43e6f4c7f0 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.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,4 +33,8 @@
#include <rtl/ustring.hxx>
-SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars(
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame
+);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 2b938be0bf..0b442a34a7 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.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.
@@ -107,3 +108,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index b6469d6546..8583894972 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.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,3 +62,4 @@ inline BOOL IdPool::IsLocked( USHORT nId ) const
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index c50e3a87ed..9089731f10 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/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.
@@ -32,9 +33,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
#include <svtools/acceleratorexecute.hxx>
#if _SOLAR__PRIVATE
@@ -78,3 +77,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 1594e01572..2e92ae7731 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef _SFXMACRO_HXX
#define _SFXMACRO_HXX
@@ -181,3 +182,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index 5667f8b011..334b6b2409 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.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.
@@ -217,3 +218,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 5aa02dfa23..1e43b3eee2 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.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 // #ifndef _SFX_ORGMGR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/pch/precompiled_sfx2.cxx b/sfx2/inc/pch/precompiled_sfx2.cxx
index 4fbd4f6759..01ca1c846a 100644
--- a/sfx2/inc/pch/precompiled_sfx2.cxx
+++ b/sfx2/inc/pch/precompiled_sfx2.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_sfx2.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index ea0e774b03..3fb1755ea4 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.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.
@@ -465,6 +466,7 @@
#include "osl/mutex.hxx"
#include "osl/process.h"
#include "osl/security.hxx"
+#include "osl/socket.hxx"
#include "osl/thread.h"
#include "osl/thread.hxx"
#include "rsc/rscsfx.hxx"
@@ -666,3 +668,4 @@
//---MARKER---
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx
index aee1db6654..0bbbbdbe9c 100644
--- a/sfx2/inc/progind.hxx
+++ b/sfx2/inc/progind.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 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index 0e03cd8d61..a15abfa16a 100644
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/resmgr.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,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
index e108912a67..4a8841437c 100644
--- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
+++ b/sfx2/inc/sfx2/DocumentMetadataAccess.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.
@@ -213,3 +214,4 @@ private:
#endif // _SFX_DOCUMENTMETADATAACCESS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx
index 6896fd689f..69e5231175 100644
--- a/sfx2/inc/sfx2/Metadatable.hxx
+++ b/sfx2/inc/sfx2/Metadatable.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.
@@ -185,3 +186,5 @@ protected:
} // namespace sfx2
#endif // METADATABLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx
index fefd7226ce..bc4dbfc2d2 100644
--- a/sfx2/inc/sfx2/QuerySaveDocument.hxx
+++ b/sfx2/inc/sfx2/QuerySaveDocument.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,4 @@ SFX2_DLLPUBLIC short ExecuteQuerySaveDocument(
#endif //SFX_QUERYSAVEDOCUMENT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 6efd21cfba..38090e3546 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.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,8 +52,8 @@ isValidXmlId(::rtl::OUString const & i_rStreamName,
::rtl::OUString const & i_rIdref)
{
return isValidNCName(i_rIdref) &&
- (i_rStreamName.equalsAscii("content.xml") ||
- i_rStreamName.equalsAscii("styles.xml"));
+ (i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) ||
+ i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("styles.xml")));
}
@@ -96,3 +97,4 @@ public:
#endif // _SFX_XMLIDREGISTRY_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 6c330b023a..f2ef6c6639 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.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,6 +45,7 @@
#include <vcl/svapp.hxx>
#include <sfx2/shell.hxx>
+#include <vector>
class Timer;
class ApplicationEvent;
@@ -67,7 +69,6 @@ class SfxEventHint;
class SfxItemSet;
class SfxMacroConfig;
class SfxMedium;
-class SfxMediumList;
class SfxMenuCtrlFactArr_Impl;
class SfxNewFileDialog;
class SfxObjectShell;
@@ -99,6 +100,8 @@ struct SfxTbxCtrlFactory;
class SimpleResMgr;
class ModalDialog;
+typedef ::std::vector< SfxMedium* > SfxMediumList;
+
namespace sfx2
{
class SvLinkSource;
@@ -159,12 +162,10 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
SfxAppData_Impl* pAppData_Impl;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* );
SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE void InitializeDisplayName_Impl();
-//#endif
static SfxApplication* Create();
void Init();
@@ -238,17 +239,14 @@ public:
USHORT SaveBasicManager() const;
USHORT SaveBasicAndDialogContainer() const;
void EnterBasicCall();
- FASTBOOL IsInBasicCall() const;
+ bool IsInBasicCall() const;
void LeaveBasicCall();
- void RegisterBasicConstants( const char *pPrefix,
- const SfxConstant *pConsts,
- USHORT nCount );
// misc.
BOOL GetOptions(SfxItemSet &);
void SetOptions(const SfxItemSet &);
virtual void Invalidate(USHORT nId = 0);
- void NotifyEvent(const SfxEventHint& rEvent, FASTBOOL bSynchron = TRUE );
+ void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
BOOL IsDowning() const;
BOOL IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
static SfxObjectShellRef DocAlreadyLoaded( const String &rName,
@@ -265,7 +263,7 @@ public:
SAL_DLLPRIVATE BOOL QueryExit_Impl();
SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &);
- SAL_DLLPRIVATE FASTBOOL Initialize_Impl();
+ SAL_DLLPRIVATE bool Initialize_Impl();
SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; }
@@ -306,7 +304,7 @@ public:
SAL_DLLPRIVATE void PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas );
SAL_DLLPRIVATE void EnterAsynchronCall_Impl();
- SAL_DLLPRIVATE FASTBOOL IsInAsynchronCall_Impl() const;
+ SAL_DLLPRIVATE bool IsInAsynchronCall_Impl() const;
SAL_DLLPRIVATE void LeaveAsynchronCall_Impl();
SAL_DLLPRIVATE void Registrations_Impl();
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const;
@@ -334,3 +332,4 @@ inline SfxApplication* SfxGetpApp()
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index e6f565ba1c..f614142bbc 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.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.
@@ -133,3 +134,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 953c8df5e1..b5f2d7e915 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.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,9 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
class TabPage;
class SfxTabPage;
@@ -225,3 +222,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx
index 16b6c7f7b6..291cad0afd 100644
--- a/sfx2/inc/sfx2/basmgr.hxx
+++ b/sfx2/inc/sfx2/basmgr.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,3 +33,5 @@
#include <svtools/svtools.hrc>
#endif //_SFX_BASMGR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 6eab21e0b7..8a60557653 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.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.
@@ -117,7 +118,6 @@ friend class SfxBindings_Impl;
SfxDispatcher* pDispatcher; // zu verwendender Dispatcher
sal_uInt16 nRegLevel; // Lock-Level waehrend Reconfig
-//#if 0 // _SOLAR__PRIVATE
private:
SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE);
@@ -135,14 +135,13 @@ private:
const SfxPoolItem *pItem,
SfxItemState eItemState );
DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * );
-//#endif
public:
SfxBindings();
~SfxBindings();
void HidePopups( bool bHide = true );
- SAL_DLLPRIVATE void HidePopupCtrls_Impl( FASTBOOL bHide = sal_True );
+ SAL_DLLPRIVATE void HidePopupCtrls_Impl( bool bHide = true );
void SetDispatcher(SfxDispatcher *pDisp);
@@ -193,7 +192,6 @@ public:
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, sal_Bool bMasterCommand );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
@@ -214,7 +212,6 @@ public:
SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId );
-//#endif
};
#ifdef DBG_UTIL
@@ -260,3 +257,4 @@ inline int SfxBindings::IsInRegistrations() const
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 1ad1da83c2..279a192c43 100644
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/sfx2/inc/sfx2/chalign.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,3 +62,5 @@ inline BOOL SfxChildAlignValid( SfxChildAlignment eAlign )
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index a83249963a..7fdfe99f04 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.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.
@@ -77,13 +78,11 @@ struct SfxChildWinInfo
bVisible = sal_False;
nFlags = 0;
}
-//#if 0 // _SOLAR__PRIVATE
sal_Bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0,
Size *pSize = 0,
sal_uInt16 *pLine = 0,
sal_uInt16 *pPos = 0 ) const;
-//#endif
};
// Factory-Methode eines ChildWindows
@@ -126,16 +125,11 @@ struct SfxChildWinFactory
, pArr( NULL )
{}
-//#if 0 // _SOLAR__PRIVATE
~SfxChildWinFactory()
{
delete pArr;
}
-//#else
- // Der WIN16-Compiler versucht dort zu "ubersetzen, wo dieser Header
- // included wird, und kann dann nat"urlich nicht linken, wenn inline ...
-// ~SfxChildWinFactory();
-//#endif
+
};
class FloatingWindow;
@@ -240,7 +234,6 @@ public:
virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&);
SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
@@ -252,7 +245,6 @@ public:
GetContext_Impl() const
{ return pContext; }
SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* );
-//#endif
};
//------------------------------------------------------------------
@@ -321,7 +313,7 @@ public:
SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
return pWin; \
} \
- sal_uInt16 __EXPORT Class::GetChildWindowId () \
+ sal_uInt16 Class::GetChildWindowId () \
{ return MyID; } \
void Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
{ \
@@ -334,7 +326,7 @@ public:
#define SFX_IMPL_FLOATINGWINDOW(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo ); \
@@ -342,7 +334,7 @@ public:
#define SFX_IMPL_MODELESSDIALOG(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxModelessDialog*)GetWindow())->FillInfo( aInfo ); \
@@ -350,7 +342,7 @@ public:
#define SFX_IMPL_DOCKINGWINDOW(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxDockingWindow*)GetWindow())->FillInfo( aInfo ); \
@@ -358,7 +350,7 @@ public:
#define SFX_IMPL_TOOLBOX(Class, MyID) \
SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo __EXPORT Class::GetInfo() const \
+ SfxChildWinInfo Class::GetInfo() const \
{ \
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
((SfxToolbox*)GetWindow())->FillInfo( aInfo ); \
@@ -367,3 +359,5 @@ public:
//------------------------------------------------------------------
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 66fd1dfc06..272536039d 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.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 <memory>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
@@ -669,3 +668,4 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue )
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index a939dc331e..8b293995f3 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.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,11 +86,9 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL IsBindable_Impl() const
{ return pBindings != NULL; }
SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* );
-//#endif
};
//====================================================================
@@ -109,3 +108,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 45a087b8b6..6c103894ab 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.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.
@@ -162,8 +163,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
// class SfxDocumentPage -------------------------------------------------
@@ -253,7 +254,6 @@ public:
// class SfxInternetPage -------------------------------------------------
-class TargetList;
namespace sfx2
{
class FileDialogHelper;
@@ -573,3 +573,4 @@ public:
#endif // #ifndef _SFX_DINFDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index ab2ea95d5d..8d5827c4b6 100644
--- a/sfx2/inc/sfx2/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.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 ---------------------------------------------------------------
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
@@ -77,3 +76,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 265c123e9c..2f6238e79b 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.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.
@@ -234,7 +235,6 @@ public:
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
@@ -258,7 +258,6 @@ public:
SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL);
SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr );
-//#endif
};
//--------------------------------------------------------------------
@@ -364,3 +363,4 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dllapi.h b/sfx2/inc/sfx2/dllapi.h
index 3833cf93d5..b9c9cf5962 100644
--- a/sfx2/inc/sfx2/dllapi.h
+++ b/sfx2/inc/sfx2/dllapi.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.
@@ -40,3 +41,5 @@
#define SFX2_DLLPRIVATE SAL_DLLPRIVATE
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 3054278504..615de879b2 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.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,7 +35,7 @@
#include <tools/rtti.hxx>
// SFX_IMPL_MODULE_LIB
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <rtl/ustring.hxx>
#include <sfx2/objsh.hxx>
@@ -108,7 +109,6 @@ public:
SfxModule* GetModule() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModule_Impl( SfxModule* );
SAL_DLLPRIVATE static void UpdateFilterContainers_Impl();
SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
@@ -139,3 +139,4 @@ public: \
}
#endif // #ifndef _SFX_OBJFAC_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index d6288a7228..cbe39db8c3 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.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,6 +52,8 @@
#include <cppuhelper/weak.hxx>
#include <ucbhelper/content.hxx>
+#include <vector>
+
class SvKeyValueIterator;
class SfxObjectFactory;
class SfxFilter;
@@ -183,7 +186,6 @@ public:
void SetDataAvailableLink( const Link& rLink );
Link GetDataAvailableLink( ) const;
- sal_uInt32 GetMIMEAndRedirect( String& );
sal_uInt32 GetErrorCode() const;
sal_uInt32 GetError() const
{ return ERRCODE_TOERROR(GetErrorCode()); }
@@ -329,10 +331,8 @@ public:
SV_DECL_IMPL_REF( SfxMedium )
SV_DECL_COMPAT_WEAK( SfxMedium )
-#ifndef SFXMEDIUM_LIST
-#define SFXMEDIUM_LIST
-DECLARE_LIST( SfxMediumList, SfxMedium* )
-#endif
+typedef ::std::vector< SfxMedium* > SfxMediumList;
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 030ee7dcdf..968e144bfb 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.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.
@@ -119,3 +120,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docinf.hxx b/sfx2/inc/sfx2/docinf.hxx
index 214a238125..267690b54e 100644
--- a/sfx2/inc/sfx2/docinf.hxx
+++ b/sfx2/inc/sfx2/docinf.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 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet(
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index 0f10e2c638..7d1f507f1c 100644
--- a/sfx2/inc/sfx2/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.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,17 @@
#include <tools/errcode.hxx>
#include <tools/link.hxx>
#include <tools/string.hxx>
+#include <vector>
#include "sfx2/dllapi.h"
namespace sfx2 { class FileDialogHelper; }
class SfxMedium;
-class SfxMediumList;
class SfxItemSet;
class SvStringsDtor;
+typedef ::std::vector< SfxMedium* > SfxMediumList;
+
// ============================================================================
namespace sfx2 {
@@ -87,3 +90,4 @@ public:
#endif // _SFX_DOCINSERT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 1ba7dcd3ea..681865189e 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.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,9 +77,7 @@ protected:
virtual BOOL Close();
virtual void Move();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; }
-//#endif
public:
SfxDockingWindow( SfxBindings *pBindings,
@@ -113,7 +112,6 @@ public:
void AutoShow( BOOL bShow = TRUE );
DECL_LINK( TimerHdl, Timer* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE USHORT GetWinBits_Impl() const;
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
@@ -125,7 +123,6 @@ public:
SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned );
SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
-//#endif
};
class SfxDockingWrapper : public SfxChildWindow
@@ -140,3 +137,5 @@ class SfxDockingWrapper : public SfxChildWindow
};
#endif // #ifndef _SFXDOCKWIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index aef8dd64a5..d06434eee6 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.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.
@@ -330,3 +331,5 @@ namespace sfx2
//........................................................................
#endif // SFX2_DOCMACROMODE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index 5b9ae8cc74..c0dcf66ad4 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.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,6 @@
#include <cppuhelper/implbase1.hxx>
-namespace vos
-{
- class IMutex;
-}
//........................................................................
namespace sfx2
@@ -66,10 +63,10 @@ namespace sfx2
class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base
{
IModifiableDocument* m_pDocument;
- ::vos::IMutex& m_rMutex;
+ ::osl::SolarMutex& m_rMutex;
public:
- DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::vos::IMutex& _rMutex );
+ DocumentStorageModifyListener( IModifiableDocument& _rDocument, ::osl::SolarMutex& _rMutex );
void dispose();
@@ -93,3 +90,5 @@ namespace sfx2
//........................................................................
#endif // SFX2_DOCSTORAGEMODIFYLISTENER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 415eb058b7..7f19f244a4 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.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/lstbox.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
@@ -84,3 +83,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 60dd1ae473..0f2ac259df 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.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.
@@ -146,3 +147,4 @@ public:
#endif // #ifndef _SFXDOCTEMPL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 7f33941a2b..4120229fc3 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.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.
@@ -140,3 +141,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index bf434c1d62..7f0b217064 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.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,16 +69,26 @@ struct SFX2_DLLPUBLIC SfxEventName
, maUIName( rUIName ) {}
};
-DECLARE_LIST( _SfxEventNamesList, SfxEventName* )
+typedef ::std::vector< SfxEventName* > _SfxEventNamesList;
-class SFX2_DLLPUBLIC SfxEventNamesList : public _SfxEventNamesList
+class SFX2_DLLPUBLIC SfxEventNamesList
{
+private:
+ _SfxEventNamesList aEventNamesList;
+ void DelDtor();
+
public:
- SfxEventNamesList( const USHORT nInitSz = 0, const USHORT nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {}
- SfxEventNamesList( const SfxEventNamesList &rCpy ) : _SfxEventNamesList() { *this = rCpy; }
+ SfxEventNamesList() {}
+ SfxEventNamesList( const SfxEventNamesList &rCpy ) { *this = rCpy; }
~SfxEventNamesList() { DelDtor(); }
SfxEventNamesList& operator=( const SfxEventNamesList &rCpy );
- void DelDtor();
+
+ size_t size() const { return aEventNamesList.size(); };
+
+ SfxEventName* at( size_t Index ) const
+ { return Index < aEventNamesList.size() ? aEventNamesList[ Index ] : NULL; }
+
+ void push_back( SfxEventName* Item ) { aEventNamesList.push_back( Item ); }
};
class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
@@ -121,3 +132,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 16f23d9552..3848073e66 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.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.
@@ -115,14 +116,12 @@ public:
const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
BOOL bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
-//#endif
};
class SfxFilterMatcher_Impl;
@@ -136,10 +135,8 @@ public:
SfxFilterMatcher();
~SfxFilterMatcher();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter );
DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* );
-//#endif
sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
@@ -164,9 +161,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
USHORT nCurrent;
const SfxFilterMatcher_Impl *pMatch;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE const SfxFilter* Find_Impl();
-//#endif
public:
SfxFilterMatcherIter( const SfxFilterMatcher* pMatchP, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED );
@@ -176,3 +171,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index bdb53a17a1..7155006a79 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.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,9 +39,7 @@
#include <tools/errcode.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/graph.hxx>
#include <sfx2/sfxdefs.hxx>
#include <sfx2/sfxuno.hxx>
@@ -135,12 +134,9 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
FileDialogHelper_Impl *mpImp;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Int16 getDialogType( sal_Int64 nFlags ) const;
-//#endif
-
public:
FileDialogHelper( sal_Int64 nFlags,
const String& rFactory,
@@ -292,21 +288,18 @@ public:
DECL_LINK( ExecuteSystemFilePicker, void* );
-//#if 0 // _SOLAR__PRIVATE
ErrCode Execute( SvStringsDtor*& rpURLList,
SfxItemSet *& rpSet,
String& rFilter,
const String& rDirPath );
ErrCode Execute( SfxItemSet *& rpSet,
String& rFilter );
-//#endif
};
#define SFX2_IMPL_DIALOG_CONFIG 0
#define SFX2_IMPL_DIALOG_SYSTEM 1
#define SFX2_IMPL_DIALOG_OOO 2
-//#if 0 // _SOLAR__PRIVATE
ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
const String& rFact,
SvStringsDtor *& rpURLList,
@@ -316,10 +309,10 @@ ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
const String& rStandardDir = String::CreateFromAscii( "" ),
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >());
-//#endif
}
//-----------------------------------------------------------------------------
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index fe47d4674b..75b2661cf7 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.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,7 +184,6 @@ public:
sal_Bool IsInPlace() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Bool DoClose_Impl();
SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
@@ -237,9 +237,7 @@ class SfxFrameIterator
const SfxFrame* pFrame;
sal_Bool bRecursive;
-//#if 0 // _SOLAR__PRIVATE
SfxFrame* NextSibling_Impl( SfxFrame& rPrev );
-//#endif
public:
SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecursive=sal_True );
@@ -267,8 +265,8 @@ public:
virtual String GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
sal_Bool FrameKilled() const { return &wFrame != pFrame; }
@@ -304,10 +302,30 @@ public:
{ return m_xFrame; }
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+};
+
+class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
+{
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
+ m_xFrame;
+
+public:
+ TYPEINFO();
+ SfxUnoFrameItem();
+ SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
+ GetFrame() const
+ { return m_xFrame; }
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
typedef SfxUsrAnyItem SfxUnoAnyItem;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index 1a3413fd30..ac9331e414 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.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.
@@ -292,3 +293,4 @@ public:
#endif // #ifndef _SFX_FRMDESCRHXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index 0091b6e3ac..ea00089130 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.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 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index e4b134e39a..3d3dca2d08 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.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,4 @@ inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx
index 792f2208ce..e1424a59a8 100644
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/sfx2/inc/sfx2/genlink.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.
@@ -54,3 +55,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index a908bb75cd..fb3c072f7a 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.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,9 +58,7 @@ class SfxHintPoster: public SvRefBase
private:
void RegisterEvent();
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( DoEvent_Impl, SfxHint * );
-//#endif
protected:
virtual ~SfxHintPoster();
@@ -78,3 +77,5 @@ public:
SV_DECL_IMPL_REF(SfxHintPoster);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index f02de328db..e841ad9143 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.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 @@
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx
index fa552ad42b..5dd5645be8 100644
--- a/sfx2/inc/sfx2/imagemgr.hxx
+++ b/sfx2/inc/sfx2/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.
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
index baa5844918..bb535f2787 100644
--- a/sfx2/inc/sfx2/imgdef.hxx
+++ b/sfx2/inc/sfx2/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.
@@ -31,3 +32,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index ce945eb671..7d45b578a3 100644
--- a/sfx2/inc/sfx2/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.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 <sal/types.h>
#include <tools/gen.hxx>
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
class ToolBox;
class SfxModule;
@@ -55,13 +54,15 @@ public:
// get images from resources
void SetImages( ToolBox& rToolBox );
- void SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
- void SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
+ void SetImages( ToolBox& rToolBox, BOOL bLarge );
+ void SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge );
- Image GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
- Image GetImage( USHORT nId, BOOL bHiContrast ) const;
- Image SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
- Image SeekImage( USHORT nId, BOOL bHiContrast ) const;
+ Image GetImage( USHORT nId, BOOL bLarge ) const;
+ Image GetImage( USHORT nId) const;
+ Image SeekImage( USHORT nId, BOOL bLarge ) const;
+ Image SeekImage( USHORT nId ) const;
};
-#endif
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 99f24c703f..5bf6877d23 100644
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/sfx2/inc/sfx2/ipclient.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,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index 5f662b92bf..2d5d858426 100644
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/sfx2/inc/sfx2/itemconnect.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.
@@ -593,3 +594,4 @@ ValueSetConnection< ItemWrpT >::ValueSetConnection(
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index 7204588cfb..85cd42ae79 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.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.
@@ -205,3 +206,4 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
index 080735a7ce..95438e1d9e 100644
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ b/sfx2/inc/sfx2/layout-post.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,3 +39,5 @@
#endif /* ENABLE_LAYOUT */
#endif /* _SFX2_LAYOUT_POST_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
index 6ed1592f8c..d92331f4c3 100644
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ b/sfx2/inc/sfx2/layout-pre.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,3 +48,5 @@
#endif /* ENABLE_LAYOUT */
#endif /* _SFX2_LAYOUT_PRE_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
index 605df887d3..de480cbb50 100644
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ b/sfx2/inc/sfx2/layout-tabdlg.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,3 +45,4 @@
#endif /* _LAYOUT_SFX_TABDLG_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index 836a762f95..914f9c9224 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.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,18 +50,6 @@ public:
SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0);
};
-#if 0
-class SFX2_DLLPUBLIC SfxTabDialog
- : public ::SfxTabDialog
- , public InPlug
-{
-public:
- SfxTabDialog (::Window *parent, char const* xml_file, char const* id, ResId const& res_id, SfxItemSet const* set=0);
- ::Window* GetParent () const;
- void FreeResource ();
-};
-#endif
-
class SFX2_DLLPUBLIC SfxTabPage
: public ::SfxTabPage
, public InPlug
@@ -76,3 +65,5 @@ public:
} // end namespace layout
#endif /* _SFX2_LAYOUT_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 6ff4e267d9..86baa70a6d 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.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.
@@ -55,6 +56,10 @@ SV_DECL_PTRARR( SvLinkSources, SvLinkSourcePtr, 1, 1 )
class SFX2_DLLPUBLIC LinkManager
{
+ typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > >
+ CompVector;
+ CompVector maCachedComps;
+
SvBaseLinks aLinkTbl;
SvLinkSources aServerTbl;
@@ -166,3 +171,4 @@ SFX2_DLLPUBLIC void MakeLnkName( String& rName,
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index ae8d119da1..25aededf8c 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.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 "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
#include <tools/rtti.hxx>
#include <com/sun/star/io/XInputStream.hpp>
@@ -44,7 +43,6 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
class Window;
class String;
@@ -74,7 +72,6 @@ public:
SvLinkSource();
virtual ~SvLinkSource();
-// SvBaseLink* GetDataBaseLink() const;
BOOL HasDataLinks( const SvBaseLink* = 0 ) const;
void Closed();
@@ -124,12 +121,12 @@ public:
StreamToLoadFrom getStreamToLoadFrom();
void setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,sal_Bool bIsReadOnly );
- // --> OD 2008-06-18 #i88291#
void clearStreamToLoadFrom();
- // <--
};
SV_DECL_IMPL_REF(SvLinkSource);
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index a71941175c..5e84c335fd 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.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,17 +32,12 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include <sot/exchange.hxx>
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
-#ifndef _LINKSOURCE_HXX
#include <sfx2/linksrc.hxx>
-#endif
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
namespace sfx2
@@ -170,9 +166,8 @@ public:
sal_Bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; }
- // --> OD 2008-06-18 #i88291#
+ // #i88291#
void clearStreamToLoadFrom();
- // <--
inline BOOL WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
@@ -183,3 +178,5 @@ SV_DECL_IMPL_REF(SvBaseLink);
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index e0e1ddd375..7514d4c511 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.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,18 +50,12 @@ class SvStream;
class SvxMacro;
typedef SfxMacroInfo* SfxMacroInfoPtr;
-//#if 0 // _SOLAR__PRIVATE
SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5)
-//#else
-//class SfxMacroInfoArr_Impl;
-//#endif
class SFX2_DLLPUBLIC SfxMacroInfo
{
friend class SfxMacroConfig;
friend class SfxEventConfiguration;
-friend SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo);
-friend SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo);
String* pHelpText;
sal_uInt16 nRefCnt;
@@ -80,8 +75,6 @@ public:
const String& rModuleName, const String& rMethodName);
~SfxMacroInfo();
sal_Bool operator==(const SfxMacroInfo& rOther) const;
- int Load (SvStream&);
- int Store (SvStream&);
String GetMacroName() const;
String GetQualifiedName() const;
String GetFullQualifiedName() const;
@@ -106,10 +99,6 @@ public:
String GetURL() const;
};
-//ASDBG obsolete >= 582
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > ;
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ;
-
class SFX2_DLLPUBLIC SfxMacroConfig
{
friend class SfxEventConfiguration;
@@ -130,9 +119,6 @@ public:
static sal_Bool IsBasic( SbxObject*, const String&, BasicManager* );
static ErrCode Call( SbxObject*, const String&, BasicManager*,
SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
-//ASDBG obsolete >= 582
-//ASDBG static void CallStarScript( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > & rxEngine, const String & rCode,
-//ASDBG const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rSource, void *pArgs, void *pRet );
static SbMethod* GetMethod_Impl( const String&, BasicManager* );
sal_uInt16 GetSlotId(SfxMacroInfoPtr);
@@ -144,12 +130,12 @@ public:
sal_Bool CheckMacro(sal_uInt16 nId) const;
sal_Bool CheckMacro( SfxObjectShell*, const SvxMacro* ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void Release_Impl();
SAL_DLLPRIVATE const SfxMacroInfo* GetMacroInfo_Impl( const SvxMacro *pMacro ) const;
DECL_DLLPRIVATE_LINK( CallbackHdl_Impl, SfxMacroConfig*);
DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*);
-//#endif
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index ba305a02ae..75236104de 100644
--- a/sfx2/inc/sfx2/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.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,12 +34,14 @@
#include "tools/link.hxx"
#include <tools/string.hxx>
#include "sfx2/dllapi.h"
-
-// class SfxMailModel_Impl -----------------------------------------------
-class AddressList_Impl;
+// class AddressList_Impl ------------------------------------------------
+typedef String* AddressItemPtr_Impl;
+typedef ::std::vector< AddressItemPtr_Impl > AddressList_Impl;
+
+// class SfxMailModel_Impl -----------------------------------------------
-class SFX2_DLLPUBLIC SfxMailModel
+class SFX2_DLLPUBLIC SfxMailModel
{
public:
enum MailPriority
@@ -84,8 +87,8 @@ private:
void ClearList( AddressList_Impl* pList );
void MakeValueList( AddressList_Impl* pList, String& rValueList );
SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
- const rtl::OUString& rType,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
+ const rtl::OUString& rType,
rtl::OUString& rFileNamePath );
SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
@@ -104,7 +107,7 @@ public:
SEND_MAIL_CANCELLED,
SEND_MAIL_ERROR
};
-
+
SfxMailModel();
~SfxMailModel();
@@ -112,26 +115,26 @@ public:
void SetFromAddress( const String& rAddress ) { maFromAddress = rAddress; }
void SetSubject( const String& rSubject ) { maSubject = rSubject; }
void SetPriority( MailPriority ePrio ) { mePriority = ePrio; }
-
+
/** attaches a document to the current attachment list, can be called more than once.
* at the moment there will be a dialog for export executed for every model which is going to be attached.
*
- * \param sDocumentType
+ * \param sDocumentType
The doc type to export. PDF will be at the moment only a direct export (no dialog).
- * \param xModel
+ * \param xModel
The current model to attach
- * \param sAttachmentTitle
+ * \param sAttachmentTitle
The title which will be used as attachment title
* \return @see error code
*/
- SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
+ SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
const ::rtl::OUString& sAttachmentTitle );
SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
const rtl::OUString& rType );
SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
-
+
sal_Int32 GetCount() const;
sal_Bool IsEmpty() const;
};
@@ -139,3 +142,5 @@ public:
BOOL CreateFromAddress_Impl( String& rFrom );
#endif // INCLUDED_SFX_MAILMODEL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index 1c775f5a4a..1c9088e827 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.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/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_MEDIT_HXX
#include <svtools/svmedit.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
@@ -89,13 +88,11 @@ class SfxManageStyleSheetPage : public SfxTabPage
private:
friend class SfxStyleDialog;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( GetFocusHdl, Edit * );
DECL_LINK( LoseFocusHdl, Edit * );
void UpdateName_Impl(ListBox *, const String &rNew);
void SetDescriptionText_Impl();
-//#endif
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
~SfxManageStyleSheetPage();
@@ -118,3 +115,4 @@ protected:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx
index 735000aa1a..dc24589304 100644
--- a/sfx2/inc/sfx2/mieclip.hxx
+++ b/sfx2/inc/sfx2/mieclip.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,3 +62,4 @@ public:
#endif //_MIECLIP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index e7bb535004..b66be5e15d 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.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,7 +35,6 @@
#include <string.h>
#include <tools/solar.h>
#include <tools/debug.hxx>
-//#include "typecast.hxx"
#if defined (ALPHA) && defined (UNX)
#define DEL_ARRAY( X )
@@ -527,3 +527,5 @@ public:\
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx
index 16be97df92..77bafc2f4c 100644
--- a/sfx2/inc/sfx2/minfitem.hxx
+++ b/sfx2/inc/sfx2/minfitem.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 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index ded6144173..904ea374c1 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.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.
@@ -97,3 +98,4 @@ public: \
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5da722138f..f8b9626260 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.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,11 +44,7 @@ struct SfxMenuCtrlFactory;
class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
{
-//friend SvStream& operator<<( SvStream& rStream, const SfxMenuControl& rItem );
-//friend SvStream& operator>>( SvStream& rStream, SfxMenuControl& rItem );
-
String aTitle;
- String aHelpText;
SfxVirtualMenu* pOwnMenu;
SfxVirtualMenu* pSubMenu;
BOOL b_ShowStrings;
@@ -65,15 +62,10 @@ public:
using SfxControllerItem::Bind;
void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
- const String& rTitle, const String &rHelpText,
- SfxBindings & );
+ const String& rTitle, SfxBindings& rBindings );
void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
SfxVirtualMenu& rSubMenu,
- const String& rTitle, const String &rHelpText,
- SfxBindings & );
-
-// SvStream & Load(SvStream &, SfxBindings*);
-// SvStream & Store(SvStream &);
+ const String& rTitle, SfxBindings& rBindings );
String GetTitle() const;
SfxVirtualMenu* GetPopupMenu() const;
@@ -81,9 +73,6 @@ public:
void SetOwnMenu( SfxVirtualMenu* pMenu );
void RemovePopup();
- const String& GetHelpText() const { return aHelpText; }
- void SetHelpText(const String &rStr) { aHelpText = rStr; }
-
virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
@@ -108,8 +97,6 @@ public:
void Select();
};
-//--------------------------------------------------------------------
-
typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & );
struct SfxMenuCtrlFactory
@@ -126,44 +113,36 @@ struct SfxMenuCtrlFactory
{}
};
-//
-
inline String SfxMenuControl::GetTitle() const
{
return aTitle;
}
-//--------------------------------------------------------------------
-
-//
inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
{
return pSubMenu;
}
-//--------------------------------------------------------------------
#define SFX_DECL_MENU_CONTROL() \
static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \
static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \
- SfxMenuControl* __EXPORT Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
+ SfxMenuControl* Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
{ return new Class(nId, rMenu, rBindings); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
-//#if 0 // _SOLAR__PRIVATE
class SfxAppMenuControl_Impl : public SfxMenuControl
{
PopupMenu* pMenu;
ULONG m_nSymbolsStyle;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
protected:
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
public:
SFX_DECL_MENU_CONTROL();
@@ -171,6 +150,6 @@ public:
~SfxAppMenuControl_Impl();
};
-//#endif
-
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 63ade086ab..507c46d4dd 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.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,7 +30,6 @@
#include <stdarg.h>
-#ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!!
#include <vcl/menu.hxx>
#endif
#include <tools/wintypes.hxx>
@@ -89,9 +89,7 @@ public:
ResMgr* GetResMgr() const { return pResMgr; }
void SetPopupMenu( USHORT nId, PopupMenu *pMenu );
-//#if 0 // _SOLAR__PRIVATE
void Construct_Impl( Menu* pMenu, BOOL bWithHelp );
-//#endif
};
//--------------------------------------------------------------------
@@ -146,3 +144,4 @@ public:
#endif // #ifndef _SFXMNUMGR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 8ccfa7a258..2629cbab7c 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.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,9 +66,7 @@ private:
sal_Bool bDummy : 1;
SfxModule_Impl* pImpl;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Construct_Impl();
-//#endif
public:
TYPEINFO();
@@ -99,7 +98,6 @@ public:
static FieldUnit GetCurrentFieldUnit();
FieldUnit GetFieldUnit() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
SAL_DLLPRIVATE static void DestroyModules_Impl();
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
@@ -107,9 +105,8 @@ public:
SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
- SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
-//#endif
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index cb206ff5f5..80b7e1ace6 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.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,14 +79,14 @@ class SfxRequest;
class SfxItemSet;
#define SFX_EXEC_STUB( aShellClass, aExecMethod) \
- void __EXPORT SfxStub##aShellClass##aExecMethod( \
+ void SfxStub##aShellClass##aExecMethod( \
SfxShell *pShell, SfxRequest& rReq) \
{ \
(( aShellClass* ) pShell )->aExecMethod( rReq ); \
}
#define SFX_STATE_STUB( aShellClass, aStateMethod) \
- void __EXPORT SfxStub##aShellClass##aStateMethod( \
+ void SfxStub##aShellClass##aStateMethod( \
SfxShell *pShell, SfxItemSet& rSet) \
{ \
(( aShellClass* ) pShell )->aStateMethod( rSet ); \
@@ -112,7 +113,7 @@ enum SfxSlotKind
struct SfxTypeAttrib
{
USHORT nAID;
- const char __FAR_DATA* pName;
+ const char* pName;
};
struct SfxType
@@ -225,8 +226,8 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
}
#define SFX_SLOTMAP_NONE(ShellClass) \
- static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \
- static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] = \
+ static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
+ static SfxSlot a##ShellClass##Slots_Impl[] = \
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
#define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \
@@ -239,7 +240,7 @@ class SfxPoolItem;
struct SfxFormalArgument
{
const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse)
- const char __FAR_DATA* pName; // Name des Parameters
+ const char* pName; // Name des Parameters
USHORT nSlotId;// Slot-Id zur Identifikation des Parameters
const TypeId& Type() const
@@ -265,8 +266,8 @@ public:
SfxStateFunc fnState; // Funktion f"ur Status
const SfxType* pType; // SfxPoolItem-Typ (Status)
- const char __FAR_DATA* pName; // Name des Slots
- const char __FAR_DATA* pMethodName; // Name der Method falls anders
+ const char* pName; // Name des Slots
+ const char* pMethodName; // Name der Method falls anders
const SfxSlot* pLinkedSlot; // Master-Slot f"ur Enum-Werte
const SfxSlot* pNextSlot; // mit derselben Status-Methode
@@ -275,7 +276,7 @@ public:
USHORT nArgDefCount; // Anzahl der formalen Argumente
long nDisableFlags; // DisableFlags, die vorhanden sein
// m"ussen, damit der Slot enabled ist
- const char __FAR_DATA* pUnoName; // UnoName des Slots
+ const char* pUnoName; // UnoName des Slots
public:
@@ -347,3 +348,5 @@ inline USHORT SfxSlot::GetGroupId() const
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 71b5c76ab0..692c5a2f37 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.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.
@@ -93,3 +94,4 @@ inline const SfxSlot* SfxSlotPool::FirstSlot()
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx
index a391d06ccc..34bcc891cb 100644
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/sfx2/inc/sfx2/navigat.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/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 9b2c4d1c58..62563a6536 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.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,18 +31,10 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
//=========================================================================
@@ -70,13 +63,6 @@ protected:
virtual void Paint( const Rectangle& rRect );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- /** state whether a system setting for high contrast should be evaluated
- and taken into account for this window.
-
- The default implementation uses the accessibility option IsForDrawings
- */
- virtual bool UseHighContrastSetting() const;
-
public:
SfxPreviewWin( Window* pParent,
const ResId& rResId,
@@ -110,3 +96,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index ac0c148e3f..b7fa817b78 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.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 "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/msgbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/dialog.hxx>
@@ -51,10 +50,8 @@ private:
QueryBox aQueryOverwriteBox;
SfxStyleSheetBasePool& rPool;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( OKHdl, Control * );
DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * );
-//#endif
public:
SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& );
@@ -65,3 +62,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 82c80f7111..e7716f99c8 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.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 "sfx2/dllapi.h"
#include "sal/types.h"
#include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
#include <tools/resid.hxx>
-#endif
#include <sfx2/msg.hxx>
@@ -109,12 +108,10 @@ public:
void Register( SfxModule* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE int ContainsSlot_Impl( const SfxSlot *pSlot ) const
{ return pSlot >= pSlots && pSlot < pSlots + Count(); }
SAL_DLLPRIVATE ResMgr* GetResManager_Impl() const
{ return aNameResId.GetResMgr(); }
-//#endif
};
//--------------------------------------------------------------------
@@ -135,7 +132,6 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
return nPos < nCount? pSlots+nPos: 0;
}
-//#if 0 // _SOLAR__PRIVATE
class SfxIFConfig_Impl
{
friend class SfxInterface;
@@ -149,6 +145,7 @@ public:
void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
USHORT GetType();
};
-//#endif
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index ac1d0663a6..d3988fd76c 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.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/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index f6efccbb60..e2013d4312 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.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,7 +53,6 @@
// include something else
//________________________________________________________________________________________________________________
-//#if 0 // _SOLAR__PRIVATE
#include <vcl/timer.hxx>
//#endif
#include <svl/poolitem.hxx>
@@ -127,6 +127,9 @@ namespace com { namespace sun { namespace star {
namespace document {
class XDocumentProperties;
}
+ namespace lang {
+ class XComponent;
+ }
} } }
typedef sal_uInt32 SfxObjectShellFlags;
@@ -222,10 +225,6 @@ private:
SAL_DLLPRIVATE sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
-//REMOVE sal_Bool SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
-
-//#endif
-
protected:
SfxObjectShell(SfxObjectCreateMode);
SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx
@@ -307,10 +306,8 @@ public:
void SetSharedXMLFlag( sal_Bool bFlag ) const;
sal_Bool HasSharedXMLFlagSet() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModalMode_Impl(sal_Bool bModal=sal_True);
SAL_DLLPRIVATE void SetMacroMode_Impl(sal_Bool bModal=sal_True);
-//#endif
void ResetError();
sal_uInt32 GetError() const;
@@ -342,6 +339,16 @@ public:
virtual sal_Bool SwitchPersistance(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual void UpdateLinks();
+ /**
+ * Called when the Options dialog is dismissed with the OK button, to
+ * handle potentially conflicting option settings.
+ */
+ virtual void CheckConfigOptions();
+ sal_Bool IsConfigOptionsChecked() const;
+ void SetConfigOptionsChecked( sal_Bool bChecked );
+
+ // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action
+ virtual sal_Bool QuerySlotExecutable( USHORT nSlotId );
// called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action
virtual sal_Bool QuerySlotExecutable( USHORT nSlotId );
@@ -354,7 +361,7 @@ public:
sal_Bool SaveCompletedChildren( sal_Bool bSuccess );
sal_Bool InsertFrom( SfxMedium &rMedium );
- sal_Bool ImportFrom( SfxMedium &rMedium );
+ virtual sal_Bool ImportFrom( SfxMedium &rMedium );
sal_Bool ExportTo( SfxMedium &rMedium );
// xmlsec05, check with SFX team
@@ -513,6 +520,9 @@ public:
const String& rMimeType,
const ::com::sun::star::uno::Any & rValue );
virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem );
+ virtual void ReconnectDdeLink(SfxObjectShell& rServer);
+
+ static void ReconnectDdeLinks(SfxObjectShell& rServer);
// Contents
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
@@ -542,36 +552,24 @@ public:
virtual void SetOrganizerSearchMask(
SfxStyleSheetBasePool* ) const;
+ virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
- virtual sal_uInt16 GetContentCount(
- sal_uInt16 nIdx1 = INDEX_IGNORE,
- sal_uInt16 nIdx2 = INDEX_IGNORE );
virtual sal_Bool CanHaveChilds(
sal_uInt16 nIdx1,
- sal_uInt16 nIdx2 = INDEX_IGNORE );
- virtual void GetContent( String &,
- Bitmap &rClosedBitmap,
- Bitmap &rOpenedBitmap,
- sal_Bool &bCanDelete,
- sal_uInt16 nPos,
- sal_uInt16 nIdx1,
- sal_uInt16 nIdx2 = INDEX_IGNORE );
+ sal_uInt16 nIdx2 = INDEX_IGNORE
+ );
virtual void GetContent( String &,
Bitmap &rClosedBitmap,
Bitmap &rOpenedBitmap,
- BmpColorMode eColorMode,
sal_Bool &bCanDelete,
sal_uInt16 nPos,
- sal_uInt16 nIdx1,
- sal_uInt16 nIdx2 = INDEX_IGNORE );
-
- virtual void TriggerHelpPI(
- sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16 nIdx3);
+ sal_uInt16 nIdx1
+ );
- virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily );
+ virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
- virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode );
+ virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily);
virtual sal_Bool Insert( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1,
@@ -599,10 +597,6 @@ public:
// F"ur Docs, die zum Formatieren die Viewgr"o\se
// ben"otigen
virtual SfxObjectShell* GetObjectShell();
- //void SetBaseURL( const String& rURL );
- //const String& GetBaseURL() const;
- //const String& GetBaseURLForSaving() const;
- //void SetEmptyBaseURL();
virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
@@ -620,6 +614,9 @@ public:
static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
static SfxObjectShell* CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
static SfxObjectShell* CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 );
+ static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL );
+ static SfxObjectShell* GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp );
static String GetServiceNameFromFactory( const String& rFact );
BOOL IsInPlaceActive();
BOOL IsUIActive();
@@ -643,7 +640,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
-//REMOVE void SetFileName( const ::rtl::OUString& );
SvGlobalName GetClassName() const;
// comphelper::IEmbeddedHelper
@@ -704,9 +700,9 @@ public:
// =================================
-//#if 0 // _SOLAR__PRIVATE
+ // =================================
- SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
+ SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const;
SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
@@ -792,8 +788,8 @@ public:
SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
- ImplAnalyzeSignature(
- sal_Bool bScriptingContent,
+ ImplAnalyzeSignature(
+ sal_Bool bScriptingContent,
const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
= ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
@@ -806,8 +802,6 @@ public:
0x9eaba5c3, 0xb232, 0x4309, \
0x84, 0x5f, 0x5f, 0x15, 0xea, 0x50, 0xd0, 0x74
-//#if 0 // _SOLAR__PRIVATE
-
struct ModifyBlocker_Impl
{
SfxObjectShell* pPersist;
@@ -824,7 +818,7 @@ public:
pPersist->EnableSetModified( bWasEnabled );
}
};
-//#endif
+
//--------------------------------------------------------------------
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
@@ -848,7 +842,6 @@ public:
SfxObjectShell* pSh );
virtual void Timeout();
};
-//#endif
//-------------------------------------------------------------------------
@@ -875,8 +868,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual String GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
SfxObjectShell* GetObjectShell() const
{ return pObjSh; }
@@ -884,3 +877,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index f6ea2aad1b..98618cc1d7 100644
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.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.
@@ -190,3 +191,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index 09f6752a27..3f716f8650 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.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 @@ private:
#endif // _SVX_OPENGRF_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 4ca2dd8149..ae1ea12cff 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.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,6 +68,9 @@ private:
HelpButton maHelpBtn;
USHORT mnMinLen;
+ String maMinLenPwdStr;
+ String maEmptyPwdStr;
+ String maMainPwdStr;
USHORT mnExtras;
bool mbAsciiOnly;
@@ -95,3 +99,4 @@ public:
#endif // #ifndef _SFX_PASSWD_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 37986794eb..d437a10ff4 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.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 "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _PRINT_HXX //autogen
#include <vcl/print.hxx>
-#endif
class SfxTabPage;
class SfxItemSet;
@@ -81,3 +80,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 62cc555d4f..68272a58d1 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.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 "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. FixedText
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/print.hxx>
@@ -104,9 +101,8 @@ private:
SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions );
SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
SAL_DLLPRIVATE void ImplSetAccessibleNames();
- // <--
protected:
@@ -126,10 +122,6 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-// -------------------------------
-// - TransparencyPrintWarningBox -
-// -------------------------------
-
class TransparencyPrintWarningBox : public ModalDialog
{
private:
@@ -153,3 +145,4 @@ public:
#endif // #ifndef _SFX_PRINTOPT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 038f9d188a..fc881abff4 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.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 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index e9681d5de5..4ebc34a7d5 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.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,13 +80,12 @@ public:
static void EnterLock();
static void LeaveLock();
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
- SAL_DLLPRIVATE FASTBOOL StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
+ SAL_DLLPRIVATE bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
SAL_DLLPRIVATE const String& GetStateText_Impl() const;
-//#endif
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index 15252453ac..6dd771f424 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.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,5 @@ class SFX2_DLLPUBLIC SfxQueryStatus
};
#endif // _SFXQUERYSTATUS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 6893725a22..c2d95ab6f7 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.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,7 +62,6 @@ friend struct SfxRequest_Impl;
SfxRequest_Impl* pImp;
//---------------------------------------------------------------------
-//#if 0 // _SOLAR__PRIVATE
public:
SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder,
@@ -69,7 +69,6 @@ public:
private:
SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet );
-//#endif
//---------------------------------------------------------------------
public:
@@ -96,7 +95,7 @@ public:
static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId,
bool bDeep = false,
TypeId aType = 0 );
- const SfxPoolItem* GetArg( USHORT nSlotId, FASTBOOL bDeep = FALSE, TypeId aType = 0 ) const;
+ const SfxPoolItem* GetArg( USHORT nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
void ReleaseArgs();
void SetReturnValue(const SfxPoolItem &);
const SfxPoolItem* GetReturnValue() const;
@@ -105,7 +104,7 @@ public:
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static BOOL HasMacroRecorder( SfxViewFrame* pFrame=NULL );
USHORT GetCallMode() const;
- FASTBOOL IsRecording() const;
+ bool IsRecording() const;
void AllowRecording( BOOL );
BOOL AllowsRecording() const;
BOOL IsAPI() const;
@@ -119,7 +118,7 @@ public:
void Ignore();
void Cancel();
BOOL IsCancelled() const;
- void Done(const SfxItemSet &, FASTBOOL bKeep = TRUE );
+ void Done(const SfxItemSet &, bool bKeep = true );
void ForgetAllArgs();
@@ -137,3 +136,5 @@ private:
SfxRequest::GetItem( pArgs, nSlotId, bDeep, TYPE(ItemType) )
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
index ade48ac8f4..65adfb9c84 100755
--- a/sfx2/inc/sfx2/securitypage.hxx
+++ b/sfx2/inc/sfx2/securitypage.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 @@ public:
#endif // #ifndef _SECURITYPAGE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index ebabd29de5..720726900d 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.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.
@@ -415,3 +416,5 @@ private:
} ; // class SfxBaseController
#endif // _SFX_SFXBASECONTROLLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index d29b0a1b42..64c4aaac68 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.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.
@@ -1519,6 +1520,7 @@ protected:
/* returns true if the document signatures are valid, otherwise false */
sal_Bool hasValidSignatures() const;
+ void setDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& );
//________________________________________________________________________________________________________
// private methods
//________________________________________________________________________________________________________
@@ -1607,3 +1609,5 @@ private:
#undef css
#endif // _SFX_SFXBASEMODEL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index a3653ef65b..eafbef21d4 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.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 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index cab0c677ca..5a88cb76f4 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.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.
@@ -158,3 +159,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index ff08edbd66..d7e7dc38bd 100644
--- a/sfx2/inc/sfx2/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.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,3 +71,4 @@ public:
#endif // #ifndef _SFX_HELP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index f039b8bd0e..6a24421356 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.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,12 +99,6 @@ protected:
void StartFileDownload( const String& rURL, int nToken,
SfxObjectShell *pSh=0 );
- // Ermittelnd des MIME-Types eines zuvor downloadeten Files. Kann nur
- // unmittelbar vor FinishFileDownload aufgerufen werden, nie aber
- // danach.
-
- BOOL GetFileDownloadMIME( String& rMime );
-
// Beenden eines asynchronen File-Downloads. Gibt TRUE zurueck, wenn
// der Download geklappt hat. Das gelesene File befindet sich dann in
// dem uebergeben String.
@@ -131,3 +126,5 @@ inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String&
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index ac22ef41df..597d3e9c54 100644
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/sfx2/inc/sfx2/sfxmodelfactory.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 @@ namespace sfx2
//........................................................................
#endif // SFX2_SFXMODELFACTORY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index 095f7e1077..63e4868f3d 100644
--- a/sfx2/inc/sfx2/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.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.
@@ -54,3 +55,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index d6ab79d2a1..1239a9ed76 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -75,6 +75,7 @@
#define SID_VERSION_VISIBLE (SID_SFX_START + 313)
#define SID_PASTE_UNFORMATTED (SID_SFX_START + 314)
+#define SID_DIALOG_RETURN (SID_SFX_START + 318)
#define SID_PRINTER_NOTFOUND_WARN (SID_SFX_START + 320)
#define SID_PRINTER_USETHREAD (SID_SFX_START + 321)
#define SID_PRINTER_NAME (SID_SFX_START + 322)
@@ -126,7 +127,8 @@
#define SID_HELP_ZOOMOUT (SID_SFX_START + 418)
#define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
#define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
-#define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
+#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
+#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
// default-ids for document
@@ -368,6 +370,7 @@
#define SID_OPENCOPY (SID_SFX_START + 674)
#define SID_SOURCEVIEW (SID_SFX_START + 675)
#define SID_DOC_STARTPRESENTATION (SID_SFX_START + 695)
+#define SID_DDE_RECONNECT_ONLOAD (SID_SFX_START + 696)
#define SID_PLUGFRAMEARG (SID_SFX_START + 666)
#define SID_NEWWINDOWFOREDIT (SID_SFX_START + 667)
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 6a44d24f4a..1a4d68d944 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.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 @@ class SFX2_DLLPUBLIC SfxStatusListener :
};
#endif // _SFXSTATUSLISTENER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 0b441b2f0f..06c81df1f2 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.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,9 +57,7 @@
//________________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
//________________________________________________________________________________________________________________________
// defines for namespaces !
@@ -609,3 +608,5 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
}
#endif // _SFX_SFXUNO_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 9d2ef73d5f..ab8afd59af 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.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.
@@ -254,7 +255,7 @@ public:
virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
#ifndef _SFXSH_HXX
- SAL_DLLPRIVATE FASTBOOL CanExecuteSlot_Impl( const SfxSlot &rSlot );
+ SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
#endif
@@ -300,12 +301,12 @@ inline void SfxShell::SetPool
//=====================================================================
-#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[] =
+#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[] =
-#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \
- static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
+ static SfxSlot a##ShellClass##Slots_Impl[] =
-#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] =
#define SFX_DECL_INTERFACE(nId) \
static SfxInterface* pInterface; \
@@ -322,7 +323,7 @@ inline void SfxShell::SetPool
\
SfxInterface* Class::pInterface = 0; \
const SfxFormalArgument* Class::pSfxFormalArgs_Impl = a##Class##Args_Impl;\
- SfxInterface* __EXPORT Class::GetStaticInterface() \
+ SfxInterface* Class::GetStaticInterface() \
{ \
if ( !pInterface ) \
{ \
@@ -391,3 +392,4 @@ inline void SfxShell::SetPool
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx
index 0bdfeef560..cf1d958fcb 100644
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/sfx2/inc/sfx2/signaturestate.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,3 +43,5 @@
#define SIGNATURESTATE_SIGNATURES_PARTIAL_OK (sal_Int16)5
#endif // SFX2_SIGNATURESTATE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx
index 94261e54ca..a2feb6127e 100644
--- a/sfx2/inc/sfx2/stbitem.hxx
+++ b/sfx2/inc/sfx2/stbitem.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.
@@ -138,7 +139,7 @@ public:
static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \
- SfxStatusBarControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
+ SfxStatusBarControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
{ return new Class( nSlotId, nId, rStb ); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \
@@ -146,3 +147,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index f8dff35c4d..e15e63ac6a 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -1,10 +1,11 @@
+/* -*- 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.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -30,28 +31,18 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _BITMAP_HXX //autogen
#include <vcl/bitmap.hxx>
-#endif
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
#include <tools/list.hxx>
-#ifndef _RC_HXX //autogen
#include <tools/rc.hxx>
-#endif
#include <rsc/rscsfx.hxx>
+#include <vector>
-#ifndef _SFX_STYFITEM_HXX_NOLIST
struct SfxFilterTupel {
String aName;
USHORT nFlags;
};
-
-DECLARE_LIST(SfxStyleFilter, SfxFilterTupel*)
-#else
-typedef List SfxStyleFilter;
-#endif
+typedef ::std::vector< SfxFilterTupel* > SfxStyleFilter;
// CLASS -----------------------------------------------------------------
@@ -80,11 +71,7 @@ public:
void SetImage( const Image& _rImg ) { aImage = _rImg; }
};
-//#if 0 // _SOLAR__PRIVATE
-DECLARE_LIST(SfxStyleFamilyList, SfxStyleFamilyItem*)
-//#else
-//typedef List SfxStyleFamilyList;
-//#endif
+typedef ::std::vector< SfxStyleFamilyItem* > SfxStyleFamilyList;
class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
{
@@ -98,11 +85,11 @@ public:
SfxStyleFamilies( ) {};
~SfxStyleFamilies();
- USHORT Count() const
- { return (USHORT)aEntryList.Count(); }
+ size_t size() const
+ { return aEntryList.size(); }
- const SfxStyleFamilyItem* GetObject(ULONG nIdx) const
- { return (SfxStyleFamilyItem*)aEntryList.GetObject(nIdx); }
+ const SfxStyleFamilyItem* at(size_t nIdx) const
+ { return (SfxStyleFamilyItem*)(aEntryList.empty() ? NULL : aEntryList[nIdx]); }
/** updates the images of all single SfxStyleFamilyItems with new images from the given resource
@@ -114,8 +101,9 @@ public:
@return
<TRUE/> if an image list for the requested mode could be found in the given resource.
*/
- sal_Bool updateImages( const ResId& _rId, const BmpColorMode _eMode );
+ sal_Bool updateImages( const ResId& _rId );
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index d4f49c8184..05d05baa3c 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.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,9 +39,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog
{
private:
SfxStyleSheetBase* pStyle;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-//#endif
protected:
virtual const SfxItemSet* GetRefreshedSet();
@@ -59,3 +58,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 6f84e0cc15..8afb111c7f 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.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,7 +111,6 @@ friend class SfxTabDialogController;
BOOL bItemsReset;
BOOL bFmt;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( OkHdl, Button * );
@@ -119,7 +119,6 @@ friend class SfxTabDialogController;
DECL_DLLPRIVATE_LINK( UserHdl, Button * );
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
-//#endif
protected:
virtual short Ok();
@@ -226,10 +225,8 @@ public:
void SetApplyHandler(const Link& _rHdl);
Link GetApplyHandler() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Start_Impl();
SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); }
-//#endif
};
END_NAMESPACE_LAYOUT_SFX_TABDIALOG
@@ -305,7 +302,7 @@ public:
String GetUserData() { return aUserString; }
virtual void FillUserData();
virtual BOOL IsReadOnly() const;
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -316,3 +313,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 8bd07c4f9d..b2e9161d36 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.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,9 @@
#include "sfx2/dllapi.h"
#include "sal/types.h"
#include <vcl/timer.hxx>
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
#include <sfx2/ctrlitem.hxx>
#include <sfx2/sfxstatuslistener.hxx>
#include <svtools/toolboxcontroller.hxx>
@@ -61,7 +56,6 @@ class SfxUnoControllerItem;
svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
-//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & );
typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
struct SfxTbxCtrlFactory
@@ -133,10 +127,7 @@ private:
SAL_DLLPRIVATE SfxPopupWindow(SfxPopupWindow &); // not defined
SAL_DLLPRIVATE void operator =(SfxPopupWindow &); // not defined
-
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( Delete, void * );
-//#endif
protected:
virtual void PopupModeEnd();
@@ -307,14 +298,14 @@ public:
};
#define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx ); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
#define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx, Arg); } \
void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
@@ -322,7 +313,6 @@ public:
//=========================================================================
-//#if 0 // _SOLAR__PRIVATE
class SfxDragButton_Impl : public FixedImage
{
@@ -335,10 +325,6 @@ public:
};
class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
-/* [Beschreibung]
-
-*/
-
{
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -380,13 +366,12 @@ protected:
virtual void Select( BOOL );
virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual SfxPopupWindow* CreatePopupWindow();
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
private:
String aLastURL;
BOOL bBigImages;
PopupMenu* pMenu;
ULONG m_nSymbolsStyle;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
};
@@ -430,7 +415,6 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
{
BOOL bBigImages;
PopupMenu* pMenu;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
protected:
@@ -438,7 +422,7 @@ protected:
using SfxToolBoxControl::Select;
virtual void Select( BOOL );
virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
public:
SFX_DECL_TOOLBOX_CONTROL();
SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
@@ -447,6 +431,6 @@ public:
void RefreshMenuImages( Menu* pMenu );
};
-//#endif
-
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index 6cd9846744..c2df1318d6 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/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.
@@ -100,3 +101,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index 52c24dd827..dac15f7999 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.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.
@@ -164,7 +165,6 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-//#if 0 // _SOLAR__PRIVATE
class SfxDispatchController_Impl : public SfxControllerItem
{
::com::sun::star::util::URL aDispatchURL;
@@ -205,7 +205,7 @@ public:
SfxDispatcher* GetDispatcher();
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
};
-//#endif
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx
index 318c8c8ee3..3cc9527519 100644
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/sfx2/inc/sfx2/userinputinterception.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,5 @@ namespace sfx2
//........................................................................
#endif // USERINPUTINTERCEPTION_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index cf6bbf0b16..abbdd83296 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.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.
@@ -343,8 +344,10 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index a471a205aa..7e1481952c 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.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.
@@ -125,7 +126,7 @@ public: \
#define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \
SfxViewFactory* Class::pFactory; \
- SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
+ SfxViewShell* Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
{ return new Class(pFrame, pOldView); } \
void Class::RegisterFactory( USHORT nPrio ) \
{ \
@@ -141,7 +142,7 @@ public: \
Factory().RegisterViewFactory( ViewShellClass::Factory() )
class SfxInPlaceClient;
-DECLARE_LIST( SfxInPlaceClientList, SfxInPlaceClient* )
+typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
// -----------------------------------------------------------------------
class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener
@@ -223,8 +224,8 @@ public:
// Focus, KeyInput, Cursor
void GotFocus() const;
inline void LostFocus() const;
- virtual void ShowCursor( FASTBOOL bOn = TRUE );
- virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent );
+ virtual void ShowCursor( bool bOn = true );
+ virtual bool KeyInput( const KeyEvent &rKeyEvent );
BOOL Escape();
// Viewing Interface
@@ -264,11 +265,11 @@ public:
/** forwards the current document, as returned by ->GetCurrentDocument, to SfxObjectShell::SetWorkingDocument
*/
void SetCurrentDocument() const;
-
+
/** get an XRenderable instance that can render this docuement
*/
virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
-
+
virtual void MarginChanged();
const Size& GetMargin() const;
@@ -298,9 +299,8 @@ public:
SAL_DLLPRIVATE FASTBOOL GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
- { GetIPClientList_Impl(TRUE)->Insert(pIPClient); }
- SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient )
- { GetIPClientList_Impl(TRUE)->Remove(pIPClient); }
+ { GetIPClientList_Impl(TRUE)->push_back(pIPClient); }
+ SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient );
SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const;
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
SAL_DLLPRIVATE void DiscardClients_Impl();
diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx
index 89971b072f..a3c46e39dd 100644
--- a/sfx2/inc/sfxbasic.hxx
+++ b/sfx2/inc/sfxbasic.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.
@@ -40,3 +41,4 @@ ErrCode SfxCallMacro( BasicManager* pMgr, const String& rMacro,
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 61c8894d08..9bae90cf55 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.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,10 +46,11 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
String getLanguage() { return aLanguage; };
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 384f075f01..8398cacaba 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.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,16 +28,10 @@
#ifndef _SFX_SRCHDLG_HXX_
#define _SFX_SRCHDLG_HXX_
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/combobox.hxx>
-#ifndef _VCL_EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
// ============================================================================
@@ -103,3 +98,4 @@ public:
#endif // _SFX_SRCHDLG_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
deleted file mode 100644
index 4db87b5fe7..0000000000
--- a/sfx2/qa/cppunit/makefile.mk
+++ /dev/null
@@ -1,86 +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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-# --- Libs ---------------------------------------------------------
-
-SHL1OBJS= \
- $(SLO)/test_metadatable.obj \
-
-
-SHL1STDLIBS= \
- $(CPPUNITLIB) \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(VCLLIB) \
- $(SFXLIB) \
-
-
-SHL1TARGET= test_metadatable
-SHL1RPATH = NONE
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
-
-# --- All object files ---------------------------------------------
-
-SLOFILES= \
- $(SHL1OBJS) \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sfx2/qa/cppunit/version.map b/sfx2/qa/cppunit/version.map
deleted file mode 100644
index 0dbbcc5a73..0000000000
--- a/sfx2/qa/cppunit/version.map
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index a230036695..026f8bb9a2 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -167,7 +167,11 @@ interface Application
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
- SID_HELP_SUPPORTPAGE
+ SID_SHOW_LICENSE
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_SHOW_CREDITS
[
ExecMethod = MiscExec_Impl ;
]
@@ -177,6 +181,7 @@ interface Application
SID_AVAILABLE_TOOLBARS
[
ExecMethod = MiscExec_Impl ;
+ StateMethod = MiscState_Impl ;
]
SID_HELP_TUTORIALS
[
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 35ba7ba0c7..3c469f84b6 100644..100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3830,7 +3830,7 @@ SfxUInt16Item MetricUnit SID_ATTR_METRIC
]
//--------------------------------------------------------------------------
-SfxBoolItem Modified SID_MODIFIED
+SfxBoolItem ApplyCharUnit SID_ATTR_APPLYCHARUNIT
[
/* flags: */
@@ -3857,7 +3857,7 @@ SfxBoolItem Modified SID_MODIFIED
]
//--------------------------------------------------------------------------
-SfxStringItem ModifiedStatus SID_DOC_MODIFIED
+SfxBoolItem Modified SID_MODIFIED
[
/* flags: */
@@ -3873,12 +3873,12 @@ SfxStringItem ModifiedStatus SID_DOC_MODIFIED
RecordPerSet;
Synchron;
- Readonly = TRUE,
+ Readonly = FALSE,
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
- StatusBarConfig = TRUE,
+ StatusBarConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -7339,7 +7339,32 @@ SfxVoidItem UpdateConfiguration SID_UPDATE_CONFIG
]
//--------------------------------------------------------------------------
-SfxVoidItem HelpSupport SID_HELP_SUPPORTPAGE
+SfxVoidItem ShowLicense SID_SHOW_LICENSE
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_APPLICATION;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem ShowCredits SID_SHOW_CREDITS
()
[
/* flags: */
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 76e580bd6d..f919bf2abc 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.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.
@@ -37,7 +38,6 @@
#include <sfx2/app.hxx>
#include <sfx2/frame.hxx>
-#include <vos/process.hxx>
#include <tools/simplerm.hxx>
#include <tools/config.hxx>
#include <basic/basrdll.hxx>
@@ -653,7 +653,7 @@ void SfxApplication::LeaveAsynchronCall_Impl()
//--------------------------------------------------------------------
-FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const
+bool SfxApplication::IsInAsynchronCall_Impl() const
{
return pAppData_Impl->nAsynchronCalls > 0;
}
@@ -739,7 +739,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData );
// call basicide_handle_basic_error in basctl
- long nRet = pSymbol( pStarBasic );
+ long nRet = pSymbol ? pSymbol( pStarBasic ) : 0;
return nRet;
}
@@ -755,8 +755,8 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
::com::sun::star::uno::Reference
< ::com::sun::star::uri::XUriReferenceFactory >
xFactory( xSMgr->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uri.UriReferenceFactory" )) ),
::com::sun::star::uno::UNO_QUERY );
if ( xFactory.is() )
@@ -831,3 +831,4 @@ void SfxApplication::MacroOrganizer( INT16 nTabId )
pSymbol( nTabId );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 1f9c125fb4..6697d5bb32 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -39,9 +39,6 @@
#define MSG_ERR_VERSION_CFG (RID_SFX_APP_START+6)
#define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
-// Note: no longer in use
-// #define MSG_ERR_EXTERNAL_APP_NOT_FOUND (RID_SFX_APP_START+8)
-
#define MSG_ISPRINTING_QUERYABORT (RID_SFX_APP_START+9)
#define MSG_CANT_QUIT (RID_SFX_APP_START+10)
#define STR_ISMODIFIED (RID_SFX_APP_START+11)
@@ -105,7 +102,7 @@
#define RID_STR_NOWELCOMESCREEN (RID_SFX_APP_START+91)
-// --> PB 2004-08-20 #i33095#
+// Option for 'recommend opening document read only' is not evaluated (#i33095#)
/* obsolete
#define STR_EDITOBJECT (RID_SFX_APP_START+92)
#define STR_OPENOBJECT (RID_SFX_APP_START+93)
@@ -161,13 +158,9 @@
#define IMG_HELP_TOOLBOX_COPY (RID_SFX_APP_START+118)
#define IMG_HELP_CONTENT_BOOK_OPEN (RID_SFX_APP_START+120)
-#define IMG_HELP_CONTENT_BOOK_OPEN_HC (RID_SFX_APP_START+121)
#define IMG_HELP_CONTENT_BOOK_CLOSED (RID_SFX_APP_START+122)
-#define IMG_HELP_CONTENT_BOOK_CLOSED_HC (RID_SFX_APP_START+123)
#define IMG_HELP_CONTENT_DOC (RID_SFX_APP_START+124)
-#define IMG_HELP_CONTENT_DOC_HC (RID_SFX_APP_START+125) // image
-
#define IMG_MISSING_1 (RID_SFX_APP_START+126) // image
#define IMG_MISSING_2 (RID_SFX_APP_START+127) // image
#define IMG_MISSING_3 (RID_SFX_APP_START+128) // image
@@ -203,16 +196,6 @@
#define RID_HELP_ONSTARTUP_BOX (RID_SFX_APP_START+144)
#define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145)
-#define IMG_HELP_TOOLBOX_HC_INDEX_ON (RID_SFX_APP_START+150)
-#define IMG_HELP_TOOLBOX_HC_INDEX_OFF (RID_SFX_APP_START+151)
-#define IMG_HELP_TOOLBOX_HC_START (RID_SFX_APP_START+152)
-#define IMG_HELP_TOOLBOX_HC_PREV (RID_SFX_APP_START+153)
-#define IMG_HELP_TOOLBOX_HC_NEXT (RID_SFX_APP_START+154)
-#define IMG_HELP_TOOLBOX_HC_PRINT (RID_SFX_APP_START+155)
-#define IMG_HELP_TOOLBOX_HC_BOOKMARKS (RID_SFX_APP_START+156)
-#define IMG_HELP_TOOLBOX_HC_SEARCHDIALOG (RID_SFX_APP_START+157)
-#define IMG_HELP_TOOLBOX_HC_COPY (RID_SFX_APP_START+158)
-
#define IMG_HELP_TOOLBOX_L_INDEX_ON (RID_SFX_APP_START+160)
#define IMG_HELP_TOOLBOX_L_INDEX_OFF (RID_SFX_APP_START+161)
#define IMG_HELP_TOOLBOX_L_START (RID_SFX_APP_START+162)
@@ -223,16 +206,6 @@
#define IMG_HELP_TOOLBOX_L_SEARCHDIALOG (RID_SFX_APP_START+167)
#define IMG_HELP_TOOLBOX_L_COPY (RID_SFX_APP_START+168)
-#define IMG_HELP_TOOLBOX_HCL_INDEX_ON (RID_SFX_APP_START+170)
-#define IMG_HELP_TOOLBOX_HCL_INDEX_OFF (RID_SFX_APP_START+171)
-#define IMG_HELP_TOOLBOX_HCL_START (RID_SFX_APP_START+172)
-#define IMG_HELP_TOOLBOX_HCL_PREV (RID_SFX_APP_START+173)
-#define IMG_HELP_TOOLBOX_HCL_NEXT (RID_SFX_APP_START+174)
-#define IMG_HELP_TOOLBOX_HCL_PRINT (RID_SFX_APP_START+175)
-#define IMG_HELP_TOOLBOX_HCL_BOOKMARKS (RID_SFX_APP_START+176)
-#define IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG (RID_SFX_APP_START+177)
-#define IMG_HELP_TOOLBOX_HCL_COPY (RID_SFX_APP_START+178)
-
#define RID_SECURITY_WARNING_HYPERLINK (RID_SFX_APP_START + 180)
#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index ae524c25ba..084818a707 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -838,7 +838,7 @@ String STR_QUICKSTART_RECENTDOC
String STR_QUERY_UPDATE_LINKS
{
- Text [ en-US ] = "Update all links?" ;
+ Text [ en-US ] = "This document contains one or more links to external data.\n\nWould you like to change the document, and update all links\nto get the most recent data?" ;
};
String STR_DDE_ERROR
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 52e9d6248a..f292eae14e 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.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.
@@ -100,79 +101,8 @@ using namespace ::com::sun::star::script;
using ::basic::BasicManagerRepository;
-// #ifndef STR_VERSION_ID
-// #define STR_VERSION_ID 1
-// #endif
-// #ifndef STR_VERSION_TYPE
-// #define STR_VERSION_TYPE 1
-// #endif
-
-//=========================================================================
-/*ASDBG
-const SfxConstant __FAR_DATA aConstants[] =
-{
- SFX_USHORT_CONSTANT( "AlignBottom", ALIGN_BOTTOM ),
- SFX_USHORT_CONSTANT( "AlignTop", ALIGN_TOP ),
- SFX_USHORT_CONSTANT( "CharSetANSI", CHARSET_ANSI ),
- SFX_USHORT_CONSTANT( "CharSetDontKnow", CHARSET_DONTKNOW ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC437", CHARSET_IBMPC_437 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC850", CHARSET_IBMPC_850 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC860", CHARSET_IBMPC_860 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC861", CHARSET_IBMPC_861 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC863", CHARSET_IBMPC_863 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC865", CHARSET_IBMPC_865 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC", CHARSET_IBMPC ),
- SFX_USHORT_CONSTANT( "CharSetMac", CHARSET_MAC ),
- SFX_USHORT_CONSTANT( "CharSetSymbol", CHARSET_SYMBOL ),
- SFX_USHORT_CONSTANT( "CharSetSystem", RTL_TEXTENCODING_UTF8 ),
- SFX_USHORT_CONSTANT( "FamilyDecorative", FAMILY_DECORATIVE ),
- SFX_USHORT_CONSTANT( "FamilyDontknow", FAMILY_DONTKNOW ),
- SFX_USHORT_CONSTANT( "FamilyModern", FAMILY_MODERN ),
- SFX_USHORT_CONSTANT( "FamilyRoman", FAMILY_ROMAN ),
- SFX_USHORT_CONSTANT( "FamilyScript", FAMILY_SCRIPT ),
- SFX_USHORT_CONSTANT( "FamilySwiss", FAMILY_SWISS ),
- SFX_USHORT_CONSTANT( "FamilySystem", FAMILY_SYSTEM ),
- SFX_USHORT_CONSTANT( "GradientAxial", GRADIENT_AXIAL ),
- SFX_USHORT_CONSTANT( "GradientElliptical", GRADIENT_ELLIPTICAL ),
- SFX_USHORT_CONSTANT( "GradientLinear", GRADIENT_LINEAR ),
- SFX_USHORT_CONSTANT( "GradientRadial", GRADIENT_RADIAL ),
- SFX_USHORT_CONSTANT( "GradientRect", GRADIENT_RECT ),
- SFX_USHORT_CONSTANT( "GradientSquare", GRADIENT_SQUARE ),
- SFX_USHORT_CONSTANT( "ItalicNone", ITALIC_NONE ),
- SFX_USHORT_CONSTANT( "ItalicOblique", ITALIC_OBLIQUE ),
- SFX_USHORT_CONSTANT( "StrikeThroughDouble", STRIKEOUT_DOUBLE ),
- SFX_USHORT_CONSTANT( "StrikeThroughNone", STRIKEOUT_NONE ),
- SFX_USHORT_CONSTANT( "StrikeThroughSingle", STRIKEOUT_SINGLE ),
- SFX_USHORT_CONSTANT( "UnderlineDotted", UNDERLINE_DOTTED ),
- SFX_USHORT_CONSTANT( "UnderlineDouble", UNDERLINE_DOUBLE ),
- SFX_USHORT_CONSTANT( "UnderlineNone", UNDERLINE_NONE ),
- SFX_USHORT_CONSTANT( "UnderlineSingle", UNDERLINE_SINGLE ),
- SFX_USHORT_CONSTANT( "UnitFoot", FUNIT_FOOT ),
- SFX_USHORT_CONSTANT( "UnitInch", FUNIT_INCH ),
- SFX_USHORT_CONSTANT( "UnitMile", FUNIT_MILE ),
- SFX_USHORT_CONSTANT( "UnitPercent", FUNIT_PERCENT ),
- SFX_USHORT_CONSTANT( "UnitPoint", FUNIT_POINT ),
- SFX_USHORT_CONSTANT( "UnitTwip", FUNIT_TWIP ),
- SFX_USHORT_CONSTANT( "Unit_cm", FUNIT_CM ),
- SFX_USHORT_CONSTANT( "Unit_m", FUNIT_M ),
- SFX_USHORT_CONSTANT( "Unit_mm", FUNIT_MM ),
- SFX_USHORT_CONSTANT( "WeightBlack", WEIGHT_BLACK ),
- SFX_USHORT_CONSTANT( "WeightBold", WEIGHT_BOLD ),
- SFX_USHORT_CONSTANT( "WeightDontKnow", WEIGHT_DONTKNOW ),
- SFX_USHORT_CONSTANT( "WeightLight", WEIGHT_LIGHT ),
- SFX_USHORT_CONSTANT( "WeightMedium", WEIGHT_MEDIUM ),
- SFX_USHORT_CONSTANT( "WeightNormal", WEIGHT_NORMAL ),
- SFX_USHORT_CONSTANT( "WeightSemibold", WEIGHT_SEMIBOLD ),
- SFX_USHORT_CONSTANT( "WeightSemilight", WEIGHT_SEMILIGHT ),
- SFX_USHORT_CONSTANT( "WeightThin", WEIGHT_THIN ),
- SFX_USHORT_CONSTANT( "WeightUltrabold", WEIGHT_ULTRABOLD ),
- SFX_USHORT_CONSTANT( "WeightUltralight", WEIGHT_ULTRALIGHT )
-};
-*/
-//========================================================================
-
//------------------------------------------------------------------------
-String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/)
+String lcl_GetVersionString()
{
::rtl::OUString aDefault;
String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
@@ -203,46 +133,6 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
//--------------------------------------------------------------------
-void SfxApplication::RegisterBasicConstants
-(
- const char*, // Prefix vor Konstanten-Namen
- const SfxConstant*, // Array von <SfxConstant> Instanzen
- sal_uInt16 // Anahl der Kontanten in pConsts
-)
-
-/* [Beschreibung]
-
- Diese Methode meldet Konstanten beim BASIC an. Sie sollte on-demand
- (in GetSbxObject() der Applikation) gerufen werden. Das Array mu\s
- alphabetisch nach den Namen sortiert sein!
-
- Durch den Prefix kann Speicher gespart und das Suchen beschleunigt
- werden. Im StarOffice soll der Prefix "so" verwendet werden.
-
-
- [Beispiel]
-
- const SfxConstant __FAR_DATA aConstants[] =
- {
- SFX_BOOL_CONSTANT( "False", sal_False ),
- SFX_BOOL_CONSTANT( "True", sal_True ),
- };
-
- ...
- SFX_APP()->RegisterBasicConstants( 0, aConstants, 2 );
- ...
-
-*/
-
-{
-// DBG_ASSERT( pAppData_Impl->pBasicMgr, "no basic available" );
-
-// pAppData_Impl->pBasicMgr->GetLib(0)->Insert(
-// new SfxConstants_Impl( pPrefix, pConsts, nCount ) );
-}
-
-//--------------------------------------------------------------------
-
SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType )
{
@@ -293,7 +183,7 @@ StarBASIC* SfxApplication::GetBasic()
//--------------------------------------------------------------------
-FASTBOOL SfxApplication::IsInBasicCall() const
+bool SfxApplication::IsInBasicCall() const
{
return 0 != pAppData_Impl->nBasicCallLevel;
}
@@ -371,14 +261,6 @@ void SfxApplication::EnterBasicCall()
DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
}
- if ( !pFrame->GetObjectShell() )
- {
- DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for empty frame" ); )
- pSbx = pFrame->GetSbxObject();
- DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" );
- }
- }
-*/
// Factories anmelden
// SbxBase::AddFactory( new SfxSbxObjectFactory_Impl );
}
@@ -502,7 +384,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
case SID_BUILD_VERSION:
{
- String aVersion = lcl_GetVersionString(pAppData_Impl->pLabelResMgr);
+ String aVersion = lcl_GetVersionString();
rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) );
break;
}
@@ -588,3 +470,4 @@ void SfxApplication::PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBasic )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index fe84d4f1fd..29519876ba 100755
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.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.
@@ -177,7 +178,7 @@ Sequence< OUString > SfxApplicationDialogLibraryContainer::impl_getStaticSupport
if( bNeedsInit )
{
OUString* pSeq = seqServiceNames.getArray();
- pSeq[0] = OUString::createFromAscii( "com.sun.star.script.ApplicationDialogLibraryContainer" );
+ pSeq[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationDialogLibraryContainer"));
bNeedsInit = sal_False;
}
return seqServiceNames;
@@ -191,7 +192,7 @@ OUString SfxApplicationDialogLibraryContainer::impl_getStaticImplementationName(
MutexGuard aGuard( Mutex::getGlobalMutex() );
if( bNeedsInit )
{
- aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer" );
+ aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer"));
bNeedsInit = sal_False;
}
return aImplName;
@@ -220,7 +221,7 @@ Sequence< OUString > SfxApplicationScriptLibraryContainer::impl_getStaticSupport
if( bNeedsInit )
{
OUString* pSeq = seqServiceNames.getArray();
- pSeq[0] = OUString::createFromAscii( "com.sun.star.script.ApplicationScriptLibraryContainer" );
+ pSeq[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationScriptLibraryContainer"));
bNeedsInit = sal_False;
}
return seqServiceNames;
@@ -234,7 +235,7 @@ OUString SfxApplicationScriptLibraryContainer::impl_getStaticImplementationName(
MutexGuard aGuard( Mutex::getGlobalMutex() );
if( bNeedsInit )
{
- aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer" );
+ aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer"));
bNeedsInit = sal_False;
}
return aImplName;
@@ -250,3 +251,4 @@ Reference< XInterface > SAL_CALL SfxApplicationScriptLibraryContainer::impl_crea
return xRet;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index a109f6532b..e64325a3cc 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.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,15 +31,11 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/XFlushable.hpp>
-#ifndef _STDLIB_H
#include <stdlib.h>
-#endif
#include <tools/config.hxx>
#include <vcl/sound.hxx>
#include <vcl/msgbox.hxx>
@@ -527,7 +524,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
const SfxPoolItem *pItem = 0;
SfxItemPool &rPool = GetPool();
BOOL bResetSession = FALSE;
- BOOL bProxiesModified = FALSE;
SvtSaveOptions aSaveOptions;
SvtUndoOptions aUndoOptions;
@@ -752,7 +748,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), TRUE, &pItem ) )
@@ -760,35 +755,30 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), TRUE, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), TRUE, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), TRUE, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, TRUE, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
bResetSession = TRUE;
- bProxiesModified = TRUE;
}
// Secure-Referers
@@ -1003,7 +993,7 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron )
+void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
{
//DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index dc3e6c4bf3..90054862a9 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.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.
@@ -174,3 +175,4 @@ SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) co
return NULL;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index e48ffcc037..dec51cd31e 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.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.
@@ -185,3 +186,5 @@ void SfxAppData_Impl::OnApplicationBasicManagerCreated( BasicManager& _rBasicMan
Reference< XInterface > xCurrentComponent = SfxObjectShell::GetCurrentComponent();
_rBasicManager.SetGlobalUNOConstant( "ThisComponent", makeAny( xCurrentComponent ) );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 789de8b425..29abc7b991 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.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.
@@ -365,6 +366,23 @@ long SfxObjectShell::DdeSetData
return 0;
}
+void SfxObjectShell::ReconnectDdeLink(SfxObjectShell& /*rServer*/)
+{
+}
+
+void SfxObjectShell::ReconnectDdeLinks(SfxObjectShell& rServer)
+{
+ TypeId aType = TYPE(SfxObjectShell);
+ SfxObjectShell* p = GetFirst(&aType, false);
+ while (p)
+ {
+ if (&rServer != p)
+ p->ReconnectDdeLink(rServer);
+
+ p = GetNext(*p, &aType, false);
+ }
+}
+
//========================================================================
long SfxViewFrame::DdeExecute
@@ -708,3 +726,4 @@ BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
return bRet;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index d7856fc15e..372c28504f 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.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,23 +40,18 @@
#include <unotools/saveopt.hxx>
#include <unotools/localisationoptions.hxx>
#include <tools/config.hxx>
-#ifndef _SV_RESARY_HXX
#include <tools/resary.hxx>
-#endif
#include <tools/urlobj.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <svtools/ehdl.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <unotools/configmgr.hxx>
#include <rtl/ustrbuf.hxx>
-#include <vos/security.hxx>
+#include <osl/security.hxx>
#include <ucbhelper/configurationkeys.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/historyoptions.hxx>
@@ -119,22 +115,23 @@ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw(
void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !SFX_APP()->QueryExit_Impl() )
throw TerminationVetoException();
}
void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException )
{
- static ::rtl::OUString SERVICE_GLOBALEVENTBROADCASTER = ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster");
- static ::rtl::OUString EVENT_QUIT_APP = ::rtl::OUString::createFromAscii("OnCloseApp");
+ static ::rtl::OUString SERVICE_GLOBALEVENTBROADCASTER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"));
+ static ::rtl::OUString EVENT_QUIT_APP (RTL_CONSTASCII_USTRINGPARAM("OnCloseApp"));
Reference< XDesktop > xDesktop( aEvent.Source, UNO_QUERY );
if( xDesktop.is() == sal_True )
xDesktop->removeTerminateListener( this );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
- utl::ConfigManager::GetConfigManager()->StoreConfigItems();
+ SolarMutexGuard aGuard;
+ utl::ConfigManager::GetConfigManager().StoreConfigItems();
+
SfxApplication* pApp = SFX_APP();
pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );
pApp->Get_Impl()->pAppDispatch->ReleaseAll();
@@ -156,7 +153,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
::rtl::OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException)
{
- static const ::rtl::OUString IMPLNAME = ::rtl::OUString::createFromAscii("com.sun.star.comp.sfx2.SfxTerminateListener");
+ static const ::rtl::OUString IMPLNAME(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.SfxTerminateListener"));
return IMPLNAME;
}
@@ -183,7 +180,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServ
// The desktop must know, which listener will terminate the SfxApplication in real !
// It must call this special listener as last one ... otherwise we shutdown the SfxApplication BEFORE other listener
// can react ...
- static const ::rtl::OUString SERVICENAME = ::rtl::OUString::createFromAscii("com.sun.star.frame.TerminateListener");
+ static const ::rtl::OUString SERVICENAME(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.TerminateListener"));
Sequence< ::rtl::OUString > lNames(1);
lNames[0] = SERVICENAME;
return lNames;
@@ -208,7 +205,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
static bool bDetermineFunction = false;
static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !bDetermineFunction )
{
bDetermineFunction = true;
@@ -231,7 +228,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
//====================================================================
-FASTBOOL SfxApplication::Initialize_Impl()
+bool SfxApplication::Initialize_Impl()
{
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
@@ -307,10 +304,12 @@ FASTBOOL SfxApplication::Initialize_Impl()
pAppData_Impl->pAppDispat->DoActivate_Impl( sal_True, NULL );
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Set special characters callback on vcl edit control
Edit::SetGetSpecialCharsFunction(&GetSpecialCharsForEdit);
}
return sal_True;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 5664fbc2e2..ba10194e91 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.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,6 @@
#include <svl/itempool.hxx>
#include <svl/urihelper.hxx>
#include <svtools/helpopt.hxx>
-#include <vos/process.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Exception.hpp>
@@ -85,7 +85,7 @@ DBG_NAME(SfxAppMainCHAOSReg)
//===================================================================
#ifdef TF_POOLABLE
-static SfxItemInfo __READONLY_DATA aItemInfos[] =
+static SfxItemInfo const aItemInfos[] =
{
{ 0, 0 }
};
@@ -163,7 +163,7 @@ bool SfxApplication::InitLabelResMgr( const char* _pLabelPrefix, bool _bExceptio
{
// maybe corrupted installation
throw (::com::sun::star::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("iso resource could not be loaded by SfxApplication"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("iso resource could not be loaded by SfxApplication")),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()));
}
}
@@ -190,3 +190,5 @@ SfxFilterMatcher& SfxApplication::GetFilterMatcher()
}
return *pAppData_Impl->pMatcher;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 07d84df290..4b75e30595 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.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.
@@ -41,18 +42,14 @@
#include <unotools/internaloptions.hxx>
#include <unotools/pathoptions.hxx>
#include <com/sun/star/registry/InvalidRegistryException.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/uno/Reference.h>
#include <tools/config.hxx>
#include <tools/rcid.h>
-#include <vos/mutex.hxx>
-#ifndef GCC
-#endif
+#include <osl/mutex.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
@@ -92,7 +89,6 @@
#include <sfx2/objface.hxx>
#include "helper.hxx" // SfxContentHelper::Kill()
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
@@ -170,7 +166,7 @@ void SfxApplication::InitializeDisplayName_Impl()
String aTitle = Application::GetDisplayName();
if ( !aTitle.Len() )
{
- OClearableGuard aGuard( OMutex::getGlobalMutex() );
+ osl::ClearableMutexGuard aGuard( osl::Mutex::getGlobalMutex() );
// create version string
/*!!! (pb) don't show a version number at the moment
@@ -333,3 +329,4 @@ SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl
//SfxOptions& SfxApplication::GetOptions() { return *pAppData_Impl->pOptions; }
//const SfxOptions& SfxApplication::GetOptions() const { return *pAppData_Impl->pOptions; }
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 272ae1e40f..0612f51df5 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.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.
@@ -80,7 +81,7 @@
#include <comphelper/docpasswordhelper.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/logfile.hxx>
@@ -327,7 +328,7 @@ sal_uInt32 CheckPasswd_Impl
{
sal_Bool bIsEncrypted = sal_False;
try {
- xStorageProps->getPropertyValue( ::rtl::OUString::createFromAscii("HasEncryptedEntries") )
+ xStorageProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasEncryptedEntries")) )
>>= bIsEncrypted;
} catch( uno::Exception& )
{
@@ -679,6 +680,29 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
//---------------------------------------------------------------------------
+namespace {
+
+/**
+ * Check if a given filter type should open the hyperlinked document
+ * natively.
+ *
+ * @param rFilter filter object
+ */
+bool lcl_isFilterNativelySupported(const SfxFilter& rFilter)
+{
+ if (rFilter.IsOwnFormat())
+ return true;
+
+ ::rtl::OUString aName = rFilter.GetFilterName();
+ if (aName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel"))) == 0)
+ // We can handle all Excel variants natively.
+ return true;
+
+ return false;
+}
+
+}
+
void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
@@ -924,7 +948,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" )),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))),
UNO_QUERY );
if ( xTypeDetection.is() )
{
@@ -933,7 +957,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
aURL.Complete = aFileName;
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aURL );
INetProtocol aINetProtocol = INetURLObject( aURL.Complete ).GetProtocol();
@@ -951,7 +975,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete ) )
{
// Security check for local files depending on the extension
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
@@ -975,7 +999,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
@@ -988,11 +1012,11 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
aTypeName = xTypeDetection->queryTypeByURL( aURL.Main );
SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher();
const SfxFilter* pFilter = rMatcher.GetFilter4EA( aTypeName );
- if ( !pFilter || !( pFilter->IsOwnFormat() ))
+ if (!pFilter || !lcl_isFilterNativelySupported(*pFilter))
{
// hyperlink does not link to own type => special handling (http, ftp) browser and (other external protocols) OS
Reference< XSystemShellExecute > xSystemShellExecute( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY );
if ( xSystemShellExecute.is() )
{
if ( aINetProtocol == INET_PROT_MAILTO )
@@ -1013,13 +1037,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
catch ( ::com::sun::star::system::SystemShellExecuteException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
@@ -1032,14 +1056,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
Sequence < ::rtl::OUString > aProtocols(2);
// add special protocols that always should be treated as internal
- aProtocols[0] = ::rtl::OUString::createFromAscii("private:*");
- aProtocols[1] = ::rtl::OUString::createFromAscii("vnd.sun.star.*");
+ aProtocols[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:*"));
+ aProtocols[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.*"));
try
{
// get registered protocol handlers from configuration
Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(),
- ::rtl::OUString::createFromAscii("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.ProtocolHandler/HandlerSet")), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
if ( xAccess.is() )
{
Sequence < ::rtl::OUString > aNames = xAccess->getElementNames();
@@ -1051,7 +1075,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( xSet.is() )
{
// copy protocols
- aRet = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("Protocols") );
+ aRet = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Protocols")) );
Sequence < ::rtl::OUString > aTmp;
aRet >>= aTmp;
@@ -1096,7 +1120,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
@@ -1104,7 +1128,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
if ( !pFilter )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
@@ -1188,7 +1212,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if (!pInteractionItem)
{
- Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
+ Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
if (xHdl.is())
rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
}
@@ -1284,7 +1308,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
URL aURL;
aURL.Complete = aFileName;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aURL );
Reference < XDispatchProvider > xProv( xTargetFrame, UNO_QUERY );
@@ -1302,7 +1326,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
// Desktop service must exists! dont catch() or check for problems here ...
// But loading of documents can fail by other reasons. Handle it more gracefully.
- Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+ Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
Reference < XComponent > xComp;
try
{
@@ -1357,3 +1381,5 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
delete pLinkItem;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 8499376f1c..5285fad3f4 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.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.
@@ -172,3 +173,5 @@ void SfxApplication::Deinitialize()
*/
pAppData_Impl->pPool = NULL;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index ec0ee9e975..6febf22427 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.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,9 +31,6 @@
#include <vcl/toolbox.hxx>
-#ifndef GCC
-#endif
-
#include <sfx2/app.hxx>
#include "appdata.hxx"
#include "arrdecl.hxx"
@@ -151,3 +149,5 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
pAppData_Impl->pMenuCtrlFac->C40_INSERT( SfxMenuCtrlFactory, pFact, pAppData_Impl->pMenuCtrlFac->Count() );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 6089324bb2..7b16d80d30 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.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.
@@ -70,15 +71,16 @@
#include <vcl/help.hxx>
#include <vcl/stdtext.hxx>
#include <rtl/ustrbuf.hxx>
+#include <osl/file.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/regoptions.hxx>
#include <svtools/helpopt.hxx>
+#include <svtools/miscopt.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/shl.hxx>
#include <unotools/bootstrap.hxx>
-#include <vos/process.hxx>
#include <rtl/bootstrap.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
@@ -154,10 +156,27 @@ long QuitAgain_Impl( void* pObj, void* pArg )
return 0;
}
+namespace {
+ sal_Bool checkURL( const char *pName, rtl::OUString &rURL )
+ {
+ using namespace osl;
+ DirectoryItem aDirItem;
+
+ rURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/") );
+ rURL += rtl::OUString::createFromAscii( pName );
+ rtl::Bootstrap::expandMacros( rURL );
+
+ if (rURL.getLength() != 0)
+ return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
+ else
+ return sal_False;
+ }
+}
+
void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- FASTBOOL bDone = FALSE;
+ bool bDone = false;
switch ( rReq.GetSlot() )
{
case SID_SETOPTIONS:
@@ -269,7 +288,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
const short nRet = pDlg->Execute();
if ( nRet )
- bDone = TRUE;
+ bDone = true;
delete pDlg;
}
@@ -308,14 +327,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
BOOL bOk = ( n == 0);
rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
- bDone = TRUE;
+ bDone = true;
break;
}
case SID_SAVEDOCS:
{
BOOL bOK = TRUE;
- BOOL bTmpDone = TRUE;
for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
pObjSh;
pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
@@ -325,7 +343,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
pObjSh->ExecuteSlot( aReq );
SfxBoolItem *pItem = PTR_CAST( SfxBoolItem, aReq.GetReturnValue() );
- bTmpDone = aReq.IsDone();
if ( !pItem || !pItem->GetValue() )
bOK = FALSE;
}
@@ -336,9 +353,48 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
+ case SID_SHOW_CREDITS:
+ case SID_SHOW_LICENSE:
+ {
+ try {
+ Reference < XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
+ Sequence < com::sun::star::beans::PropertyValue > args(2);
+ args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ViewOnly"));
+ args[0].Value <<= sal_True;
+ args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ args[1].Value <<= sal_True;
+
+ rtl::OUString aURL;
+ char const** pNames;
+ if( rReq.GetSlot() == SID_SHOW_LICENSE )
+ {
+ static char const* pLicenseStrings[] =
+ {
+ "LICENSE.odt", "LICENSE.html", "LICENSE"
+ };
+ pNames = pLicenseStrings;
+ }
+ else
+ {
+ static char const* pCreditsStrings[] =
+ {
+ "CREDITS.odt", "CREDITS.html", "CREDITS"
+ };
+ pNames = pCreditsStrings;
+ }
+
+ if ( checkURL ( pNames[0], aURL ) ||
+ checkURL ( pNames[1], aURL ) ||
+ checkURL ( pNames[2], aURL ) ) {
+ xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
+ }
+ } catch (const ::com::sun::star::uno::Exception &) {
+ }
+ break;
+ }
+
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_HELPINDEX:
- case SID_HELP_SUPPORTPAGE:
{
Help* pHelp = Application::GetHelp();
if ( pHelp )
@@ -376,7 +432,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::DisableQuickHelp();
SvtHelpOptions().SetHelpTips( bOn );
Invalidate(SID_HELPTIPS);
- bDone = TRUE;
+ bDone = true;
// ggf. recorden
if ( !rReq.IsAPI() )
@@ -404,7 +460,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::DisableBalloonHelp();
SvtHelpOptions().SetExtendedHelp( bOn );
Invalidate(SID_HELPBALLOONS);
- bDone = TRUE;
+ bDone = true;
// ggf. recorden
if ( !rReq.IsAPI() )
@@ -422,7 +478,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
: !aHelpOpt.IsHelpAgentAutoStartMode();
aHelpOpt.SetHelpAgentAutoStartMode( bOn );
Invalidate(SID_HELP_PI);
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -464,7 +520,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sBuildId.Insert( sProductSource, 0 );
}
- // --> PB 2008-10-30 #i94693#
+ // Version information (in about box) (#i94693#)
/* if the build ids of the basis or ure layer are different from the build id
* of the brand layer then show them */
rtl::OUString aBasisProductBuildId( DEFINE_CONST_OUSTRING(
@@ -482,7 +538,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sTemp += String( aUREProductBuildId );
sBuildId.Insert( sTemp, sBuildId.Search( ')' ) );
}
- // <--
// the build id format is "milestone(build)[cwsname]". For readability, it would
// be nice to have some more spaces in there.
@@ -508,7 +563,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
AboutDialog* pDlg = new AboutDialog( 0, aDialogResId, sBuildId );
pDlg->Execute();
delete pDlg;
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -519,7 +574,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
new SfxTemplateOrganizeDlg(NULL);
pDlg->Execute();
delete pDlg;
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -527,7 +582,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory());
aDialog.Execute();
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -655,6 +710,18 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
break;
}
+ case SID_CONFIG:
+ case SID_TOOLBOXOPTIONS:
+ case SID_CONFIGSTATUSBAR:
+ case SID_CONFIGMENU:
+ case SID_CONFIGACCEL:
+ case SID_CONFIGEVENT:
+ {
+ if( SvtMiscOptions().DisableUICustomization() )
+ rSet.DisableItem(nWhich);
+ break;
+ }
+
case SID_BASICSTOP:
if ( !StarBASIC::IsRunning() )
rSet.DisableItem(nWhich);
@@ -731,7 +798,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
static const ::rtl::OUString& getProductRegistrationServiceName( )
{
- static ::rtl::OUString s_sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.setup.ProductRegistration" );
+ static ::rtl::OUString s_sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.setup.ProductRegistration"));
return s_sServiceName;
}
@@ -916,11 +983,17 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
{
VclAbstractDialog* pDlg =
pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
- pDlg->Execute();
+ short nRet = pDlg->Execute();
delete pDlg;
SfxViewFrame* pView = SfxViewFrame::GetFirst();
while ( pView )
{
+ if (nRet == RET_OK)
+ {
+ SfxObjectShell* pObjSh = pView->GetObjectShell();
+ if (pObjSh)
+ pObjSh->SetConfigOptionsChecked(false);
+ }
pView->GetBindings().InvalidateAll(FALSE);
pView = SfxViewFrame::GetNext( *pView );
}
@@ -987,7 +1060,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
// tell it that the user wants to register
if ( xProductRegistration.is() )
{
- xProductRegistration->trigger( ::rtl::OUString::createFromAscii( "RegistrationRequired" ) );
+ xProductRegistration->trigger( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegistrationRequired")) );
}
}
catch( const ::com::sun::star::uno::Exception& )
@@ -1227,13 +1300,13 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
Reference< com::sun::star::lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
Reference< com::sun::star::frame::XDispatchProvider > xProv(
- xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.drawing.ModuleDispatcher")), UNO_QUERY );
+ xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ModuleDispatcher"))), UNO_QUERY );
if ( xProv.is() )
{
::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() );
Reference< com::sun::star::frame::XDispatchHelper > xHelper(
- xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), UNO_QUERY );
+ xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), UNO_QUERY );
if ( xHelper.is() )
{
Sequence < com::sun::star::beans::PropertyValue > aSeq;
@@ -1257,13 +1330,13 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
{
Reference< com::sun::star::lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
Reference< com::sun::star::frame::XDispatchProvider > xProv(
- xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.text.ModuleDispatcher")), UNO_QUERY );
+ xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.ModuleDispatcher"))), UNO_QUERY );
if ( xProv.is() )
{
::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() );
Reference< com::sun::star::frame::XDispatchHelper > xHelper(
- xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), UNO_QUERY );
+ xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), UNO_QUERY );
if ( xHelper.is() )
{
Sequence < com::sun::star::beans::PropertyValue > aSeq;
@@ -1345,3 +1418,5 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
if ( !aModuleOpt.IsImpress() )
rSet.DisableItem( SID_SD_AUTOPILOT );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 078ed11a53..741f6a36f2 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.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.
@@ -875,7 +876,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#endif
}
}
- // --> PB 2007-12-09 #i83757#
+ // API to raise options dialog with a specified options ab page (#i83757#)
else
{
// transform parameter "OptionsPageURL" of slot "OptionsTreeDialog"
@@ -897,7 +898,6 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
}
}
}
- // <--
#ifdef DB_UTIL
if ( nFoundArgs == nCount )
{
@@ -1027,6 +1027,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
nAdditional++;
if ( rSet.GetItemState( SID_DOC_READONLY ) == SFX_ITEM_SET )
nAdditional++;
+ if ( rSet.GetItemState( SID_DDE_RECONNECT_ONLOAD ) == SFX_ITEM_SET )
+ nAdditional++;
if ( rSet.GetItemState( SID_DOC_STARTPRESENTATION ) == SFX_ITEM_SET )
nAdditional++;
if ( rSet.GetItemState( SID_SELECTION ) == SFX_ITEM_SET )
@@ -1688,7 +1690,7 @@ void SAL_CALL SfxMacroLoader::dispatchWithNotification( const ::com::sun::star::
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& xListener )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_uInt32 nPropertyCount = lArgs.getLength();
::rtl::OUString aReferer;
@@ -1733,7 +1735,7 @@ void SAL_CALL SfxMacroLoader::dispatch( const ::com::sun::star::util::URL&
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_uInt32 nPropertyCount = lArgs.getLength();
::rtl::OUString aReferer;
@@ -2011,7 +2013,7 @@ throw( RuntimeException )
Sequence< sal_Int16 > SAL_CALL SfxAppDispatchProvider::getSupportedCommandGroups()
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
std::list< sal_Int16 > aGroupList;
SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
@@ -2046,7 +2048,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
std::list< ::com::sun::star::frame::DispatchInformation > aCmdList;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
if ( pAppSlotPool )
@@ -2208,13 +2210,6 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
IF_NAME_CREATECOMPONENTFACTORY( TestMouseClickHandler )
#endif
IF_NAME_CREATECOMPONENTFACTORY( OPackageStructureCreator )
- #if 0
- if ( ::sfx2::AppletObject::impl_getStaticImplementationName().equals(
- ::rtl::OUString::createFromAscii( pImplementationName ) ) )
- {
- xFactory = ::sfx2::AppletObject::impl_createFactory();
- }
- #endif
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::PluginObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService )
@@ -2226,6 +2221,16 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
::comp_SfxDocumentMetaData::_getImplementationName(),
::comp_SfxDocumentMetaData::_getSupportedServiceNames());
}
+ if ( ::comp_CompatWriterDocProps::_getImplementationName().equals(
+ ::rtl::OUString::createFromAscii( pImplementationName ) ) )
+ {
+ xFactory = ::cppu::createSingleComponentFactory(
+ ::comp_CompatWriterDocProps::_create,
+ ::comp_CompatWriterDocProps::_getImplementationName(),
+ ::comp_CompatWriterDocProps::_getSupportedServiceNames());
+ }
+
+ // Factory is valid - service was found.
// Factory is valid - service was found.
if ( xFactory.is() )
@@ -2427,3 +2432,4 @@ com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > N
return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 639fe81c9a..17a274b4e5 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.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,10 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
-#ifndef _RCID_H
#include <tools/rcid.h>
#endif
#include <unotools/viewoptions.hxx>
@@ -40,9 +38,6 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <cppuhelper/implbase1.hxx>
-#ifndef GCC
-#endif
-
#include <sfx2/childwin.hxx>
#include <sfx2/app.hxx>
#include "arrdecl.hxx"
@@ -378,43 +373,6 @@ sal_uInt16 SfxChildWindow::GetPosition()
return pImp->pFact->nPos;
}
-#if 0
-static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr )
-{
- ULONG nValidMask = 0;
- xub_StrLen nIndex = 0;
- ByteString aTokenStr;
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.X() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_X;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.Y() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_Y;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Width() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_WIDTH;
- }
-
- aTokenStr = rStr.GetToken( 0, ';', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Height() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_HEIGHT;
- }
-}
-#endif
-
//-------------------------------------------------------------------------
void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo )
{
@@ -853,3 +811,4 @@ void SfxChildWindow::RegisterChildWindow(SfxModule* pMod, SfxChildWinFactory* pF
SFX_APP()->RegisterChildWindow_Impl( pMod, pFact );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 7da8dd8d53..2f3241150b 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.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.
@@ -418,7 +419,7 @@ String impl_getFilter( const String& _rURL )
{
css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection") ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
css::uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
@@ -435,7 +436,7 @@ String impl_getFilter( const String& _rURL )
{
::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
sFilter = lTypeProps.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString() );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString() );
}
}
}
@@ -704,3 +705,4 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 98fa3ae622..622a125c81 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.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.
@@ -93,3 +94,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index 76b58f1048..b0f3ffc20c 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.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,7 +32,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include "sal/config.h"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "workwin.hxx"
@@ -39,7 +40,7 @@
void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xFrame.is() )
{
SfxFrame* pFrame=0;
@@ -57,3 +58,5 @@ void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::sta
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 40d43948e0..22e3e5d664 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.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.
@@ -121,3 +122,4 @@ void SAL_CALL HelpDispatch_Impl::removeStatusListener(
m_xRealDispatch->removeStatusListener( xControl, aURL );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index 706a67d5c3..685f2b8101 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.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 // #ifndef SFX_HELPDISPATCHER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index ced2134917..c3b75353d9 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.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.
@@ -62,9 +63,12 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() :
HelpInterceptor_Impl::~HelpInterceptor_Impl()
{
- for ( USHORT i = 0; m_pHistory && i < m_pHistory->Count(); ++i )
- delete m_pHistory->GetObject(i);
- delete m_pHistory;
+ if ( m_pHistory )
+ {
+ for ( size_t i = 0, n = m_pHistory->size(); i < n; ++i )
+ delete m_pHistory->at( i );
+ delete m_pHistory;
+ }
}
// -----------------------------------------------------------------------
@@ -73,26 +77,32 @@ void HelpInterceptor_Impl::addURL( const String& rURL )
{
if ( !m_pHistory )
m_pHistory = new HelpHistoryList_Impl;
- ULONG nCount = m_pHistory->Count();
+
+ size_t nCount = m_pHistory->size();
if ( nCount && m_nCurPos < ( nCount - 1 ) )
{
- for ( ULONG i = nCount - 1; i > m_nCurPos; i-- )
- delete m_pHistory->Remove(i);
+ for ( size_t i = nCount - 1; i > m_nCurPos; i-- )
+ {
+ delete m_pHistory->at( i );
+ HelpHistoryList_Impl::iterator it = m_pHistory->begin();
+ ::std::advance( it, i );
+ m_pHistory->erase( it );
+ }
}
Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY);
Reference<XController> xController;
if(xFrame.is())
xController = xFrame->getController();
Any aViewData;
- if(xController.is() && m_pHistory->Count())
+ if(xController.is() && !m_pHistory->empty())
{
- m_pHistory->GetObject(m_nCurPos)->aViewData = xController->getViewData();
+ m_pHistory->at( m_nCurPos )->aViewData = xController->getViewData();
}
m_aCurrentURL = rURL;
Any aEmptyViewData;
- m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), LIST_APPEND );
- m_nCurPos = m_pHistory->Count() - 1;
+ m_pHistory->push_back( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ) );
+ m_nCurPos = m_pHistory->size() - 1;
// TODO ?
if ( m_xListener.is() )
{
@@ -126,8 +136,8 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL )
{
m_pHistory = new HelpHistoryList_Impl;
Any aEmptyViewData;
- m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), ((ULONG)0x0) );
- m_nCurPos = m_pHistory->Count() - 1;
+ m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData ) );
+ m_nCurPos = m_pHistory->size() - 1;
m_pWindow->UpdateToolbox();
}
@@ -141,7 +151,7 @@ sal_Bool HelpInterceptor_Impl::HasHistoryPred() const
sal_Bool HelpInterceptor_Impl::HasHistorySucc() const
{
- return m_pHistory && ( m_nCurPos < ( m_pHistory->Count() - 1 ) );
+ return m_pHistory && ( m_nCurPos < ( m_pHistory->size() - 1 ) );
}
@@ -161,7 +171,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
// INetURLObject aObj( aURL.Complete );
// sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
- BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+ BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
if ( bHelpURL )
{
@@ -257,7 +267,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
{
if ( m_pHistory )
{
- if(m_pHistory->Count() > m_nCurPos)
+ if(m_pHistory->size() > m_nCurPos)
{
Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY);
Reference<XController> xController;
@@ -265,18 +275,18 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
xController = xFrame->getController();
if(xController.is())
{
- m_pHistory->GetObject(m_nCurPos)->aViewData = xController->getViewData();
+ m_pHistory->at( m_nCurPos )->aViewData = xController->getViewData();
}
}
-
+
ULONG nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
- : ( !bBack && m_nCurPos < m_pHistory->Count() - 1 )
+ : ( !bBack && m_nCurPos < m_pHistory->size() - 1 )
? ++m_nCurPos
: ULONG_MAX;
if ( nPos < ULONG_MAX )
{
- HelpHistoryEntry_Impl* pEntry = m_pHistory->GetObject( nPos );
+ HelpHistoryEntry_Impl* pEntry = m_pHistory->at( nPos );
if ( pEntry )
m_pWindow->loadHelpContent(pEntry->aURL, sal_False); // false => dont add item to history again!
}
@@ -333,35 +343,29 @@ void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventO
pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() );
pInterceptor = NULL;
}
-/*-- 05.09.2002 12:17:59---------------------------------------------------
- -----------------------------------------------------------------------*/
HelpStatusListener_Impl::HelpStatusListener_Impl(
Reference < XDispatch > aDispatch, URL& rURL)
{
aDispatch->addStatusListener(this, rURL);
}
-/*-- 05.09.2002 12:17:59---------------------------------------------------
- -----------------------------------------------------------------------*/
HelpStatusListener_Impl::~HelpStatusListener_Impl()
{
if(xDispatch.is())
xDispatch->removeStatusListener(this, com::sun::star::util::URL());
}
-/*-- 05.09.2002 12:17:59---------------------------------------------------
- -----------------------------------------------------------------------*/
void HelpStatusListener_Impl::statusChanged(
const FeatureStateEvent& rEvent ) throw( RuntimeException )
{
aStateEvent = rEvent;
}
-/*-- 05.09.2002 12:18:00---------------------------------------------------
- -----------------------------------------------------------------------*/
void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException )
{
xDispatch->removeStatusListener(this, com::sun::star::util::URL());
xDispatch = 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 5fe4addcb3..9f2fe8a495 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.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 INCLUDED_SFX_HELPINTERCEPTOR_HXX
#define INCLUDED_SFX_HELPINTERCEPTOR_HXX
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase3.hxx>
-#endif
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
@@ -40,17 +39,18 @@
#include <tools/string.hxx>
#include <tools/list.hxx>
#include <tools/link.hxx>
+#include <vector>
struct HelpHistoryEntry_Impl
{
String aURL;
com::sun::star::uno::Any aViewData;
- HelpHistoryEntry_Impl( const String& rURL, const com::sun::star::uno::Any& rViewData ) :
+ HelpHistoryEntry_Impl( const String& rURL, const com::sun::star::uno::Any& rViewData ) :
aURL( rURL ), aViewData(rViewData) {}
};
-DECLARE_LIST(HelpHistoryList_Impl,HelpHistoryEntry_Impl*)
+typedef ::std::vector< HelpHistoryEntry_Impl* > HelpHistoryList_Impl;
class SfxHelpWindow_Impl;
class HelpInterceptor_Impl : public ::cppu::WeakImplHelper3<
@@ -92,7 +92,7 @@ public:
const com::sun::star::uno::Any& GetViewData()const {return m_aViewData;}
-
+
sal_Bool HasHistoryPred() const; // is there a predecessor for the current in the history
sal_Bool HasHistorySucc() const; // is there a successor for the current in the history
@@ -171,3 +171,4 @@ public:
#endif // #ifndef INCLUDED_SFX_HELPINTERCEPTOR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 59714d0570..0284cb8db8 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.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.
@@ -66,10 +67,6 @@ typedef std::hash_map< ::rtl::OUString,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
-static WeakReference< XModuleManager > m_xModuleManager;
-static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier;
-static WeakReference< XURLTransformer > m_xURLTransformer;
-static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap;
Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
{
@@ -90,22 +87,6 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
rtl::OUString aCommandURL( aURL );
if ( nProtocol == INET_PROT_SLOT )
{
- /*
- // Support old way to retrieve image via slot URL
- Reference< XURLTransformer > xURLTransformer = m_xURLTransformer;
- if ( !xURLTransformer.is() )
- {
- xURLTransformer = Reference< XURLTransformer >(
- ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
- UNO_QUERY );
- m_xURLTransformer = xURLTransformer;
- }
-
- URL aTargetURL;
- aTargetURL.Complete = aURL;
- xURLTransformer->parseStrict( aTargetURL );
- USHORT nId = ( USHORT ) aTargetURL.Path.toInt32();*/
USHORT nId = ( USHORT ) String(aURL).Copy(5).ToInt32();
const SfxSlot* pSlot = 0;
if ( xModel.is() )
@@ -147,8 +128,6 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
::com::sun::star::ui::ImageType::SIZE_DEFAULT );
if ( bBig )
nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
- if ( bHiContrast )
- nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
if ( xDocImgMgr.is() )
{
@@ -170,6 +149,8 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
}
}
+ static WeakReference< XModuleManager > m_xModuleManager;
+
Reference< XModuleManager > xModuleManager = m_xModuleManager;
if ( !xModuleManager.is() )
@@ -188,11 +169,16 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
{
Reference< XImageManager > xModuleImageManager;
rtl::OUString aModuleId = xModuleManager->identify( rFrame );
+
+ static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap;
+
ModuleIdToImagegMgr::iterator pIter = m_aModuleIdToImageMgrMap.find( aModuleId );
if ( pIter != m_aModuleIdToImageMgrMap.end() )
xModuleImageManager = pIter->second;
else
{
+ static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier;
+
Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = m_xModuleCfgMgrSupplier;
if ( !xModuleCfgMgrSupplier.is() )
@@ -223,7 +209,7 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
if ( !!aImage )
return aImage;
else if ( nProtocol != INET_PROT_UNO && nProtocol != INET_PROT_SLOT )
- return SvFileInformationManager::GetImageNoDefault( aObj, bBig, bHiContrast );
+ return SvFileInformationManager::GetImageNoDefault( aObj, bBig );
}
}
catch ( Exception& )
@@ -232,3 +218,5 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
return Image();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 53639a65df..7e6916f01c 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.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.
@@ -50,7 +51,7 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "vcl/svapp.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
namespace css = com::sun::star;
@@ -229,3 +230,4 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
return xConfig;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 2d310c60c7..7c3ca11a15 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.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.
@@ -123,3 +124,5 @@ private:
} }
#endif // INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 6598b066d4..5aa7cefa1d 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.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.
@@ -151,7 +152,7 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
if( !pConnection )
return FALSE;
- if( pConnection->GetError() ) // dann versuchen wir es nochmal
+ if( pConnection->GetError() ) // then we try once more
{
String sServer( pConnection->GetServiceName() );
String sTopic( pConnection->GetTopicName() );
@@ -162,13 +163,13 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
nError = DDELINK_ERROR_APP;
}
- if( bWaitForData ) // wir sind rekursiv drin, wieder raus
+ if( bWaitForData ) // we are in an rekursive loop, get out again
return FALSE;
- // Verriegeln gegen Reentrance
+ // Lock against Reentrance
bWaitForData = TRUE;
- // falls gedruckt werden soll, warten wir bis die Daten vorhanden sind
+ // if you want to print, we'll wait until the data is available
if( bSynchron )
{
DdeRequest aReq( *pConnection, sItem, 5000 );
@@ -188,8 +189,8 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
}
else
{
- // ansonsten wird es asynchron ausgefuehrt
-// if( !pLink || !pLink->IsBusy() )
+ // otherwise it will be executed asynchronously
+// if( !pLink || !pLink->IsBusy() )
{
if( pRequest )
delete pRequest;
@@ -215,9 +216,9 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
static BOOL bInWinExec = FALSE;
#endif
USHORT nLinkType = pSvLink->GetUpdateMode();
- if( pConnection ) // Verbindung steht ja schon
+ if( pConnection ) // Connection is already made
{
- // tja, dann nur noch als Abhaengig eintragen
+ // well, then just add it as dependent
AddDataAdvise( pSvLink,
SotExchange::GetFormatMimeType( pSvLink->GetContentType()),
LINKUPDATE_ONCALL == nLinkType
@@ -242,6 +243,8 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
{
// kann man denn das System-Topic ansprechen ?
// dann ist der Server oben, kennt nur nicht das Topic!
+ // Is it possible to address the system-Topic?
+ // then the server is up, it just does not know the topic!
if( sTopic.EqualsIgnoreCaseAscii( "SYSTEM" ) )
{
BOOL bSysTopic;
@@ -255,12 +258,12 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
nError = DDELINK_ERROR_DATA;
return FALSE;
}
- // ansonsten unter Win/WinNT die Applikation direkt starten
+ // otherwise in Win/WinNT, start the Application directly
}
#if defined(WNT)
- // Server nicht da, starten und nochmal versuchen
+ // Server not up, try once more to start it.
if( !bInWinExec )
{
ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
@@ -299,7 +302,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
if( LINKUPDATE_ALWAYS == nLinkType && !pLink && !pConnection->GetError() )
{
- // Hot Link einrichten, Daten kommen irgendwann spaeter
+ // Setting up Hot Link, Data will be available at some point later on
pLink = new DdeHotLink( *pConnection, sItem );
pLink->SetDataHdl( LINK( this, SvDDEObject, ImplGetDDEData ) );
pLink->SetDoneHdl( LINK( this, SvDDEObject, ImplDoneDDEData ) );
@@ -352,22 +355,22 @@ BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
nFmt = FORMAT_GDIMETAFILE;
break;
- // sonst noch irgendwas ??
+ // something else?
}
if( nFmt )
- rReq.SetFormat( nFmt ); // damit nochmal versuchen
+ rReq.SetFormat( nFmt ); // try it once more
return 0 != nFmt;
}
BOOL SvDDEObject::IsPending() const
-/* [Beschreibung]
-
- Die Methode stellt fest, ob aus einem DDE-Object die Daten gelesen
- werden kann.
- Zurueckgegeben wird:
- ERRCODE_NONE wenn sie komplett gelesen wurde
- ERRCODE_SO_PENDING wenn sie noch nicht komplett gelesen wurde
- ERRCODE_SO_FALSE sonst
+/* [Description]
+
+ The method determines whether the data-object can be read from a DDE.
+
+ Returned is the following:
+ ERRCODE_NONE if it has been completely read
+ ERRCODE_SO_PENDING if it has not been completely read
+ ERRCODE_SO_FALSE otherwise
*/
{
return bWaitForData;
@@ -397,8 +400,8 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
Sequence< sal_Int8 > aSeq( (const sal_Int8*)p, nLen );
if( pGetData )
{
- *pGetData <<= aSeq; // Daten kopieren
- pGetData = 0; // und den Pointer bei mir zuruecksetzen
+ *pGetData <<= aSeq; // Copy Data
+ pGetData = 0; // reset the pointer here
}
else
{
@@ -421,9 +424,9 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
{
DdeTransaction* pReq = 0;
if( !pLink || ( pLink && pLink->IsBusy() ))
- pReq = pRequest; // dann kann nur der fertig sein
+ pReq = pRequest; // only the one that is ready
else if( pRequest && pRequest->IsBusy() )
- pReq = pLink; // dann kann nur der fertig sein
+ pReq = pLink; // only the one that is ready
if( pReq )
{
@@ -433,16 +436,17 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
}
else if( pReq == pRequest )
{
- // das wars dann
bWaitForData = FALSE;
}
}
}
else
- // das warten ist beendet
+ // End waiting
bWaitForData = FALSE;
return 0;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index eab554c46d..86734c6fe3 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.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.
@@ -48,8 +49,8 @@ class SvDDEObject : public SvLinkSource
DdeRequest* pRequest;
::com::sun::star::uno::Any * pGetData;
- BYTE bWaitForData : 1; // wird auf Daten gewartet?
- BYTE nError : 7; // Error Code fuer den Dialog
+ BYTE bWaitForData : 1; // waiting for data?
+ BYTE nError : 7; // Error code for dialogue
BOOL ImplHasOtherFormat( DdeTransaction& );
@@ -76,3 +77,5 @@ public:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index dc6e680213..9956760499 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.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.
@@ -89,16 +90,34 @@ LinkManager::~LinkManager()
}
}
+void LinkManager::InsertCachedComp(const Reference<XComponent>& xComp)
+{
+ maCachedComps.push_back(xComp);
+}
+
+void LinkManager::CloseCachedComps()
+{
+ CompVector::iterator itr = maCachedComps.begin(), itrEnd = maCachedComps.end();
+ for (; itr != itrEnd; ++itr)
+ {
+ Reference<XCloseable> xCloseable(*itr, UNO_QUERY);
+ if (!xCloseable.is())
+ continue;
+
+ xCloseable->close(true);
+ }
+ maCachedComps.clear();
+}
/************************************************************************
|* LinkManager::Remove()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void LinkManager::Remove( SvBaseLink *pLink )
{
- // keine Links doppelt einfuegen
+ // No duplicate links inserted
int bFound = FALSE;
SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
@@ -111,7 +130,7 @@ void LinkManager::Remove( SvBaseLink *pLink )
bFound = TRUE;
}
- // falls noch leere rum stehen sollten, weg damit
+ // Remove emty ones if they exist
if( !(*ppRef)->Is() )
{
delete *ppRef;
@@ -148,7 +167,7 @@ void LinkManager::Remove( USHORT nPos, USHORT nCnt )
BOOL LinkManager::Insert( SvBaseLink* pLink )
{
- // keine Links doppelt einfuegen
+ // No duplicate links inserted
for( USHORT n = 0; n < aLinkTbl.Count(); ++n )
{
SvBaseLinkRef* pTmp = aLinkTbl[ n ];
@@ -171,7 +190,7 @@ BOOL LinkManager::InsertLink( SvBaseLink * pLink,
USHORT nUpdateMode,
const String* pName )
{
- // unbedingt zuerst
+ // This First
pLink->SetObjType( nObjType );
if( pName )
pLink->SetName( *pName );
@@ -277,14 +296,14 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
void LinkManager::UpdateAllLinks(
BOOL bAskUpdate,
BOOL /*bCallErrHdl*/,
- BOOL bUpdateGrfLinks,
+ BOOL bUpdateGrfLinks,
Window* pParentWin )
{
SvStringsDtor aApps, aTopics, aItems;
String sApp, sTopic, sItem;
- // erstmal eine Kopie vom Array machen, damit sich updatende Links in
- // Links in ... nicht dazwischen funken!!
+ // First make a copy of the array in order to update links
+ // links in ... no contact between them!
SvPtrarr aTmpArr( 255, 50 );
USHORT n;
for( n = 0; n < aLinkTbl.Count(); ++n )
@@ -302,7 +321,7 @@ void LinkManager::UpdateAllLinks(
{
SvBaseLink* pLink = (SvBaseLink*)aTmpArr[ n ];
- // suche erstmal im Array nach dem Eintrag
+ // search first in the array after the entry
USHORT nFndPos = USHRT_MAX;
for( USHORT i = 0; i < aLinkTbl.Count(); ++i )
if( pLink == *aLinkTbl[ i ] )
@@ -312,9 +331,9 @@ void LinkManager::UpdateAllLinks(
}
if( USHRT_MAX == nFndPos )
- continue; // war noch nicht vorhanden!
+ continue; // was not available!
- // Graphic-Links noch nicht updaten
+ // Graphic-Links not to update jet
if( !pLink->IsVisible() ||
( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() ))
continue;
@@ -323,18 +342,19 @@ void LinkManager::UpdateAllLinks(
{
int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
if( RET_YES != nRet )
- return ; // es soll nichts geupdatet werden
- bAskUpdate = FALSE; // einmal reicht
+ return ; // nothing should be updated
+ bAskUpdate = FALSE; // once is enough
}
pLink->Update();
}
+ CloseCachedComps();
}
/************************************************************************
|* SvBaseLink::CreateObject()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
@@ -356,7 +376,7 @@ SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
BOOL LinkManager::InsertServer( SvLinkSource* pObj )
{
- // keine doppelt einfuegen
+ // no duplicate inserts
if( !pObj || USHRT_MAX != aServerTbl.GetPos( pObj ) )
return FALSE;
@@ -634,3 +654,4 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 01503faee9..cbd000a3fd 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.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,7 +31,6 @@
#include <sfx2/linksrc.hxx>
#include <sfx2/lnkbase.hxx>
-//#include <sot/exchange.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -46,7 +46,6 @@ namespace sfx2
TYPEINIT0( SvLinkSource )
-/************** class SvLinkSourceTimer *********************************/
class SvLinkSourceTimer : public Timer
{
SvLinkSource * pOwner;
@@ -62,7 +61,7 @@ SvLinkSourceTimer::SvLinkSourceTimer( SvLinkSource * pOwn )
void SvLinkSourceTimer::Timeout()
{
- // sicher gegen zerstoeren im Handler
+ // Secure against beeing destroyed in Handler
SvLinkSourceRef aAdv( pOwner );
pOwner->SendDataChanged();
}
@@ -209,12 +208,11 @@ void SvLinkSource::setStreamToLoadFrom(const com::sun::star::uno::Reference<com:
pImpl->m_bIsReadOnly = bIsReadOnly;
}
-// --> OD 2008-06-18 #i88291#
+// #i88291#
void SvLinkSource::clearStreamToLoadFrom()
{
pImpl->m_xInputStreamToLoadFrom.clear();
}
-// <--
void SvLinkSource::Closed()
{
@@ -277,7 +275,7 @@ void SvLinkSource::SendDataChanged()
void SvLinkSource::NotifyDataChanged()
{
if( pImpl->nTimeout )
- StartTimer( &pImpl->pTimer, this, pImpl->nTimeout ); // Timeout neu
+ StartTimer( &pImpl->pTimer, this, pImpl->nTimeout ); // New timeout
else
{
SvLinkSource_EntryIter_Impl aIter( pImpl->aArr );
@@ -316,10 +314,10 @@ void SvLinkSource::DataChanged( const String & rMimeType,
const ::com::sun::star::uno::Any & rVal )
{
if( pImpl->nTimeout && !rVal.hasValue() )
- { // nur wenn keine Daten mitgegeben wurden
+ { // only when no data was included
// fire all data to the sink, independent of the requested format
pImpl->aDataMimeType = rMimeType;
- StartTimer( &pImpl->pTimer, this, pImpl->nTimeout ); // Timeout neu
+ StartTimer( &pImpl->pTimer, this, pImpl->nTimeout ); // New timeout
}
else
{
@@ -433,3 +431,4 @@ void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index d8fdcd5943..8c9f1fd2e3 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.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.
@@ -72,16 +73,16 @@ struct BaseLink_Impl
{ delete m_pFileDlg; }
};
-// nur fuer die interne Verwaltung
+// only for internal management
struct ImplBaseLinkData
{
struct tClientType
{
- // gilt fuer alle Links
- ULONG nCntntType; // Update Format
- // nicht Ole-Links
- BOOL bIntrnlLnk; // ist es ein interner Link
- USHORT nUpdateMode;// UpdateMode
+ // applies for all links
+ ULONG nCntntType; // Update Format
+ // Not Ole-Links
+ BOOL bIntrnlLnk; // It is an internal link
+ USHORT nUpdateMode; // UpdateMode
};
struct tDDEType
@@ -107,7 +108,7 @@ class ImplDdeItem : public DdeGetPutItem
{
SvBaseLink* pLink;
DdeData aData;
- Sequence< sal_Int8 > aSeq; // Datacontainer for DdeData !!!
+ Sequence< sal_Int8 > aSeq; // Datacontainer for DdeData !!!
BOOL bIsValidData : 1;
BOOL bIsInDTOR : 1;
public:
@@ -132,9 +133,9 @@ public:
/************************************************************************
-|* SvBaseLink::SvBaseLink()
+|* SvBaseLink::SvBaseLink()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvBaseLink::SvBaseLink()
@@ -147,9 +148,9 @@ SvBaseLink::SvBaseLink()
}
/************************************************************************
-|* SvBaseLink::SvBaseLink()
+|* SvBaseLink::SvBaseLink()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
@@ -160,16 +161,16 @@ SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
bVisible = bSynchron = bUseCache = TRUE;
bWasLastEditOK = FALSE;
- // falls es ein Ole-Link wird,
+ // It it going to be a Ole-Link,
pImplData->ClientType.nUpdateMode = nUpdateMode;
pImplData->ClientType.nCntntType = nContentType;
pImplData->ClientType.bIntrnlLnk = FALSE;
}
/************************************************************************
-|* SvBaseLink::SvBaseLink()
+|* SvBaseLink::SvBaseLink()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSource* pObj )
@@ -182,7 +183,7 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSourc
if( !pObj )
{
- DBG_ASSERT( pObj, "Wo ist mein zu linkendes Object" );
+ DBG_ASSERT( pObj, "Where is my left-most object" );
return;
}
@@ -192,15 +193,14 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSourc
DdeTopic* pTopic = FindTopic( aLinkName, &nItemStt );
if( pTopic )
{
- // dann haben wir alles zusammen
- // MM hat gefummelt ???
- // MM_TODO wie kriege ich den Namen
+ // then we have it all together
+ // MM_TODO how do I get the name
String aStr = aLinkName; // xLinkName->GetDisplayName();
aStr = aStr.Copy( nItemStt );
pImplData->DDEType.pItem = new ImplDdeItem( *this, aStr );
pTopic->InsertItem( pImplData->DDEType.pItem );
- // dann koennen wir uns auch das Advise merken
+ // store the Advice
xObj = pObj;
}
}
@@ -209,9 +209,9 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSourc
}
/************************************************************************
-|* SvBaseLink::~SvBaseLink()
+|* SvBaseLink::~SvBaseLink()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvBaseLink::~SvBaseLink()
@@ -243,9 +243,9 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
}
/************************************************************************
-|* SvBaseLink::SetObjType()
+|* SvBaseLink::SetObjType()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvBaseLink::SetObjType( USHORT nObjTypeP )
@@ -257,9 +257,9 @@ void SvBaseLink::SetObjType( USHORT nObjTypeP )
}
/************************************************************************
-|* SvBaseLink::SetName()
+|* SvBaseLink::SetName()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvBaseLink::SetName( const String & rNm )
@@ -268,9 +268,9 @@ void SvBaseLink::SetName( const String & rNm )
}
/************************************************************************
-|* SvBaseLink::GetName()
+|* SvBaseLink::GetName()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
String SvBaseLink::GetName() const
@@ -279,9 +279,9 @@ String SvBaseLink::GetName() const
}
/************************************************************************
-|* SvBaseLink::SetObj()
+|* SvBaseLink::SetObj()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvBaseLink::SetObj( SvLinkSource * pObj )
@@ -294,9 +294,9 @@ void SvBaseLink::SetObj( SvLinkSource * pObj )
}
/************************************************************************
-|* SvBaseLink::SetLinkSourceName()
+|* SvBaseLink::SetLinkSourceName()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
@@ -304,21 +304,21 @@ void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
if( aLinkName == rLnkNm )
return;
- AddNextRef(); // sollte ueberfluessig sein
- // Alte Verbindung weg
+ AddNextRef(); // should be superfluous
+ // remove old connection
Disconnect();
aLinkName = rLnkNm;
- // Neu verbinden
+ // New Connection
_GetRealObject();
- ReleaseRef(); // sollte ueberfluessig sein
+ ReleaseRef(); // should be superfluous
}
/************************************************************************
-|* SvBaseLink::GetLinkSourceName()
+|* SvBaseLink::GetLinkSourceName()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
String SvBaseLink::GetLinkSourceName() const
@@ -328,9 +328,9 @@ String SvBaseLink::GetLinkSourceName() const
/************************************************************************
-|* SvBaseLink::SetUpdateMode()
+|* SvBaseLink::SetUpdateMode()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvBaseLink::SetUpdateMode( USHORT nMode )
@@ -347,7 +347,7 @@ void SvBaseLink::SetUpdateMode( USHORT nMode )
}
}
-// --> OD 2008-06-19 #i88291#
+// #i88291#
void SvBaseLink::clearStreamToLoadFrom()
{
m_xInputStreamToLoadFrom.clear();
@@ -356,7 +356,6 @@ void SvBaseLink::clearStreamToLoadFrom()
xObj->clearStreamToLoadFrom();
}
}
-// <--
BOOL SvBaseLink::Update()
{
@@ -387,11 +386,11 @@ BOOL SvBaseLink::Update()
}
if( xObj.Is() )
{
- // sollten wir asynschron sein?
+ // should be asynschron?
if( xObj->IsPending() )
return TRUE;
- // dann brauchen wir das Object auch nicht mehr
+ // we do not need the object anymore
AddNextRef();
Disconnect();
ReleaseRef();
@@ -421,14 +420,14 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
{
String sServer;
if( pImpl->m_pLinkMgr->GetDisplayNames( this, &sServer ) &&
- sServer == GetpApp()->GetAppName() ) // interner Link !!!
+ sServer == GetpApp()->GetAppName() ) // internal Link !!!
{
- // damit der Internal - Link erzeugt werden kann !!!
+ // so that the Internal link can be created!
nObjType = OBJECT_INTERN;
xObj = pImpl->m_pLinkMgr->CreateObj( this );
pImplData->ClientType.bIntrnlLnk = TRUE;
- nObjType = OBJECT_CLIENT_DDE; // damit wir wissen was es mal war !!
+ nObjType = OBJECT_CLIENT_DDE; // so we know what it once was!
}
else
{
@@ -448,7 +447,7 @@ ULONG SvBaseLink::GetContentType() const
if( OBJECT_CLIENT_SO & nObjType )
return pImplData->ClientType.nCntntType;
- return 0; // alle Formate ?
+ return 0; // all Formats ?
}
@@ -578,7 +577,6 @@ bool SvBaseLink::ExecuteEdit( const String& _rNewName )
void SvBaseLink::Closed()
{
if( xObj.Is() )
- // beim Advise Abmelden
xObj->RemoveAllDataAdvise( this );
}
@@ -593,8 +591,7 @@ FileDialogHelper* SvBaseLink::GetFileDialog( sal_uInt32 nFlags, const String& rF
ImplDdeItem::~ImplDdeItem()
{
bIsInDTOR = TRUE;
- // damit im Disconnect nicht jemand auf die Idee kommt, den Pointer zu
- // loeschen!!
+ // So that no-one gets the idea to delete the pointer when Disconnecting!
SvBaseLinkRef aRef( pLink );
aRef->Disconnect();
}
@@ -603,7 +600,7 @@ DdeData* ImplDdeItem::Get( ULONG nFormat )
{
if( pLink->GetObj() )
{
- // ist das noch gueltig?
+ // is it still valid?
if( bIsValidData && nFormat == aData.GetFormat() )
return &aData;
@@ -635,12 +632,12 @@ BOOL ImplDdeItem::Put( const DdeData* )
void ImplDdeItem::AdviseLoop( BOOL bOpen )
{
- // Verbindung wird geschlossen, also Link abmelden
+ // Connection is closed, so also unsubscribe link
if( pLink->GetObj() )
{
if( bOpen )
{
- // es wird wieder eine Verbindung hergestellt
+ // A connection is re-established
if( OBJECT_DDE_EXTERN == pLink->GetObjType() )
{
pLink->GetObj()->AddDataAdvise( pLink, String::CreateFromAscii( "text/plain;charset=utf-16" ), ADVISEMODE_NODATA );
@@ -649,8 +646,8 @@ void ImplDdeItem::AdviseLoop( BOOL bOpen )
}
else
{
- // damit im Disconnect nicht jemand auf die Idee kommt,
- // den Pointer zu loeschen!!
+ // So that no-one gets the idea to delete the pointer
+ // when Disconnecting!
SvBaseLinkRef aRef( pLink );
aRef->Disconnect();
}
@@ -672,7 +669,7 @@ static DdeTopic* FindTopic( const String & rLinkName, USHORT* pItemStt )
pService = rSvc.Next() )
if( pService->GetName() == sService )
{
- // dann suchen wir uns das Topic
+ // then we search for the Topic
String sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
if( pItemStt )
*pItemStt = nTokenPos;
@@ -686,10 +683,10 @@ static DdeTopic* FindTopic( const String & rLinkName, USHORT* pItemStt )
if( pTopic->GetName() == sTopic )
return pTopic;
- // Topic nicht gefunden ?
- // dann versuchen wir ihn mal anzulegen
+ // Topic not found?
+ // then we try once to create it
if( i || !pService->MakeTopic( sTopic ) )
- break; // hat nicht geklappt, also raus
+ break; // did not work, exiting
}
break;
}
@@ -697,3 +694,5 @@ static DdeTopic* FindTopic( const String & rLinkName, USHORT* pItemStt )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index a02e3128f9..251f0d3873 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.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,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
-
#include <stdio.h>
#include <tools/rcid.h>
@@ -68,12 +66,10 @@ public:
SfxChildWinFactArr_Impl* pFactArr;
ImageList* pImgListSmall;
ImageList* pImgListBig;
- ImageList* pImgListHiSmall;
- ImageList* pImgListHiBig;
SfxModule_Impl();
~SfxModule_Impl();
- ImageList* GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE );
+ ImageList* GetImageList( ResMgr* pResMgr, BOOL bBig );
};
SfxModule_Impl::SfxModule_Impl()
@@ -90,18 +86,15 @@ SfxModule_Impl::~SfxModule_Impl()
delete pFactArr;
delete pImgListSmall;
delete pImgListBig;
- delete pImgListHiSmall;
- delete pImgListHiBig;
}
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig )
{
- ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) :
- ( bHiContrast ? pImgListHiSmall : pImgListSmall );
+ ImageList*& rpList = bBig ? pImgListBig : pImgListSmall;
if ( !rpList )
{
- ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
- ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+ ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+
aResId.SetRT( RSC_IMAGELIST );
DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
@@ -130,16 +123,7 @@ ResMgr* SfxModule::GetResMgr()
}
//====================================================================
-/*
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
- SfxObjectFactory* pFactoryP )
- : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
-{
- Construct_Impl();
- if ( pFactoryP )
- pFactoryP->SetModule_Impl( this );
-}
-*/
+
SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
SfxObjectFactory* pFactoryP, ... )
: pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
@@ -170,8 +154,6 @@ void SfxModule::Construct_Impl()
pImpl->pFactArr=0;
pImpl->pImgListSmall=0;
pImpl->pImgListBig=0;
- pImpl->pImgListHiSmall=0;
- pImpl->pImgListHiBig=0;
SetPool( &pApp->GetPool() );
}
@@ -185,7 +167,8 @@ SfxModule::~SfxModule()
{
if ( SFX_APP()->Get_Impl() )
{
- // Das Modul wird noch vor dem DeInitialize zerst"ort, also auis dem Array entfernen
+ // The module will be destroyed before the Deinitialize,
+ // so remove from the array
SfxModuleArr_Impl& rArr = GetModules_Impl();
for( USHORT nPos = rArr.Count(); nPos--; )
{
@@ -214,22 +197,20 @@ SfxSlotPool* SfxModule::GetSlotPool() const
void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
{
- DBG_ASSERT( pImpl, "Kein echtes Modul!" );
+ DBG_ASSERT( pImpl, "No real Modul!" );
if (!pImpl->pFactArr)
pImpl->pFactArr = new SfxChildWinFactArr_Impl;
-//#ifdef DBG_UTIL
for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
{
if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId)
{
pImpl->pFactArr->Remove( nFactory );
- DBG_ERROR("ChildWindow mehrfach registriert!");
+ DBG_ERROR("ChildWindow registered multiple times!");
return;
}
}
-//#endif
pImpl->pFactArr->C40_INSERT(
SfxChildWinFactory, pFact, pImpl->pFactArr->Count() );
@@ -240,7 +221,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
void SfxModule::RegisterChildWindowContext( USHORT nId,
SfxChildWinContextFactory *pFact)
{
- DBG_ASSERT( pImpl, "Kein echtes Modul!" );
+ DBG_ASSERT( pImpl, "No real Modul!" );
USHORT nCount = pImpl->pFactArr->Count();
for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
@@ -255,7 +236,7 @@ void SfxModule::RegisterChildWindowContext( USHORT nId,
}
}
- DBG_ERROR( "Kein ChildWindow fuer diesen Context!" );
+ DBG_ERROR( "No ChildWindow for this Context!" );
}
//-------------------------------------------------------------------------
@@ -272,7 +253,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("TbxController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("TbxController-Registering is not clearly defined!");
}
}
#endif
@@ -294,7 +275,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("StbController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("TbxController-Registering is not clearly defined!");
}
}
#endif
@@ -316,7 +297,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("MenuController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("MenuController-Registering is not clearly defined!");
}
}
#endif
@@ -354,15 +335,10 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
{
- return pImpl->GetImageList( pResMgr, bBig, FALSE );
-}
-
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast )
-{
- return pImpl->GetImageList( pResMgr, bBig, bHiContrast );
+ return pImpl->GetImageList( pResMgr, bBig );
}
-SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
+SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
{
return NULL;
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5033ca5b8f..d13c9e7f83 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.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.
@@ -70,9 +71,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
#include <com/sun/star/i18n/XBreakIterator.hpp>
-#endif
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/style/XStyle.hpp>
@@ -902,7 +901,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
}
// -----------------------------------------------------------------------
-//added by BerryJia for fixing Bug98251, 2002-12-11
+
sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
{
sal_Bool bRet = sal_False;
@@ -1315,7 +1314,7 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
RemoveEntry( nPos );
rtl::OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( *pURL ).GetHost();
- nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL ) );
+ nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) );
SetEntryData( nPos, (void*)(ULONG)( new String( *pURL ) ) );
SelectEntryPos( nPos );
delete pURL;
@@ -1488,7 +1487,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
{
rtl::OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( rURL ).GetHost();
- USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL ) );
+ USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) );
aBookmarksBox.SetEntryData( nPos, (void*)(ULONG)( new String( rURL ) ) );
}
@@ -1535,7 +1534,6 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo
if (!xLoader.is())
return;
- // --> PB 2007-03-12 #134037#
// If a print job runs do not open a new page
Reference< XFrame > xTextFrame = pTextWin->getFrame();
Reference< XController > xTextController ;
@@ -1546,7 +1544,6 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo
xTextController->suspend( sal_False );
return;
}
- // <--
// save url to history
if (bAddToHistory)
@@ -1786,7 +1783,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG )
{
// keyword found on index?
sal_Bool bIndex = pIPage->HasKeyword();
- //The following two lines are added by BerryJia for fixing Bug98251, 2002-12-11
+
if( !bIndex)
bIndex = pIPage->HasKeywordIgnoreCase();
// then set index or search page as current.
@@ -2175,34 +2172,35 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
void SfxHelpTextWindow_Impl::InitToolBoxImages()
{
sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- aIndexOnImage = Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_ON : IMG_HELP_TOOLBOX_L_INDEX_ON
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
- aIndexOffImage = Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_OFF : IMG_HELP_TOOLBOX_L_INDEX_OFF
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
+ aIndexOnImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
+ aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
aToolBox.SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage );
- aToolBox.SetItemImage( TBI_BACKWARD, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PREV : IMG_HELP_TOOLBOX_L_PREV
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
- aToolBox.SetItemImage( TBI_FORWARD, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_NEXT : IMG_HELP_TOOLBOX_L_NEXT
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
- aToolBox.SetItemImage( TBI_START, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_START : IMG_HELP_TOOLBOX_L_START
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
- aToolBox.SetItemImage( TBI_PRINT, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PRINT : IMG_HELP_TOOLBOX_L_PRINT
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
- aToolBox.SetItemImage( TBI_BOOKMARKS, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_BOOKMARKS : IMG_HELP_TOOLBOX_L_BOOKMARKS
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
- aToolBox.SetItemImage( TBI_SEARCHDIALOG, Image( SfxResId(
- bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG : IMG_HELP_TOOLBOX_L_SEARCHDIALOG
- : bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+ aToolBox.SetItemImage( TBI_BACKWARD,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PREV : IMG_HELP_TOOLBOX_PREV ) )
+ );
+
+ aToolBox.SetItemImage( TBI_FORWARD,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_NEXT : IMG_HELP_TOOLBOX_NEXT ) )
+ );
+
+ aToolBox.SetItemImage( TBI_START,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_START : IMG_HELP_TOOLBOX_START ) )
+ );
+
+ aToolBox.SetItemImage( TBI_PRINT,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PRINT : IMG_HELP_TOOLBOX_PRINT ) )
+ );
+
+ aToolBox.SetItemImage( TBI_BOOKMARKS,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) )
+ );
+
+ aToolBox.SetItemImage( TBI_SEARCHDIALOG,
+ Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+ );
Size aSize = aToolBox.CalcWindowSizePixel();
aSize.Height() += TOOLBOX_OFFSET;
@@ -2581,7 +2579,6 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
{
- sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
Point aPos;
if ( pCmdEvt->IsMouseEvent() )
aPos = pCmdEvt->GetMousePosPixel();
@@ -2590,33 +2587,44 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aPos.Y() += pTextWin->GetPosPixel().Y();
PopupMenu aMenu;
if ( bIsIndexOn )
- aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId(
- bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
+ aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
else
- aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId(
- bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
+ aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_ON ) ) );
+
aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
aMenu.InsertSeparator();
- aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
+ aMenu.InsertItem( TBI_BACKWARD,
+ String( SfxResId( STR_HELP_BUTTON_PREV ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_PREV ) )
+ );
aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
- aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
+ aMenu.InsertItem( TBI_FORWARD,
+ String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_NEXT ) )
+ );
aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
- aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
+ aMenu.InsertItem( TBI_START,
+ String( SfxResId( STR_HELP_BUTTON_START ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_START ) )
+ );
aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
aMenu.InsertSeparator();
- aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
+ aMenu.InsertItem( TBI_PRINT,
+ String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_PRINT ) )
+ );
aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
- aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
+ aMenu.InsertItem( TBI_BOOKMARKS,
+ String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS ) )
+ );
aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
- aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+ aMenu.InsertItem( TBI_SEARCHDIALOG,
+ String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
+ Image( SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+ );
aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
aMenu.InsertSeparator();
aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
@@ -3088,7 +3096,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
// INetURLObject aObj(aEntry);
// BOOL bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
- BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+ BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
if (bComplete)
sHelpURL = ::rtl::OUString(aEntry);
@@ -3490,3 +3498,4 @@ void SfxAddHelpBookmarkDialog_Impl::SetTitle( const String& rTitle )
aTitleED.SetSelection( Selection( 0, rTitle.Len() ) );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 1e0b83c2c5..268ca39141 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.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.
@@ -188,7 +189,7 @@ public:
inline void SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; }
void SetKeyword( const String& rKeyword );
sal_Bool HasKeyword() const;
- sal_Bool HasKeywordIgnoreCase(); //added by BerryJia for fixing Bug98251, 2002-12-11
+ sal_Bool HasKeywordIgnoreCase();
void OpenKeyword();
inline void SelectExecutableEntry() { aIndexCB.SelectExecutableEntry(); }
@@ -612,3 +613,4 @@ public:
#endif // #ifndef INCLUDED_SFX_NEWHELP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 5b07cc5404..2983783d10 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -217,113 +217,118 @@ Image IMG_HELP_TOOLBOX_INDEX_ON
ImageBitmap = Bitmap { File = "indexon_small.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_INDEX_OFF
{
ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_START
{
ImageBitmap = Bitmap { File = "sc06303.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_PREV
{
ImageBitmap = Bitmap { File = "sc06301.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_NEXT
{
ImageBitmap = Bitmap { File = "sc06300.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_PRINT
{
ImageBitmap = Bitmap { File = "sc05504.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_BOOKMARKS
{
ImageBitmap = Bitmap { File = "favourite.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_SEARCHDIALOG
{
ImageBitmap = Bitmap { File = "sc05961.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_COPY
{
ImageBitmap = Bitmap { File = "sc05711.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_CONTENT_BOOK_OPEN
{
ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; };
MASKCOLOR_MAGENTA
};
-Image IMG_HELP_CONTENT_BOOK_OPEN_HC
-{
- ImageBitmap = Bitmap { File = "hlpbookopen_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
+
Image IMG_HELP_CONTENT_BOOK_CLOSED
{
ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; };
MASKCOLOR_MAGENTA
};
-Image IMG_HELP_CONTENT_BOOK_CLOSED_HC
-{
- ImageBitmap = Bitmap { File = "hlpbookclosed_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
+
Image IMG_HELP_CONTENT_DOC
{
ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; };
MASKCOLOR_MAGENTA
};
-Image IMG_HELP_CONTENT_DOC_HC
-{
- ImageBitmap = Bitmap { File = "hlpdoc_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
String STR_HELP_WINDOW_TITLE
{
Text [ en-US ] = "%PRODUCTNAME Help";
};
+
String STR_HELP_BUTTON_INDEX_ON
{
Text [ en-US ] = "Show Navigation Pane";
};
+
String STR_HELP_BUTTON_INDEX_OFF
{
Text [ en-US ] = "Hide Navigation Pane";
};
+
String STR_HELP_BUTTON_START
{
Text [ en-US ] = "First Page";
};
+
String STR_HELP_BUTTON_PREV
{
Text [ en-US ] = "Previous Page";
};
+
String STR_HELP_BUTTON_NEXT
{
Text [ en-US ] = "Next Page";
};
+
String STR_HELP_BUTTON_PRINT
{
Text [ en-US ] = "Print...";
};
+
String STR_HELP_BUTTON_ADDBOOKMARK
{
Text [ en-US ] = "Add to Bookmarks...";
};
+
String STR_HELP_BUTTON_SEARCHDIALOG
{
Text [ en-US ] = "Find on this Page...";
};
+
String STR_HELP_BUTTON_SOURCEVIEW
{
Text [ en-US ] = "HTML Source";
@@ -333,18 +338,22 @@ String STR_HELP_FIRST_MESSAGE
{
Text [ en-US ] = "The Help is being started...";
};
+
String STR_HELP_FIRST_HTML
{
Text = "<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>";
};
+
String STR_HELP_MENU_TEXT_SELECTION_MODE
{
Text [ en-US ] = "Select Text";
};
+
String STR_HELP_MENU_TEXT_COPY
{
Text [ en-US ] = "~Copy" ;
};
+
ModalDialog DLG_HELP_ADDBOOKMARK
{
HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK";
@@ -440,144 +449,60 @@ InfoBox RID_INFO_NOSEARCHTEXTFOUND
Message [ en-US ] = "The text you entered was not found.";
};
-Image IMG_HELP_TOOLBOX_HC_INDEX_ON
-{
- ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_INDEX_OFF
-{
- ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_START
-{
- ImageBitmap = Bitmap { File = "sch06303.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PREV
-{
- ImageBitmap = Bitmap { File = "sch06301.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_NEXT
-{
- ImageBitmap = Bitmap { File = "sch06300.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PRINT
-{
- ImageBitmap = Bitmap { File = "sch05504.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_BOOKMARKS
-{
- ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG
-{
- ImageBitmap = Bitmap { File = "sch05961.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_COPY
-{
- ImageBitmap = Bitmap { File = "sch05711.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-
Image IMG_HELP_TOOLBOX_L_INDEX_ON
{
ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_INDEX_OFF
{
ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_START
{
ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_PREV
{
ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_NEXT
{
ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_PRINT
{
ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_BOOKMARKS
{
ImageBitmap = Bitmap { File = "favourite_big.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
{
ImageBitmap = Bitmap { File = "lc05961.bmp" ; };
MASKCOLOR_MAGENTA
};
+
Image IMG_HELP_TOOLBOX_L_COPY
{
ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
MASKCOLOR_MAGENTA
};
-Image IMG_HELP_TOOLBOX_HCL_INDEX_ON
-{
- ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF
-{
- ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_START
-{
- ImageBitmap = Bitmap { File = "lch06303.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PREV
-{
- ImageBitmap = Bitmap { File = "lch06301.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_NEXT
-{
- ImageBitmap = Bitmap { File = "lch06300.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PRINT
-{
- ImageBitmap = Bitmap { File = "lch05504.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS
-{
- ImageBitmap = Bitmap { File = "favourite_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG
-{
- ImageBitmap = Bitmap { File = "lch05961.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_COPY
-{
- ImageBitmap = Bitmap { File = "lch05711.bmp" ; };
- MASKCOLOR_MAGENTA
-};
-
CheckBox RID_HELP_ONSTARTUP_BOX
{
HelpId = HID_HELP_ONSTARTUP_BOX;
@@ -585,8 +510,8 @@ CheckBox RID_HELP_ONSTARTUP_BOX
TabStop = TRUE;
Size = MAP_APPFONT ( 200 , 10 ) ;
};
+
String RID_HELP_ONSTARTUP_TEXT
{
Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
};
-
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 8ed5132f8a..024fc208de 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.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.
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 2f1afe28b8..fb48cd708d 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.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.
@@ -48,3 +49,5 @@ namespace sfx2
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7493f9c706..dd824a30ff 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.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.
@@ -49,6 +50,8 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
#include <svtools/helpopt.hxx>
@@ -87,12 +90,11 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::system;
#define ERROR_TAG String( DEFINE_CONST_UNICODE("Error: ") )
#define PATH_TAG String( DEFINE_CONST_UNICODE("\nPath: ") )
-// class NoHelpErrorBox --------------------------------------------------
-
class NoHelpErrorBox : public ErrorBox
{
public:
@@ -113,8 +115,6 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
// do nothing, because no help available
}
-// -----------------------------------------------------------------------
-
#define STARTERLIST 0
rtl::OUString HelpLocaleString()
@@ -124,7 +124,7 @@ rtl::OUString HelpLocaleString()
{
// detect installed locale
Any aLocale =
- ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty(
+ ::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty(
::utl::ConfigManager::LOCALE );
aLocale >>= aLocaleStr;
bool bOk = aLocaleStr.getLength() != 0;
@@ -181,22 +181,16 @@ void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
}
-// -----------------------------------------------------------------------
-
sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
{
sal_Bool bRet = sal_False;
::rtl::OUString sAnchor;
- // --> OD 2009-07-01 #159496#
- // do not release solar mutex due to crash regarding accessibility
-// ULONG nSolarCount = Application::ReleaseSolarMutex();
- // <--
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
- if ( ( aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "AnchorName" ) ) >>= sAnchor ) )
+ if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) )
{
if ( sAnchor.getLength() > 0 )
@@ -213,15 +207,10 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
catch( ::com::sun::star::uno::Exception& )
{
}
- // --> OD 2009-07-01 #159496#
-// Application::AcquireSolarMutex( nSolarCount );
- // <--
return bRet;
}
-// -----------------------------------------------------------------------
-
class SfxHelpOptions_Impl : public utl::ConfigItem
{
private:
@@ -254,8 +243,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
return aNames;
}
-// -----------------------------------------------------------------------
-
SfxHelpOptions_Impl::SfxHelpOptions_Impl()
: ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
{
@@ -317,7 +304,14 @@ void SfxHelpOptions_Impl::Commit()
{
}
-// class SfxHelp_Impl ----------------------------------------------------
+
+void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
+void SfxHelpOptions_Impl::Commit()
+{
+}
class SfxHelp_Impl
{
@@ -723,7 +717,7 @@ String SfxHelp::GetHelpModuleName_Impl()
xCont->getByName( aModuleIdentifier ) >>= lProps;
for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
{
- if ( lProps[i].Name.equalsAscii("ooSetupFactoryShortName") )
+ if ( lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")) )
{
lProps[i].Value >>= aFactoryShortName;
break;
@@ -740,26 +734,26 @@ String SfxHelp::GetHelpModuleName_Impl()
if ( aFactoryShortName.getLength() > 0 )
{
// Map some module identifiers to their "real" help module string.
- if ( aFactoryShortName.equalsAscii( "chart2" ) )
+ if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart2")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
- else if ( aFactoryShortName.equalsAscii( "BasicIDE" ) )
+ else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BasicIDE")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
- else if ( aFactoryShortName.equalsAscii( "sweb" )
- || aFactoryShortName.equalsAscii( "sglobal" )
- || aFactoryShortName.equalsAscii( "swxform" ) )
+ else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swxform")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" ) );
- else if ( aFactoryShortName.equalsAscii( "dbquery" )
- || aFactoryShortName.equalsAscii( "dbbrowser" )
- || aFactoryShortName.equalsAscii( "dbrelation" )
- || aFactoryShortName.equalsAscii( "dbtable" )
- || aFactoryShortName.equalsAscii( "dbapp" )
- || aFactoryShortName.equalsAscii( "dbreport" )
- || aFactoryShortName.equalsAscii( "swreport" )
- || aFactoryShortName.equalsAscii( "dbbrowser" )
- || aFactoryShortName.equalsAscii( "swform" ) )
+ else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbquery"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbrelation"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbtable"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbapp"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbreport"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swreport"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swform")) )
aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sdatabase" ) );
- else if ( aFactoryShortName.equalsAscii( "sbibliography" )
- || aFactoryShortName.equalsAscii( "StartModule" ) )
+ else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbibliography"))
+ || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StartModule")) )
aFactoryShortName = sDefaultModule;
}
else
@@ -917,13 +911,43 @@ BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const Strin
String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
AppendConfigToken_Impl( aHelpRootURL, sal_True );
Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
- if ( 0 == aFactories.getLength() )
+
+ return ( aFactories.getLength() != 0 );
+}
+
+/// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
+static bool impl_showOnlineHelp( const String& rURL )
+{
+ String aInternal( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
+ if ( rURL.Len() <= aInternal.Len() || rURL.Copy( 0, aInternal.Len() ) != aInternal )
+ return false;
+
+ rtl::OUString aHelpLink( RTL_CONSTASCII_USTRINGPARAM( "http://help.libreoffice.org/" ) );
+ aHelpLink += rURL.Copy( aInternal.Len() );
+ try
{
- // no factories -> no help -> error message and return
- NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
- aErrBox.Execute();
- return FALSE;
+ Reference< XSystemShellExecute > xSystemShell(
+ ::comphelper::getProcessServiceFactory()->createInstance(
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
+ UNO_QUERY );
+
+ if ( xSystemShell.is() )
+ {
+ xSystemShell->execute( aHelpLink, rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
+ return true;
+ }
}
+ catch( const Exception& )
+ {
+ }
+ return false;
+}
+
+BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
+{
+ String aHelpURL( rURL );
+ INetURLObject aParser( aHelpURL );
+ INetProtocol nProtocol = aParser.GetProtocol();
/* rURL may be
- a "real" URL
@@ -973,6 +997,18 @@ BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const Strin
}
}
+ if ( !impl_hasHelpInstalled() )
+ {
+ if ( impl_showOnlineHelp( aHelpURL ) )
+ return TRUE;
+ else
+ {
+ NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+ aErrBox.Execute();
+ return FALSE;
+ }
+ }
+
Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
@@ -1041,7 +1077,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
URL aURL;
aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY );
xTrans->parseStrict(aURL);
Reference < XFrame > xCurrentFrame;
@@ -1054,7 +1090,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
Reference< XDispatch > xHelpDispatch;
if ( xDispProv.is() )
xHelpDispatch = xDispProv->queryDispatch(
- aURL, ::rtl::OUString::createFromAscii("_helpagent"),
+ aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_helpagent")),
FrameSearchFlag::PARENT | FrameSearchFlag::SELF );
DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" );
@@ -1078,3 +1114,4 @@ String SfxHelp::GetDefaultHelpModule()
return getCurrentModuleIdentifier_Impl();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index af3f346b2b..7d9ea18a3d 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.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.
@@ -219,17 +220,17 @@ void SfxPickList::CreatePickListEntries()
{
RemovePickListEntries();
- // Einlesen der Pickliste
+ // Reading the pick list
Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
- sal_uInt32 nCount = seqPicklist.getLength();
- sal_uInt32 nEntries = ::std::min( m_nAllowedMenuSize, nCount );
+ sal_uInt32 nCount = seqPicklist.getLength();
+ sal_uInt32 nEntries = ::std::min( m_nAllowedMenuSize, nCount );
for( sal_uInt32 nItem=0; nItem < nEntries; ++nItem )
{
Sequence< PropertyValue > seqPropertySet = seqPicklist[ nItem ];
- INetURLObject aURL;
+ INetURLObject aURL;
::rtl::OUString sURL;
::rtl::OUString sFilter;
::rtl::OUString sTitle;
@@ -356,7 +357,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.IsA( TYPE( SfxEventHint )))
{
SfxEventHint* pEventHint = PTR_CAST(SfxEventHint,&rHint);
- // nur ObjectShell-bezogene Events mit Medium interessieren
+ // only ObjectShell-related events with media interest
SfxObjectShell* pDocSh = pEventHint->GetObjShell();
if( !pDocSh )
return;
@@ -392,12 +393,12 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( !pMed )
return;
- // unbenannt-Docs und embedded-Docs nicht in History
+ // Unnamed Documents and embedded-Documents not in History
if ( !pDocSh->HasName() ||
SFX_CREATE_MODE_STANDARD != pDocSh->GetCreateMode() )
return;
- // Hilfe nicht in History
+ // Help not in History
INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) );
if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
return;
@@ -423,12 +424,12 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( !pMed )
return;
- // unbenannt-Docs und embedded-Docs nicht in Pickliste
+ // Unnamed Documents and embedded-Documents not im Pickliste
if ( !pDocSh->HasName() ||
SFX_CREATE_MODE_STANDARD != pDocSh->GetCreateMode() )
return;
- // Hilfe nicht in History
+ // Help not in History
INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) );
if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
return;
@@ -471,3 +472,5 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 142602ca58..887cc4c73c 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.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,7 +32,7 @@
#include <shutdownicon.hxx>
#include <app.hrc>
#include <sfx2/app.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/miscopt.hxx>
// #include <cmdlineargs.hxx>
@@ -52,9 +53,7 @@
#include <com/sun/star/document/UpdateDocMode.hpp>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/fcontnr.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <cppuhelper/compbase1.hxx>
#include <sfx2/dispatch.hxx>
#include <comphelper/extract.hxx>
@@ -275,7 +274,7 @@ void ShutdownIcon::OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString&
aDispatchURL.Complete = aURL;
Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
- ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+ ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
com::sun::star::uno::UNO_QUERY );
if ( xURLTransformer.is() )
{
@@ -306,7 +305,7 @@ void ShutdownIcon::FileOpen()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
EnterModalMode();
getInstance()->StartFileDialog();
}
@@ -325,7 +324,7 @@ void ShutdownIcon::FromTemplate()
URL aTargetURL;
aTargetURL.Complete = OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:5500" ) );
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aTargetURL );
Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
@@ -335,14 +334,14 @@ void ShutdownIcon::FromTemplate()
if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
else
- xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_blank"), 0 );
+ xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0 );
}
if ( xDisp.is() )
{
Sequence<PropertyValue> aArgs(1);
PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= ::rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
if ( xNotifyer.is() )
{
@@ -359,7 +358,7 @@ void ShutdownIcon::FromTemplate()
#include <tools/rcid.h>
OUString ShutdownIcon::GetResString( int id )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
if( ! m_pResMgr )
m_pResMgr = SfxResId::GetResMgr();
@@ -376,7 +375,7 @@ OUString ShutdownIcon::GetResString( int id )
OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
return OUString( SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ) );
}
@@ -385,7 +384,7 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
void ShutdownIcon::StartFileDialog()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
bool bDirty = ( m_bSystemDialogs != static_cast<bool>(SvtMiscOptions().UseSystemFileDialog()) );
@@ -429,18 +428,18 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
Sequence< PropertyValue > aArgs(3);
Reference < com::sun::star::task::XInteractionHandler > xInteraction(
- ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii("com.sun.star.task.InteractionHandler") ),
+ ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ),
com::sun::star::uno::UNO_QUERY );
- aArgs[0].Name = OUString::createFromAscii( "InteractionHandler" );
+ aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler"));
aArgs[0].Value <<= xInteraction;
sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG;
- aArgs[1].Name = OUString::createFromAscii( "MacroExecutionMode" );
+ aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
aArgs[1].Value <<= nMacroExecMode;
sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
- aArgs[2].Name = OUString::createFromAscii( "UpdateDocMode" );
+ aArgs[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateDocMode"));
aArgs[2].Value <<= nUpdateDoc;
// pb: #102643# use the filedlghelper to get the current filter name,
@@ -462,7 +461,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( bReadOnly )
{
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString::createFromAscii( "ReadOnly" );
+ aArgs[nArgs-1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
aArgs[nArgs-1].Value <<= bReadOnly;
}
@@ -477,7 +476,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
sal_Int16 uVersion = (sal_Int16)iVersion;
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString::createFromAscii( "Version" );
+ aArgs[nArgs-1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Version"));
aArgs[nArgs-1].Value <<= uVersion;
}
@@ -502,7 +501,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( aFilterName.getLength() )
{
aArgs.realloc( ++nArgs );
- aArgs[nArgs-1].Name = OUString::createFromAscii( "FilterName" );
+ aArgs[nArgs-1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
aArgs[nArgs-1].Value <<= aFilterName;
}
}
@@ -514,7 +513,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
{
OUString aBaseDirURL = sFiles[0];
if ( aBaseDirURL.getLength() > 0 && aBaseDirURL[aBaseDirURL.getLength()-1] != '/' )
- aBaseDirURL += OUString::createFromAscii("/");
+ aBaseDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
int iFiles;
for ( iFiles = 1; iFiles < nFiles; iFiles++ )
@@ -579,19 +578,16 @@ void ShutdownIcon::terminateDesktop()
return;
// always remove ourselves as listener
- xDesktop->removeTerminateListener( pInst );
pInst->m_bListenForTermination = true;
+ xDesktop->removeTerminateListener( pInst );
// terminate desktop only if no tasks exist
Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY );
if ( xSupplier.is() )
{
Reference< XIndexAccess > xTasks ( xSupplier->getFrames(), UNO_QUERY );
- if( xTasks.is() )
- {
- if( xTasks->getCount() < 1 )
- xDesktop->terminate();
- }
+ if( xTasks.is() && xTasks->getCount() < 1 )
+ new IdleTerminate( xDesktop );
}
// remove the instance pointer
@@ -629,7 +625,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
{
// access resource system and sfx only protected by solarmutex
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aSolarGuard;
ResMgr *pResMgr = SfxResId::GetResMgr();
::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -781,12 +777,20 @@ bool ShutdownIcon::IsQuickstarterInstalled()
// ---------------------------------------------------------------------------
#if defined (ENABLE_QUICKSTART_APPLET) && defined (UNX)
-static OUString getDotAutostart( bool bCreate = false )
+/**
+* Return the XDG autostart directory.
+* http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+* Available in Unix and with Quickstart enabled.
+* @param bCreate Create the directory if it does not exist yet.
+* @return OUString containing the autostart directory path.
+*/
+static OUString getAutostartDir( bool bCreate = false )
{
OUString aShortcut;
const char *pConfigHome;
if( (pConfigHome = getenv("XDG_CONFIG_HOME") ) )
- aShortcut = OStringToOUString( OString( pConfigHome ), RTL_TEXTENCODING_UTF8 );
+ aShortcut = OStringToOUString( OString( pConfigHome ),
+ RTL_TEXTENCODING_UTF8 );
else
{
OUString aHomeURL;
@@ -815,7 +819,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
ResMgr* pMgr = SfxResId::GetResMgr();
if( pMgr )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
aShortcutName = OUString( aRes );
}
@@ -826,7 +830,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\" ) );
aShortcut += aShortcutName;
#else // UNX
- OUString aShortcut = getDotAutostart();
+ OUString aShortcut = getAutostartDir();
aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "/qstart.desktop" ) );
#endif // UNX
return aShortcut;
@@ -846,7 +850,7 @@ bool ShutdownIcon::GetAutostart( )
OUString aShortcutUrl;
osl::File::getFileURLFromSystemPath( aShortcut, aShortcutUrl );
osl::File f( aShortcutUrl );
- osl::File::RC error = f.open( OpenFlag_Read );
+ osl::File::RC error = f.open( osl_File_OpenFlag_Read );
if( error == osl::File::E_None )
{
f.close();
@@ -867,7 +871,7 @@ void ShutdownIcon::SetAutostart( bool bActivate )
#ifdef WNT
EnableAutostartW32( aShortcut );
#else // UNX
- getDotAutostart( true );
+ getAutostartDir( true );
OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) );
Bootstrap::expandMacros( aPath );
@@ -879,10 +883,11 @@ void ShutdownIcon::SetAutostart( bool bActivate )
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
- {
- unlink(aShortcutUnx);
- symlink(aDesktopFileUnx, aShortcutUnx);
+ if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ {
+ unlink(aShortcutUnx);
+ int ret = symlink(aDesktopFileUnx, aShortcutUnx);
+ (void)ret; //deliberately ignore return value, it's non-critical if it fails
}
ShutdownIcon *pIcon = ShutdownIcon::createInstance();
@@ -963,3 +968,5 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32
return aValue;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index cc18016e33..09fc15f1ce 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef __SHUTDOWNICON_HXX__
#define __SHUTDOWNICON_HXX__
@@ -12,12 +13,8 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-#ifndef _RTL_STRING_HXX
#include <rtl/string.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#include <osl/mutex.hxx>
#include <osl/module.hxx>
#include <sfx2/sfxuno.hxx>
@@ -173,3 +170,5 @@ extern "C" {
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
index a4595949b1..653e89c4d0 100644
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ b/sfx2/source/appl/shutdowniconOs2.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.
@@ -92,3 +93,4 @@ bool ShutdownIcon::GetAutostartOs2( )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 14f12c79b5..8ce1927f80 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -34,8 +34,9 @@
#include "tools/urlobj.hxx"
#include "osl/file.h"
#include "comphelper/sequenceashashmap.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "sfx2/app.hxx"
+#include <sal/macros.h>
#include "app.hrc"
#define USE_APP_SHORTCUTS
#include "shutdownicon.hxx"
@@ -385,7 +386,7 @@ extern "C"
void aqua_init_systray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
if( ! pShutdownIcon )
@@ -454,7 +455,7 @@ void aqua_init_systray()
}
// insert the menu entries for launching the applications
- for ( size_t i = 0; i < sizeof( aMenuItems ) / sizeof( aMenuItems[0] ); ++i )
+ for ( size_t i = 0; i < SAL_N_ELEMENTS( aMenuItems ); ++i )
{
if ( !aModuleOptions.IsModuleInstalled( aMenuItems[i].eModuleIdentifier ) )
// the complete application is not even installed
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index b9799f5818..7e3aa09347 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifdef ENABLE_QUICKSTART_APPLET
@@ -7,19 +8,20 @@
#include <gtk/gtk.h>
#include <glib.h>
-#include <eggtray/eggtrayicon.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bmpacc.hxx>
#include <sfx2/app.hxx>
-#ifndef _SFX_APP_HRC
#include "app.hrc"
-#endif
#ifndef __SHUTDOWNICON_HXX__
#define USE_APP_SHORTCUTS
#include "shutdownicon.hxx"
#endif
+#ifdef ENABLE_GIO
+#include <gio/gio.h>
+#endif
+
// Cut/paste from vcl/inc/svids.hrc
#define SV_ICON_SMALL_START 25000
@@ -36,9 +38,13 @@ using namespace ::rtl;
using namespace ::osl;
static ResMgr *pVCLResMgr;
-static EggTrayIcon *pTrayIcon;
+static GtkStatusIcon* pTrayIcon;
static GtkWidget *pExitMenuItem = NULL;
static GtkWidget *pOpenMenuItem = NULL;
+static GtkWidget *pDisableMenuItem = NULL;
+#ifdef ENABLE_GIO
+GFileMonitor* pMonitor = NULL;
+#endif
static void open_url_cb( GtkWidget *, gpointer data )
{
@@ -66,9 +72,10 @@ static void systray_disable_cb()
static void exit_quickstarter_cb( GtkWidget * )
{
- egg_tray_icon_cancel_message (pTrayIcon, 1 );
- ShutdownIcon::getInstance()->terminateDesktop();
plugin_shutdown_sys_tray();
+ //terminate may cause this .so to be unloaded. So we must be hands off
+ //all calls into this .so after this call
+ ShutdownIcon::terminateDesktop();
}
static void menu_deactivate_cb( GtkWidget *pMenu )
@@ -89,7 +96,8 @@ static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
g_return_val_if_fail( pSalBitmap != NULL, NULL );
Size aSize( pSalBitmap->Width(), pSalBitmap->Height() );
- g_return_val_if_fail( Size( pSalAlpha->Width(), pSalAlpha->Height() ) == aSize, NULL );
+ if (pSalAlpha)
+ g_return_val_if_fail( Size( pSalAlpha->Width(), pSalAlpha->Height() ) == aSize, NULL );
int nX, nY;
guchar *pPixbufData = ( guchar * )g_malloc( 4 * aSize.Width() * aSize.Height() );
@@ -265,7 +273,7 @@ static void populate_menu( GtkWidget *pMenu )
pMenuItem = gtk_separator_menu_item_new();
gtk_menu_shell_append( pMenuShell, pMenuItem );
- (void) add_image_menu_item
+ pDisableMenuItem = add_image_menu_item
( pMenuShell, GTK_STOCK_CLOSE,
pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ),
G_CALLBACK( systray_disable_cb ) );
@@ -289,30 +297,7 @@ static void refresh_menu( GtkWidget *pMenu )
bool bModal = ShutdownIcon::bModalMode;
gtk_widget_set_sensitive( pExitMenuItem, !bModal);
gtk_widget_set_sensitive( pOpenMenuItem, !bModal);
-}
-
-extern "C" {
-static void
-layout_menu( GtkMenu *menu,
- gint *x, gint *y, gboolean *push_in,
- gpointer )
-{
- GtkRequisition req;
- GtkWidget *ebox = GTK_BIN( pTrayIcon )->child;
-
- gtk_widget_size_request( GTK_WIDGET( menu ), &req );
- gdk_window_get_origin( ebox->window, x, y );
-
- (*x) += ebox->allocation.x;
- (*y) += ebox->allocation.y;
-
- if (*y >= gdk_screen_get_height (gtk_widget_get_screen (ebox)) / 2)
- (*y) -= req.height;
- else
- (*y) += ebox->allocation.height;
-
- *push_in = TRUE;
-}
+ gtk_widget_set_sensitive( pDisableMenuItem, !bModal);
}
static gboolean display_menu_cb( GtkWidget *,
@@ -336,26 +321,36 @@ static gboolean display_menu_cb( GtkWidget *,
refresh_menu( pMenu );
gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
- layout_menu, NULL, 0, event->time );
+ gtk_status_icon_position_menu, pTrayIcon,
+ 0, event->time );
return TRUE;
}
-extern "C" {
- static gboolean
- show_at_idle( gpointer )
- {
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
- gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
- return FALSE;
- }
+#ifdef ENABLE_GIO
+/*
+ * See rhbz#610103. If the quickstarter is running, then LibreOffice is
+ * upgraded, then the old quickstarter is still running, but is now unreliable
+ * as the old install has been deleted. A fairly intractable problem but we
+ * can avoid much of the pain if we turn off the quickstarter if we detect
+ * that it has been physically deleted.
+*/
+static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+ GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+{
+ if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+ exit_quickstarter_cb(NULL);
}
+#endif
void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
- if( !g_type_from_name( "GdkDisplay" ) )
+ if( /* need gtk_status to resolve */
+ (gtk_check_version( 2, 10, 0 ) != NULL) ||
+ /* we need the vcl plugin and mainloop initialized */
+ !g_type_from_name( "GdkDisplay" ) )
return;
OString aLabel;
@@ -365,45 +360,65 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
pShutdownIcon->GetResString( STR_QUICKSTART_TIP ),
RTL_TEXTENCODING_UTF8 );
- pTrayIcon = egg_tray_icon_new( aLabel );
-
- GtkWidget *pParent = gtk_event_box_new();
- GtkTooltips *pTooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip( GTK_TOOLTIPS( pTooltips ), pParent, aLabel, NULL );
-
- GtkWidget *pIconImage = gtk_image_new();
- gtk_container_add( GTK_CONTAINER( pParent ), pIconImage );
-
pVCLResMgr = CREATEVERSIONRESMGR( vcl );
GdkPixbuf *pPixbuf = ResIdToPixbuf( SV_ICON_ID_OFFICE );
gtk_image_set_from_pixbuf( GTK_IMAGE( pIconImage ), pPixbuf );
g_object_unref( pPixbuf );
+ g_object_set (pTrayIcon, "title", aLabel.getStr(),
+ "tooltip_text", aLabel.getStr(), NULL);
+
GtkWidget *pMenu = gtk_menu_new();
g_signal_connect (pMenu, "deactivate",
G_CALLBACK (menu_deactivate_cb), NULL);
- g_signal_connect( pParent, "button_press_event",
- G_CALLBACK( display_menu_cb ), pMenu );
- gtk_container_add( GTK_CONTAINER( pTrayIcon ), pParent );
-
- // Show at idle to avoid artefacts at startup
- g_idle_add (show_at_idle, (gpointer) pTrayIcon);
+ g_signal_connect(pTrayIcon, "button_press_event",
+ G_CALLBACK(display_menu_cb), pMenu);
// disable shutdown
pShutdownIcon->SetVeto( true );
pShutdownIcon->addTerminateListener();
+
+#ifdef ENABLE_GIO
+ GFile* pFile = NULL;
+ rtl::OUString sLibraryFileUrl;
+ if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
+ pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+
+ if (pFile)
+ {
+ if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, NULL, NULL)))
+ g_signal_connect(pMonitor, "changed", (GCallback)notify_file_changed, NULL);
+ g_object_unref(pFile);
+ }
+#endif
}
void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ ::SolarMutexGuard aGuard;
if( !pTrayIcon )
return;
- gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
+
+#ifdef ENABLE_GIO
+ if (pMonitor)
+ {
+ g_signal_handlers_disconnect_by_func(pMonitor,
+ (void*)notify_file_changed, pMonitor);
+ g_file_monitor_cancel(pMonitor);
+ g_object_unref(pMonitor);
+ pMonitor = NULL;
+ }
+#endif
+
+ g_object_unref(pTrayIcon);
pTrayIcon = NULL;
+
pExitMenuItem = NULL;
pOpenMenuItem = NULL;
+ pDisableMenuItem = NULL;
}
#endif // ENABLE_QUICKSTART_APPLET
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 9e260fdc85..7c42b3e997 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.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,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
+#include <sal/macros.h>
#ifdef WNT
@@ -250,7 +252,7 @@ static HMENU createSystrayMenu( )
OUString aEmpty;
// insert the menu entries for launching the applications
- for ( size_t i = 0; i < sizeof( aMenuItems ) / sizeof( aMenuItems[0] ); ++i )
+ for ( size_t i = 0; i < SAL_N_ELEMENTS( aMenuItems ); ++i )
{
if ( !aModuleOptions.IsModuleInstalled( aMenuItems[i].eModuleIdentifier ) )
// the complete application is not even installed
@@ -493,7 +495,7 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
static sal_Bool checkOEM() {
Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
Reference<XJob> rOemJob(rFactory->createInstance(
- OUString::createFromAscii("com.sun.star.office.OEMPreloadJob")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.OEMPreloadJob"))),
UNO_QUERY );
Sequence<NamedValue> args;
sal_Bool bResult = sal_False;
@@ -975,3 +977,4 @@ void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut )
#endif // WNT
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 06083e5013..fac30fece6 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.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,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
-
#include <stdio.h>
#include <hash_map>
@@ -141,6 +139,7 @@ static const ResIdToResName pToolBarResToName[] =
{ 23031, "mediaobjectbar" }, //draw/impress
{ 25060, "mediaobjectbar" }, //calc
{ 23311, "mediaobjectbar" }, //writer
+ { 23313, "navigationobjectbar" }, //writer
{ 0, "" }
};
@@ -149,11 +148,11 @@ DBG_NAME(SfxWorkWindow)
//SV_IMPL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl );
//====================================================================
-// Sortiert die Children nach ihrem Alignment
-// Reihenfolge entspricht der im enum SfxChildAlignment (->CHILDWIN.HXX).
+// Sort the Children according their alignment
+// The order corresponds to the enum SfxChildAlignment (->CHILDWIN.HXX).
//
-// Hilfe, um die "Anderungen am Alignment kompatibal zu machen!
+// Help to make changes to the alignment compatible!
SFX_IMPL_XINTERFACE_3( LayoutManagerListener, OWeakObject, ::com::sun::star::frame::XLayoutManagerListener, ::com::sun::star::lang::XEventListener, ::com::sun::star::lang::XComponent )
@@ -173,7 +172,7 @@ LayoutManagerListener::~LayoutManagerListener()
void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pWrkWin && !m_bHasFrame )
{
m_xFrame = xFrame;
@@ -238,7 +237,7 @@ throw (::com::sun::star::uno::RuntimeException)
void SAL_CALL LayoutManagerListener::dispose()
throw( css::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// reset member
m_pWrkWin = 0;
@@ -285,7 +284,7 @@ void SAL_CALL LayoutManagerListener::disposing(
const css::lang::EventObject& )
throw( css::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pWrkWin = 0;
m_bHasFrame = sal_False;
m_xFrame = css::uno::Reference< css::frame::XFrame >();
@@ -300,7 +299,7 @@ void SAL_CALL LayoutManagerListener::layoutEvent(
const css::uno::Any& )
throw (css::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pWrkWin )
{
if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
@@ -527,7 +526,7 @@ void SfxWorkWindow::Sort_Impl()
{
USHORT k;
for (k=0; k<aSortedList.Count(); k++)
-// if ( (*pChilds)[aSortedList[k]]->eAlign > pCli->eAlign )
+// if ( (*pChilds)[aSortedList[k]]->eAlign > pCli->eAlign )
if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
ChildAlignValue(pCli->eAlign))
break;
@@ -540,7 +539,7 @@ void SfxWorkWindow::Sort_Impl()
//====================================================================
-// ctor f"ur workwin eines Frames
+// constructor for workwin of a Frame
SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster )
: SfxWorkWindow(
@@ -558,11 +557,11 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
bInternalDockingAllowed = sal_True;
}
- // Die ben"otigten SplitWindows (je eins f"ur jede Seite) werden erzeugt
+ // The required split windows (one for each side) can be created
for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
- // Die SplitWindows sind direkte ChildWindows des WorkWindows und enthalten
- // die angedockten Fenster.
+ // The SplitWindows excludes direct ChildWindows of the WorkWindows
+ // and receives the docked window.
SfxChildAlignment eAlign =
( n == SFX_SPLITWINDOWS_LEFT ? SFX_ALIGN_LEFT :
@@ -579,7 +578,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
}
//====================================================================
-// ctor der Basisklasse
+// Constructor of the base class
SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) :
pParent( pParentWorkwin ),
@@ -609,8 +608,8 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
pChildWins = new SfxChildWindows_Impl;
pChilds = new SfxChildList_Impl;
- // F"ur die ObjectBars wird ein fester Platz in der ChildList reserviert,
- // damit sie immer in einer definierten Reihenfolge kommen.
+ // For the ObjectBars a integral place in the Childlist is reserved,
+ // so that they always come in a defined order.
SfxChild_Impl* pChild=0;
for (USHORT n=0; n < SFX_OBJECTBAR_MAX; ++n)
pChilds->Insert(0,pChild);
@@ -625,13 +624,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
}
//====================================================================
-// dtor
+// Destructor
SfxWorkWindow::~SfxWorkWindow()
{
DBG_DTOR(SfxWorkWindow, 0);
- // SplitWindows l"oschen
+ // Delete SplitWindows
for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
SfxSplitWindow *p = pSplit[n];
@@ -640,7 +639,7 @@ SfxWorkWindow::~SfxWorkWindow()
delete p;
}
- // Hilfsstruktur f"ur Child-Windows l"oschen
+ // Delete help structure for Child-Windows
DBG_ASSERT( pChilds->Count() == 0, "dangling childs" );
delete pChilds;
delete pChildWins;
@@ -705,17 +704,17 @@ void SfxWorkWindow::SaveStatus_Impl()
}
//--------------------------------------------------------------------
-// Hilfsmethode zum Freigeben der Childlisten. Wenn danach nicht der dtor
-// aufgerufen wird, sondern weiter gearbeitet wird, mu\s wie im ctor von
-// SfxWorkWindow noch Platz f"ur die Objectbars und SplitWindows reserviert
-// werden.
+// Helper method to release the child lists. Should the destructor not be
+// called after this, instead work continues, then space for the object bars
+// and split windows has to be reserved in the same way as in the constructor
+// of SfxWorkWindow.
void SfxWorkWindow::DeleteControllers_Impl()
{
DBG_CHKTHIS(SfxWorkWindow, 0);
- // SplitWindows locken (d.h. Resize-Reaktion an den
- // DockingWindows unterdr"ucken)
+ // Lock SplitWindows (which means supressing the Resize-Reaction of the
+ // DockingWindows)
USHORT n;
for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
@@ -724,7 +723,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
p->Lock();
}
- // Child-Windows l"oschen
+ // Delete Child-Windows
for ( n=0; n<pChildWins->Count(); )
{
SfxChildWin_Impl* pCW = (*pChildWins)[n];
@@ -740,10 +739,10 @@ void SfxWorkWindow::DeleteControllers_Impl()
*/
pChild->Hide();
- // Wenn das ChildWindow ein direktes Childfenster ist und nicht
- // in einem SplitWindow liegt, am WorkWindow abmelden.
- // Nach TH ist eine Abmeldung am Splitwindow nicht erforderlich,
- // wenn dieses auch gleich mit zerst"ort wird (s.u.).
+ // If the child window is a direct child window and not in a
+ // SplitWindow, cancel it at the workwindow.
+ // After TH a cancellation on the SplitWindow is not necessary
+ // since this window is also destroyed (see below).
if (pCW->pCli)
ReleaseChild_Impl(*pChild->GetWindow());
pCW->pWin = 0;
@@ -783,21 +782,22 @@ void SfxWorkWindow::DeleteControllers_Impl()
{
xLayoutManager->reset();
- // StatusBar l"oschen
+ // Delete StatusBar
ResetStatusBar_Impl();
- // ObjectBars l"oschen( zuletzt, damit pChilds nicht tote Pointer enh"alt )
+ // Delete ObjectBars (this is done last, so that pChilds does not
+ // receive dead Pointers)
for ( USHORT i = 0; i < aObjBarList.size(); i++ )
{
- // Nicht jede Position mu\s belegt sein
+ // Not every position must be occupied
USHORT nId = aObjBarList[i].nId;
if ( nId )
aObjBarList[i].nId = 0;
}
}
- // ObjectBars werden alle auf einmal released, da sie einen
- // festen zusammenh"angenden Bereich im Array pChilds belegen
+ // ObjectBars are all released at once, since they occupy a
+ // fixed contiguous area in the array pChild
pChilds->Remove(0, SFX_OBJECTBAR_MAX);
bSorted = FALSE;
@@ -805,7 +805,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
}
//====================================================================
-// Virtuelle Methode zum Anordnen der Childfenster.
+// Virtual method for placing the child window.
void SfxWorkWindow::ArrangeChilds_Impl( BOOL /*bForce*/)
{
@@ -835,16 +835,14 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( BOOL bForce )
if ( IsVisible_Impl() )
aBorder = Arrange_Impl();
}
-
- // Wenn das aktuelle Dokument der Applikation einen IPClient enth"alt, mu\s
- // dem dazugeh"origen Objekt durch SetTopToolFramePixel der zur Verf"ugung
- // stehende Platz zugeteilt werden. Das Objekt zeigt dann seine UITools an
- // und setzt den App-Border(->SfxInPlaceEnv_Impl::ArrangeChilds_Impl()).
- // Anderenfalls wird hier direkt der AppBorder gesetzt, um evtl. den Border
- // zu "uberschreiben, den bisher ein Objekt aus einem anderen Dokument
- // gesetzt hatte.
- // Das Objekt setzt, wenn es seine UI-Tools wegnimmt, den SetAppBorder nicht,
- // damit kein ObjectBar-Zappeln entsteht.
+ // If the current application document contains a IPClient, then the
+ // object through SetTopToolFramePixel has to be assigned the available
+ // space. The object will then point to its UITools and sets the app border
+ // (-> SfxInPlaceEnv_Impl:: ArrangeChilds_Impl ()). Otherwise the
+ // app border is set here directly to possibly overwrite the Border that
+ // was set by an object from another document. The object does not set
+ // the SetAppBorder when it removes its UI tools so that no-dithering
+ // ObjectBar arises.
// (->SfxInPlaceEnv_Impl::ArrangeChilds_Impl())
pMasterFrame->SetToolSpaceBorderPixel_Impl( aBorder );
@@ -856,13 +854,12 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( BOOL bForce )
SvBorder SfxWorkWindow::Arrange_Impl()
-/* [Beschreibung]
-
- Diese Methode ordnet alle sichtbaren ChildFenster so an, da\s die angedockten
- Fenster nach der Sorierreihenfolge von au\sen nach innen aneinander
- gesetzt werden. Wenn ein an sich sichtbares Fenster nicht mehr in die
- noch freie ClientArea pa\st, wird es auf "nicht sichtbar" gesetzt.
+/* [Description]
+ This method organizes all visible child windows so that the docked window
+ sorted in order from the outside to the inside are placed after one
+ another. If a visible window does not fit anymore into the free
+ ClientArea, it is set to "not visible".
*/
{
DBG_CHKTHIS(SfxWorkWindow, 0);
@@ -887,10 +884,10 @@ SvBorder SfxWorkWindow::Arrange_Impl()
if ( !pCli->pWin )
continue;
- // Zun"achst nehmen wir an, da\s das Fenster Platz hat
+ // First, we assume that there is room for the window.
pCli->nVisible |= CHILD_FITS_IN;
- // Nicht sichtbare Fenster "uberspringen
+ // Skip invisiable windows
if (pCli->nVisible != CHILD_VISIBLE)
continue;
@@ -1007,7 +1004,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
}
//--------------------------------------------------------------------
-// Close-Handler: die Konfiguration der ChildWindows wird gespeichert.
+// Close-Handler: The Configuration of the ChildWindows is saved.
//
void SfxWorkWindow::Close_Impl()
@@ -1292,13 +1289,12 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
//------------------------------------------------------------------------
-FASTBOOL SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
+bool SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
-/* [Beschreibung]
+/* [Description]
- Stellt fest, ob an der betreffenden Position "uberhaupt eine
- Objektleiste zur Verf"ugung stehen w"urde. Ist unabh"agig davon,
- ob diese tats"achlich ein- oder ausgeschaltet ist.
+ Determines if a object list is available at the position in question.
+ This is independent for the fact whether it is actually turned on or off.
*/
{
@@ -1443,8 +1439,8 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell )
void SfxWorkWindow::UpdateObjectBars_Impl()
{
- // SplitWindows locken (d.h. Resize-Reaktion an den
- // DockingWindows unterdr"ucken)
+ // Lock SplitWindows (which means supressing the Resize-Reaction of the
+ // DockingWindows)
USHORT n;
for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
@@ -1453,7 +1449,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
p->Lock();
}
- // was man so "ofters braucht, merkt man sich (spart Code und Laufzeit)
+ // you realize what is needed often (saves Code and execution time)
SFX_APP();
Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY );
@@ -1478,22 +1474,22 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
bPluginMode = IsPluginMode( pFrame->GetObjectShell() );
}
- // "uber alle Toolboxen iterieren
+ // Iterate over all Toolboxes
xLayoutManager->lock();
for ( n = 0; n < aObjBarList.size(); ++n )
{
USHORT nId = aObjBarList[n].nId;
sal_Bool bDestroy = aObjBarList[n].bDestroy;
- // die Modi bestimmen, f"ur die die ToolBox gilt
+ // Determine the vaild mode for the ToolBox
USHORT nTbxMode = aObjBarList[n].nMode;
- FASTBOOL bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
+ bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN;
nTbxMode &= ~SFX_VISIBILITY_VIEWER;
- // wird in diesem Kontext eine ToolBox gefordert?
- FASTBOOL bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
+ // Is a ToolBox required in this context ?
+ bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
if ( bDestroy )
{
rtl::OUString aTbxId( m_aTbxTypeName );
@@ -1516,7 +1512,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
}
else if ( nId != 0 )
{
- // ggf. Toolbox an dieser Position l"oschen
+ // Delete the Toolbox at this Position if possible
rtl::OUString aTbxId( m_aTbxTypeName );
aTbxId += GetResourceURLFromResId( aObjBarList[n].nId );
xLayoutManager->destroyElement( aTbxId );
@@ -1530,7 +1526,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
UpdateChildWindows_Impl();
- // SplitWindows wieder ent-locken
+ // Unlock the SplitWindows again
for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
SfxSplitWindow *p = pSplit[n];
@@ -1551,8 +1547,8 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW
void SfxWorkWindow::UpdateChildWindows_Impl()
{
- // alle vorhandenen oder in den Kontext gekommenen ChildWindows
- for ( USHORT n=0; n<pChildWins->Count(); n++ )
+ // any current or in the context available Childwindows
+ for ( USHORT n=0; n<pChildWins->Count(); n++ )
{
SfxChildWin_Impl *pCW = (*pChildWins)[n];
SfxChildWindow *pChildWin = pCW->pWin;
@@ -1574,7 +1570,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
}
else if ( !IsDockingAllowed() || bIsFullScreen ) // || !bInternalDocking )
{
- // im PresentationMode oder FullScreen nur FloatingWindows
+ // In Presentation mode or FullScreen only FloatingWindows
SfxChildAlignment eAlign;
if ( pCW->aInfo.GetExtraData_Impl( &eAlign ) )
bCreate = ( eAlign == SFX_ALIGN_NOALIGNMENT );
@@ -1598,7 +1594,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
}
else if ( pChildWin )
{
- // Fenster existiert schon; soll es auch sichtbar sein ?
+ // Window already exists, it should also be visible?
if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildsVisible )
{
// Updatemode ist kompatibel; auf jeden Fall wieder einschalten
@@ -1654,21 +1650,18 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
if ( bSetFocus )
bSetFocus = pChildWin->WantsFocus();
pChildWin->SetWorkWindow_Impl( this );
-#if 0
- // Enable-Status richtig setzen
- pChildWin->GetWindow()->EnableInput( pCW->bEnable &&
- ( pWorkWin->IsInputEnabled() /* || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
- // Zumindest der ExtraString wird beim Auswerten ver"andert, also neu holen
+
+ // At least the extra string is changed during the evaluation,
+ // also get it anewed
SfxChildWinInfo aInfo = pChildWin->GetInfo();
pCW->aInfo.aExtraString = aInfo.aExtraString;
pCW->aInfo.bVisible = aInfo.bVisible;
pCW->aInfo.nFlags |= aInfo.nFlags;
- // Nein !! Sonst kann man keine Fenster defaultmaessig ausschalten ( Partwindow! )
-// pCW->aInfo.bVisible = TRUE;
+ // No! Otherwise, you could have disable any window stored (Partwindow!)
+// pCW->aInfo.bVisible = TRUE;
- // Erzeugung war erfolgreich
+ // The creation was successful
GetBindings().Invalidate(pCW->nId);
USHORT nPos = pChildWin->GetPosition();
@@ -1676,9 +1669,9 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
{
DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
if ((*pChilds)[TbxMatch(nPos)])// &&
-// pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
+// pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
{
- // ChildWindow ersetzt ObjectBar
+ // ChildWindow replaces ObjectBar
(*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
}
}
@@ -1690,9 +1683,8 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
if ( pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT || pChildWin->GetWindow()->GetParent() == pWorkWin)
{
- // Das Fenster ist entweder nicht angedockt oder au\serhalb
- // eines SplitWindows angedockt und mu\s daher explizit als
- // Child registriert werden
+ // The window is not docked or docked outside of one split windows
+ // and must therefore be registered explicitly as a Child
pCW->pCli = RegisterChild_Impl(*(pChildWin->GetWindow()), pChildWin->GetAlignment(), pChildWin->CanGetFocus());
pCW->pCli->nVisible = CHILD_VISIBLE;
if ( pChildWin->GetAlignment() != SFX_ALIGN_NOALIGNMENT && bIsFullScreen )
@@ -1701,17 +1693,15 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
}
else
{
- // Ein angedocktes Fenster, dessen Parent nicht das WorkWindow ist,
- // mu\s in einem SplitWindow liegen und daher nicht explizit
- // registriert werden.
- // Das passiert aber schon bei der Initialisierung des
- // SfxDockingWindows!
+ // A docked window which parent is not a WorkingWindow, must lie
+ // in a SplitWindow and thus not be explicitly registered.
+ // This happens already in the initialization of SfxDockingWindows!
}
if ( pCW->nInterfaceId != pChildWin->GetContextId() )
pChildWin->CreateContext( pCW->nInterfaceId, GetBindings() );
- // Information in der INI-Datei sichern
+ // Save the information in the INI file
SaveStatus_Impl(pChildWin, pCW->aInfo);
}
}
@@ -1721,24 +1711,24 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
USHORT nId = pCW->nSaveId;
SfxChildWindow *pChildWin = pCW->pWin;
- // vorhandenes Fenster geht aus dem Kontext und wird daher entfernt
+ // existing window goes out of the context and is therefore removed
USHORT nPos = pChildWin->GetPosition();
if (nPos != CHILDWIN_NOPOS)
{
/*
- // ChildWindow "uberlagert einen ObjectBar
+ // ChildWindow overloads a ObjectBar
DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
if ((*pChilds)[TbxMatch(nPos)] &&
(aObjBars[nPos].nMode & nUpdateMode) ) //&&
-// pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
+// pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
{
- // ObjectBar war "uberlagert; jetzt wieder anzeigen
+ // ObjectBar was overloaded; now display it again
(*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
}
*/
}
- // Information in der INI-Datei sichern
+ // Save the information in the INI file
USHORT nFlags = pCW->aInfo.nFlags;
pCW->aInfo = pChildWin->GetInfo();
pCW->aInfo.nFlags |= nFlags;
@@ -1748,15 +1738,15 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
if ( pCW->pCli )
{
- // ChildWindow ist ein direktes ChildWindow und mu\s sich daher
- // beim WorkWindow abmelden
+ // Child window is a direct child window and must therefore unregister
+ // itself from the WorkWindow
pCW->pCli = 0;
ReleaseChild_Impl(*pChildWin->GetWindow());
}
else
{
- // ChildWindow liegt in einem SplitWindow und meldet sich
- // selbst im dtor dort ab
+ // ChildWindow is within a SplitWindow and unregister itself in
+ // the destructor.
}
pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( pChildWin->GetWindow() );
@@ -1798,7 +1788,8 @@ void SfxWorkWindow::SetTempStatusBar_Impl( BOOL bSet )
aStatBar.bTemp = bSet;
if ( !bOn || bReset || (!bSet && aStatBar.nId ) )
{
- // Nur was tun, wenn die Temp-Einstellung wirklich was bewirkt
+ // Just do something if the temp settings really are causing
+ // anything
UpdateStatusBar_Impl();
ArrangeChilds_Impl();
ShowChilds_Impl();
@@ -1817,21 +1808,20 @@ void SfxWorkWindow::UpdateStatusBar_Impl()
Any aValue = xPropSet->getPropertyValue( m_aLayoutManagerPropName );
aValue >>= xLayoutManager;
- // keine Statusleiste, wenn keine Id gew"unscht oder bei FullScreenView
- // oder wenn ausgeschaltet
+ // No status bar, if no ID is required or when in FullScreenView or
+ // if disabled
if ( aStatBar.nId && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar &&
( (aStatBar.bOn && !bIsFullScreen) || aStatBar.bTemp ) )
{
- // Id hat sich ge"andert, also passenden Statusbarmanager erzeugen,
- // dieser "ubernimmt die aktuelle Statusleiste;
+ // Id has changed, thus create a suitable Statusbarmanager, this takes
+ // over the current status bar;
if ( xLayoutManager.is() )
xLayoutManager->requestElement( m_aStatusBarResName );
}
else
{
- // Aktuelle StatusBar vernichten
- // Der Manager erzeugt die Statusleiste nur, er zerst"ort sie
- // nicht !
+ // Destroy the current StatusBar
+ // The Manager only creates the Status bar, does not destroy it.
if ( xLayoutManager.is() )
xLayoutManager->destroyElement( m_aStatusBarResName );
}
@@ -1997,14 +1987,14 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
if ( nPos == USHRT_MAX )
return;
-// SfxChild_Impl *pChild = (*pChilds)[nPos];
+// SfxChild_Impl *pChild = (*pChilds)[nPos];
Rectangle aOuterRect( GetTopRect_Impl() );
aOuterRect.SetPos( pWorkWin->OutputToScreenPixel( aOuterRect.TopLeft() ));
Rectangle aInnerRect( aOuterRect );
BOOL bTbx = (eChild == SFX_CHILDWIN_OBJECTBAR);
- // Das gerade betroffene Fenster wird bei der Berechnung des
- // inneren Rechtecks mit eingeschlossen!
+ // The current affected window is included in the calculation of
+ // the inner rectangle!
for ( USHORT m=0; m<aSortedList.Count(); ++m )
{
USHORT i=aSortedList[m];
@@ -2015,93 +2005,93 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
switch ( pCli->eAlign )
{
case SFX_ALIGN_TOP:
- // Objekt-Toolboxen kommen immer zuletzt
+ // Objekt-Toolboxes come always last
//if ( bTbx || i <= nPos)
aInnerRect.Top() += pCli->aSize.Height();
break;
case SFX_ALIGN_TOOLBOXTOP:
- // Toolbox geht nur vor, wenn nicht h"ohere Position
+ // Toolbox has priority, if no higher Position
if ( bTbx && i <= nPos)
aInnerRect.Top() += pCli->aSize.Height();
break;
case SFX_ALIGN_HIGHESTTOP:
- // Geht immer vor
+ // Always performed first
aInnerRect.Top() += pCli->aSize.Height();
break;
case SFX_ALIGN_LOWESTTOP:
- // Wird nur mitgez"ahlt, wenn es das aktuelle Fenster ist
+ // Is only counted if it is the current window
if ( i == nPos )
aInnerRect.Top() += pCli->aSize.Height();
break;
case SFX_ALIGN_BOTTOM:
- // Objekt-Toolboxen kommen immer zuletzt
+ // Objekt-Toolboxes come always last
//if ( bTbx || i <= nPos)
aInnerRect.Bottom() -= pCli->aSize.Height();
break;
case SFX_ALIGN_TOOLBOXBOTTOM:
- // Toolbox geht nur vor, wenn nicht h"ohere Position
+ // Toolbox has priority, if no higher Position
if ( bTbx && i <= nPos)
aInnerRect.Bottom() -= pCli->aSize.Height();
break;
case SFX_ALIGN_LOWESTBOTTOM:
- // Geht immer vor
+ // Always performed first
aInnerRect.Bottom() -= pCli->aSize.Height();
break;
case SFX_ALIGN_HIGHESTBOTTOM:
- // Wird nur mitgez"ahlt, wenn es das aktuelle Fenster ist
+ // Is only counted if it is the current window
if ( i == nPos )
aInnerRect.Bottom() -= pCli->aSize.Height();
break;
case SFX_ALIGN_LEFT:
- // Toolboxen kommen immer zuletzt
+ // Toolboxes come always last
//if (bTbx || i <= nPos)
aInnerRect.Left() += pCli->aSize.Width();
break;
case SFX_ALIGN_TOOLBOXLEFT:
- // Toolboxen kommen immer zuletzt
+ // Toolboxes come always last
if (bTbx && i <= nPos)
aInnerRect.Left() += pCli->aSize.Width();
break;
case SFX_ALIGN_FIRSTLEFT:
- // Geht immer vor
+ // Always performed first
aInnerRect.Left() += pCli->aSize.Width();
break;
case SFX_ALIGN_LASTLEFT:
- // Wird nur mitgez"ahlt, wenn es das aktuelle Fenster ist
+ // Is only counted if it is the current window
if (i == nPos)
aInnerRect.Left() += pCli->aSize.Width();
case SFX_ALIGN_RIGHT:
- // Toolboxen kommen immer zuletzt
+ // Toolboxes come always last
//if (bTbx || i <= nPos)
aInnerRect.Right() -= pCli->aSize.Width();
break;
case SFX_ALIGN_TOOLBOXRIGHT:
- // Toolboxen kommen immer zuletzt
+ // Toolboxes come always last
if (bTbx && i <= nPos)
aInnerRect.Right() -= pCli->aSize.Width();
break;
case SFX_ALIGN_FIRSTRIGHT:
- // Wird nur mitgez"ahlt, wenn es das aktuelle Fenster ist
+ // Is only counted if it is the current window
if (i == nPos)
aInnerRect.Right() -= pCli->aSize.Width();
break;
case SFX_ALIGN_LASTRIGHT:
- // Geht immer vor
+ // Always performed first
aInnerRect.Right() -= pCli->aSize.Width();
break;
@@ -2173,14 +2163,14 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
SfxChildWin_Impl *pCW=NULL;
SfxWorkWindow *pWork = pParent;
- // Den obersten parent nehmen; ChildWindows werden immer am WorkWindow
- // der Task bzw. des Frames oder am AppWorkWindow angemeldet
+ // Get the top parent, child windows are alwas registered at the
+ // task of the WorkWindow for example the frame or on AppWorkWindow
while ( pWork && pWork->pParent )
pWork = pWork->pParent;
if ( pWork )
{
- // Dem Parent schon bekannt ?
+ // The Parent already known?
USHORT nCount = pWork->pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pWork->pChildWins)[n]->nSaveId == nId)
@@ -2192,7 +2182,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
if ( !pCW )
{
- // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
+ // If no Parent or the Parent us still unknown, then search here
USHORT nCount = pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pChildWins)[n]->nSaveId == nId)
@@ -2204,8 +2194,8 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
if ( !pCW )
{
- // Ist neu, also initialisieren; je nach Flag beim Parent oder bei
- // mir eintragen
+ // If new, then initialize, add this here depending on the flag or
+ // the Parent
pCW = new SfxChildWin_Impl( lId );
pCW->nId = nId;
InitializeChild_Impl( pCW );
@@ -2220,16 +2210,11 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
pCW->nInterfaceId = nInter;
pCW->nVisibility = nMode;
pCW->bEnable = bEnabled;
-#if 0
- if ( pCW->pWin )
- pCW->pWin->GetWindow()->EnableInput( bEnabled &&
- ( pWorkWin->IsInputEnabled() /* || pCW->pWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
pCW->nVisibility = nMode;
}
//--------------------------------------------------------------------
-// Der An/Aus-Status eines ChildWindows wird umgeschaltet.
+// The on/of-Status of a ChildWindows is switched
void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
{
@@ -2241,7 +2226,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
if ( n<nCount )
{
- // Das Fenster ist schon bekannt
+ // The Window is aleady known
SfxChildWin_Impl *pCW = (*pChildWins)[n];
SfxChildWindow *pChild = pCW->pWin;
@@ -2331,11 +2316,11 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
if ( n < nCount )
{
- DBG_ERROR("ChildWindow ist nicht im Kontext!");
+ DBG_ERROR("The ChildWindow is not in context!");
}
else
{
- DBG_ERROR("ChildWindow ist nicht registriert!");
+ DBG_ERROR("The ChildWindow is not registered!");
}
#endif
}
@@ -2368,14 +2353,14 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
SfxChildWin_Impl *pCW=NULL;
SfxWorkWindow *pWork = pParent;
- // Den obersten parent nehmen; ChildWindows werden immer am WorkWindow
- // der Task bzw. des Frames oder am AppWorkWindow angemeldet
+ // Get the top parent, child windows are alwas registered at the
+ // task of the WorkWindow for example the frame or on AppWorkWindow
while ( pWork && pWork->pParent )
pWork = pWork->pParent;
if ( pWork )
{
- // Dem Parent schon bekannt ?
+ // The Parent already known?
USHORT nCount = pWork->pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pWork->pChildWins)[n]->nSaveId == nId)
@@ -2387,7 +2372,7 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
if ( !pCW )
{
- // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
+ // If no Parent or the Parent us still unknown, then search here
USHORT nCount = pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pChildWins)[n]->nSaveId == nId)
@@ -2399,8 +2384,8 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
if ( !pCW )
{
- // Ist neu, also initialisieren; je nach Flag beim Parent oder bei
- // mir eintragen
+ // If new, then initialize, add this here depending on the flag or
+ // the Parent
pCW = new SfxChildWin_Impl( nId );
pCW->bEnable = FALSE;
pCW->nId = 0;
@@ -2452,14 +2437,14 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
SfxChildWin_Impl *pCW=NULL;
SfxWorkWindow *pWork = pParent;
- // Den obersten parent nehmen; ChildWindows werden immer am WorkWindow
- // der Task bzw. des Frames oder am AppWorkWindow angemeldet
+ // Get the top parent, child windows are alwas registered at the
+ // task of the WorkWindow for example the frame or on AppWorkWindow
while ( pWork && pWork->pParent )
pWork = pWork->pParent;
if ( pWork )
{
- // Dem Parent schon bekannt ?
+ // The Parent already known?
USHORT nCount = pWork->pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pWork->pChildWins)[n]->nSaveId == nId)
@@ -2471,7 +2456,7 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
if ( !pCW )
{
- // Kein Parent oder dem Parent noch unbekannt, dann bei mir suchen
+ // If no Parent or the Parent us still unknown, then search here
USHORT nCount = pChildWins->Count();
for (USHORT n=0; n<nCount; n++)
if ((*pChildWins)[n]->nSaveId == nId)
@@ -2484,8 +2469,8 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
if ( !pCW )
{
- // Ist neu, also initialisieren; je nach Flag beim Parent oder bei
- // mir eintragen
+ // If new, then initialize, add this here depending on the flag or
+ // the Parent
pCW = new SfxChildWin_Impl( nId );
InitializeChild_Impl( pCW );
if ( !pWork || pCW->aInfo.nFlags & SFX_CHILDWIN_TASK )
@@ -2576,11 +2561,11 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
if ( n<nCount )
{
- DBG_ERROR("ChildWindow ist nicht im Kontext!");
+ DBG_ERROR("The ChildWindow is not in context!");
}
else
{
- DBG_ERROR("ChildWindow ist nicht registriert!");
+ DBG_ERROR("The ChildWindow is not registered");
}
#endif
}
@@ -2606,8 +2591,8 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
void SfxWorkWindow::ResetChildWindows_Impl()
{
-// if ( pParent )
-// pParent->ResetChildWindows_Impl();
+// if ( pParent )
+// pParent->ResetChildWindows_Impl();
for ( USHORT n = 0; n < pChildWins->Count(); ++n )
{
@@ -2617,9 +2602,8 @@ void SfxWorkWindow::ResetChildWindows_Impl()
}
//------------------------------------------------------------------------
-// Virtuelle Methode, die die Gr"o\se der Fl"ache (client area) des parent
-// windows liefert, in der Child-Fenster angeordnet werden k"onnen.
-// in der ClientArea des parent findet.
+// Virtual method that returns the size of the area (client area) of the
+// parent windows, in which the ChildWindow can be fitted.
Rectangle SfxWorkWindow::GetTopRect_Impl()
{
@@ -2627,9 +2611,8 @@ Rectangle SfxWorkWindow::GetTopRect_Impl()
}
//------------------------------------------------------------------------
-// Virtuelle Methode, die die Gr"o\se der Fl"ache (client area) des parent
-// windows liefert, in der Child-Fenster angeordnet werden k"onnen.
-// in der ClientArea des parent findet.
+// Virtual method that returns the size of the area (client area) of the
+// parent windows, in which the ChildWindow can be fitted.
Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl()
{
@@ -2637,8 +2620,8 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl()
}
//------------------------------------------------------------------------
-// Virtuelle Methode, um herauszufinden, ob ein Child-Fenster noch Platz
-// in der ClientArea des parent findet.
+// Virtual method to find out if there is room for a ChildWindow in the
+// client area of the parent.
BOOL SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
{
@@ -2652,7 +2635,7 @@ BOOL SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
void SfxWorkWindow::SaveStatus_Impl(SfxChildWindow *pChild, const SfxChildWinInfo &rInfo)
{
- // Den Status vom Presentation mode wollen wir nicht sichern
+ // The Status of the Presentation mode is not saved
if ( IsDockingAllowed() && bInternalDockingAllowed )
pChild->SaveStatus(rInfo);
}
@@ -2815,11 +2798,10 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
Rectangle aArea( aUpperClientArea );
for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
- // Es werden entweder Dummyfenster oder Fenster im AutoShow-Modus
- // ( nicht gepinned, FadeIn ) behandelt.
- // Nur das "ubergebene Fenster darf unsichtbar sein, denn vielleicht
- // soll daf"ur gerade die Gr"o\se berechnet werden, bevor es angezeigt
- // wird.
+ // Either dummy window or window in the auto-show-mode are processed
+ // (not pinned, FadeIn).
+ // Only the abandoned window may be invisible, because perhaps its
+ // size is just beeing calculated before it is displayed.
SfxSplitWindow* pSplitWin = pSplit[n];
BOOL bDummyWindow = !pSplitWin->IsFadeIn();
Window *pDummy = pSplitWin->GetSplitWindow();
@@ -2827,7 +2809,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) )
continue;
- // Breite und Position des Dummy-Fensters als Ausgangspunkt
+ // Width and position of the dummy window as a starting point
Size aSize = pDummy->GetSizePixel();
Point aPos = pDummy->GetPosPixel();
@@ -2835,13 +2817,13 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
{
case ( 0 ) :
{
- // Linkes SplitWindow
- // Breite vom Fenster selbst holen, wenn nicht das DummyWindow
+ // Left SplitWindow
+ // Get the width of the Window yourself, if no DummyWindow
if ( !bDummyWindow )
aSize.Width() = pSplitWin->GetSizePixel().Width();
- // Wenn links ein Window sichtbar ist, beginnt der freie
- // Bereich rechts davon bzw. bei der Client area
+ // If a Window is visable to the left, then the free region
+ // starts to the right from it, for example at the Client area
long nLeft = aPos.X() + aSize.Width();
if ( nLeft > aArea.Left() )
aArea.Left() = nLeft;
@@ -2849,26 +2831,26 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
}
case ( 1 ) :
{
- // Rechtes SplitWindow
- // Position um Differenz der Breiten korrigieren
+ // Right SplitWindow
+ // Position to correct the difference of the widths
aPos.X() += aSize.Width();
- // Breite vom Fenster selbst holen, wenn nicht das DummyWindow
+ // Get the width of the Window yourself, if no DummyWindow
if ( !bDummyWindow )
aSize.Width() = pSplitWin->GetSizePixel().Width();
aPos.X() -= aSize.Width();
- // Wenn links schon ein Fenster aufgeklappt ist, darf
- // das rechte nicht dar"uber gehen
+ // If already a window is opened at the left side, then the
+ // right is not allowed to overlap this one.
if ( aPos.X() < aArea.Left() )
{
aPos.X() = aArea.Left();
aSize.Width() = aArea.GetWidth();
}
- // Wenn rechts ein Window sichtbar ist, endet der freie
- // Bereich links davon bzw. bei der Client area
+ // If a Window is visable to the right, then the free region
+ // starts to the left from it, for example at the Client area
long nRight = aPos.X();
if ( nRight < aArea.Right() )
aArea.Right() = nRight;
@@ -2876,18 +2858,19 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
}
case ( 2 ) :
{
- // Oberes SplitWindow
- // H"ohe vom Fenster selbst holen, wenn nicht das DummyWindow
+ // Top SplitWindow
+ // Get the height of the Window yourself, if no DummyWindow
if ( !bDummyWindow )
aSize.Height() = pSplitWin->GetSizePixel().Height();
- // Breite anpassen, je nachdem ob links oder rechts
- // schon ein Fenster aufgeklappt ist
+
+ // Adjust width with regard to if a Window is already open
+ // to the left or right
aPos.X() = aArea.Left();
aSize.Width() = aArea.GetWidth();
- // Wenn oben ein Window sichtbar ist, beginnt der freie
- // Bereich darunter bzw. bei der Client Area
+ // If a Window is visable at the top, then the free region
+ // starts beneath it, for example at the Client area
long nTop = aPos.Y() + aSize.Height();
if ( nTop > aArea.Top() )
aArea.Top() = nTop;
@@ -2895,23 +2878,23 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
}
case ( 3 ) :
{
- // Das untere SplitWindow
- // Position um Differenz der H"ohen korrigieren
+ // The bottom SplitWindow
+ // Position to correct the difference of the heights
aPos.Y() += aSize.Height();
- // H"ohe vom Fenster selbst holen, wenn nicht das DummmyWindow
+ // Get the height of the Window yourself, if no DummyWindow
if ( !bDummyWindow )
aSize.Height() = pSplitWin->GetSizePixel().Height();
aPos.Y() -= aSize.Height();
- // Breite anpassen, je nachdem ob links oder rechts
- // schon ein Fenster aufgeklappt ist
+ // Adjust width with regard to if a Window is already open
+ // to the left or right.
aPos.X() = aArea.Left();
aSize.Width() = aArea.GetWidth();
- // Wenn oben schon ein Fenster aufgeklappt ist, darf
- // das untere nicht dar"uber gehen
+ // If already a window is opened at the top, then the
+ // bottom one is not allowed to overlap this one.
if ( aPos.Y() < aArea.Top() )
{
aPos.Y() = aArea.Top();
@@ -2923,11 +2906,11 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
}
if ( !bDummyWindow )
- // Das FadeIn-Window ist ein Float, dessen Koordinaten in
- // Screenkoordinaten gesetzt werden
+ // the FadeIn-Window is a Floating window, which coordinates are
+ // set in Screen coordinates.
pSplitWin->SetPosSizePixel( pWorkWin->OutputToScreenPixel(aPos), aSize );
else
- // Das angedockte DummyWindow
+ // the docked DummyWindow
pDummy->SetPosSizePixel( aPos, aSize );
}
}
@@ -3003,14 +2986,14 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild )
pActiveChild = pChild;
}
-Window* SfxWorkWindow::GetActiveChild_Impl()
+Window* SfxWorkWindow::GetActiveChild_Impl()
{
return pActiveChild;
}
BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
{
- // Alle Kinder gem"a\s Liste sortieren
+ // Sort all children under list
SvUShorts aList;
for ( USHORT i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
{
@@ -3040,7 +3023,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
SfxChild_Impl *pAct=NULL;
if ( pActiveChild )
{
- // Das aktive Fenster suchen
+ // Look for the active window
for ( n=0; n<aList.Count(); n++ )
{
SfxChild_Impl* pCli = (*pChilds)[aList[n]];
@@ -3060,7 +3043,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
{
for ( USHORT i=0; i<SFX_SPLITWINDOWS_MAX; i++ )
{
- // Eventuell ist pAct ein Splitwindow
+ // Maybe the pNext is a Splitwindow
SfxSplitWindow *p = pSplit[i];
if ( pAct->pWin == p )
{
@@ -3070,8 +3053,8 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
}
}
- // pAct ist ein direktes ChildWindow
- // mit dem Nachfolger bzw. Vorg"anger des aktiven Fensters weitermachen
+ // pAct is a direct ChildWindow
+ // continue with the successor or predecessor of the active window
if ( bForward )
n = n+1;
else
@@ -3089,11 +3072,11 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
SfxChild_Impl* pNext = pCli;
for ( USHORT i=0; n<SFX_SPLITWINDOWS_MAX; n++ )
{
- // Eventuell ist pNext ein Splitwindow
+ // Maybe the pNext is a Splitwindow
SfxSplitWindow *p = pSplit[i];
if ( pNext->pWin == p )
{
- // Das erste/letzte Fenster dort aktivieren
+ // Activate the first/last window
p->SetActiveWindow_Impl( NULL );
pNext = NULL;
if( p->ActivateNextChild_Impl( bForward ) )
@@ -3140,3 +3123,4 @@ void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
ArrangeChilds_Impl();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 52798f01f5..863c7786e1 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.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.
@@ -47,15 +48,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.PackageStructureCreator");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.PackageStructureCreator"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
}
//-------------------------------------------------------------------------
@@ -200,3 +201,4 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::getSupported
return impl_getStaticSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx
index ea8bcc647d..1631d2eada 100644
--- a/sfx2/source/appl/xpackcreator.hxx
+++ b/sfx2/source/appl/xpackcreator.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,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index 36e304715b..decf21c326 100644
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.hrc
@@ -27,12 +27,12 @@
#include <sfx2/sfx.hrc>
-//fuer das Mapping Fehlercode -> ResId
+//for the mapping error code -> ResId
-#define RC_BASTYP RID_SFX_BASTYP_START
-#define STR_FILTER_NOT_INSTALLED (RC_BASTYP + 9)
-#define STR_FILTER_CONSULT_SERVICE (RC_BASTYP + 10)
-#define STR_MEMEXCEPTION (RC_BASTYP + 28)
-#define MSG_MEM_WARN (RC_BASTYP + 29)
-#define STR_HTML_GENERATOR (RC_BASTYP + 30)
+#define RC_BASTYP RID_SFX_BASTYP_START
+#define STR_FILTER_NOT_INSTALLED (RC_BASTYP + 9)
+#define STR_FILTER_CONSULT_SERVICE (RC_BASTYP + 10)
+#define STR_MEMEXCEPTION (RC_BASTYP + 28)
+#define MSG_MEM_WARN (RC_BASTYP + 29)
+#define STR_HTML_GENERATOR (RC_BASTYP + 30)
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index f304291eaa..7c3aec2489 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.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,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
#include <tools/debug.hxx>
-#ifndef GCC
-#endif
#include "bitset.hxx"
@@ -393,3 +392,4 @@ USHORT IndexBitSet::GetFreeIndex()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index a739230d53..6d953aae8c 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.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,9 +41,7 @@
#include <comphelper/sequenceashashmap.hxx>
-#ifndef _EXCHANGE_HXX //autogen
#include <sot/exchange.hxx>
-#endif
#include <tools/config.hxx>
#include <basic/sbmeth.hxx>
#include <basic/basmgr.hxx>
@@ -50,12 +49,8 @@
#include <basic/sbxobj.hxx>
#include <basic/sbxmeth.hxx>
#include <basic/sbxcore.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX //autogen
#include <rtl/ustring.hxx>
-#endif
#include <rtl/ustrbuf.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
@@ -84,9 +79,7 @@
#include <com/sun/star/frame/XFilterDetect.hpp>
#include <com/sun/star/loader/XImplementationLoader.hpp>
#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <sal/types.h>
@@ -241,10 +234,9 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName
if ( bFirstRead )
ReadFilters_Impl();
- sal_uInt16 nCount = ( sal_uInt16 ) pFilterArr->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pFilterArr->size(); i < n; ++i )
{
- const SfxFilter* pCheckFilter = pFilterArr->GetObject( n );
+ const SfxFilter* pCheckFilter = pFilterArr->at( i );
if ( pCheckFilter->GetServiceName().CompareIgnoreCaseToAscii( sServiceName ) == COMPARE_EQUAL )
{
pFilter = pCheckFilter;
@@ -322,12 +314,12 @@ void SfxFilterMatcher_Impl::Update()
if ( pList )
{
// this List was already used
- pList->Clear();
- for ( USHORT n=0; n<pFilterArr->Count(); n++ )
+ pList->clear();
+ for ( size_t i = 0, n = pFilterArr->size(); i < n; ++i )
{
- SfxFilter* pFilter = pFilterArr->GetObject(n);
+ SfxFilter* pFilter = pFilterArr->at( i );
if ( pFilter->GetServiceName() == String(aName) )
- pList->Insert( pFilter, LIST_APPEND );
+ pList->push_back( pFilter );
}
}
}
@@ -357,10 +349,9 @@ void SfxFilterMatcher_Impl::InitForIterating() const
const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) const
{
pImpl->InitForIterating();
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
+ const SfxFilter* pFilter = pImpl->pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) )
return pFilter;
@@ -374,10 +365,10 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter
sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
SfxMedium& rMedium,
const SfxFilter**ppFilter,
- SfxFilterFlags /*nMust*/,
- SfxFilterFlags /*nDont*/ ) const
+ SfxFilterFlags nMust,
+ SfxFilterFlags nDont ) const
{
- Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), UNO_QUERY );
+ Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
::rtl::OUString sTypeName;
try
{
@@ -390,7 +381,11 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
*ppFilter = NULL;
if ( sTypeName.getLength() )
- *ppFilter = GetFilter4EA( sTypeName );
+ {
+ // make sure filter list is initialized
+ pImpl->InitForIterating();
+ *ppFilter = GetFilter4EA( sTypeName, nMust, nDont );
+ }
return *ppFilter ? ERRCODE_NONE : ERRCODE_ABORT;
}
@@ -425,7 +420,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
const SfxFilter* pOldFilter = *ppFilter;
// no detection service -> nothing to do !
- Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), UNO_QUERY );
+ Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
if (!xDetection.is())
return ERRCODE_ABORT;
@@ -471,7 +466,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
// The DocumentService property is only a preselection, and all preselections are considered as optional!
// This "wrong" type will be sorted out now because we match only allowed filters to the detected type
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1);
- lQuery[0].Name = ::rtl::OUString::createFromAscii("Name");
+ lQuery[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
lQuery[0].Value <<= sTypeName;
const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
@@ -493,7 +488,7 @@ sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
{
if ( pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL )
{
- // Hier k"onnte noch eine Nachinstallation angeboten werden
+ // Here could a re-installation be offered
String aText( SfxResId( STR_FILTER_NOT_INSTALLED ) );
aText.SearchAndReplaceAscii( "$(FILTER)", pFilter->GetUIName() );
QueryBox aQuery( NULL, WB_YES_NO | WB_DEF_YES, aText );
@@ -501,11 +496,11 @@ sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
if ( nRet == RET_YES )
{
#ifdef DBG_UTIL
- // Setup starten
- InfoBox( NULL, DEFINE_CONST_UNICODE("Hier soll jetzt das Setup starten!") ).Execute();
+ // Start Setup
+ InfoBox( NULL, DEFINE_CONST_UNICODE("Here should the Setup now be starting!") ).Execute();
#endif
- // Installation mu\s hier noch mitteilen, ob es geklappt hat, dann kann das
- // Filterflag gel"oscht werden
+ // Installation must still give feedback if it worked or not,
+ // then the Filterflag be deleted
}
return ( !(pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL) );
@@ -523,9 +518,9 @@ sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, sal_Bool /*bPlugIn*/, sal_Bool bAPI ) const
-/* [Beschreibung]
+/* [Description]
- Hier wird noch die Filterauswahlbox hochgezogen. Sonst GuessFilter
+ Here the Filter selection box is pulled up. Otherwise GuessFilter
*/
{
@@ -564,17 +559,18 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
{
const SfxFilter* pInstallFilter = NULL;
- // Jetzt auch Filter testen, die nicht installiert sind ( ErrCode ist irrelevant )
+ // Now test the filter which are not installed (ErrCode is irrelevant)
GuessFilter( rMedium, &pInstallFilter, SFX_FILTER_IMPORT, SFX_FILTER_CONSULTSERVICE );
if ( pInstallFilter )
{
if ( IsFilterInstalled_Impl( pInstallFilter ) )
- // Eventuell wurde der Filter nachinstalliert
+ // Maybe the filter was installed was installed afterwards.
pFilter = pInstallFilter;
}
else
{
- // Jetzt auch Filter testen, die erst von Star bezogen werden m"ussen ( ErrCode ist irrelevant )
+ // Now test the filter, which first must be obtained by Star
+ // (ErrCode is irrelevant)
GuessFilter( rMedium, &pInstallFilter, SFX_FILTER_IMPORT, 0 );
if ( pInstallFilter )
IsFilterInstalled_Impl( pInstallFilter );
@@ -590,37 +586,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
if( STRING_NOTFOUND != aFlags.Search( 'H' ) )
bHidden = sal_True;
}
-/*
- if ( ( !pFilter || nErr == ERRCODE_SFX_CONSULTUSER ) && !bAPI && !bHidden )
- {
- if ( !pFilter )
- pFilter = pOldFilter;
- String aTmpName;
- if ( pFilter )
- aTmpName = pFilter->GetUIName();
-
- SfxFilterMatcher *pMatcher;
- if( bPlugIn && pFilter )
- pMatcher = new SfxFilterMatcher( (SfxFilterContainer *) pFilter->GetFilterContainer() );
- else
- pMatcher = (SfxFilterMatcher*) this;
-
- SfxFilterDialog *pDlg = new SfxFilterDialog( 0, &rMedium, *pMatcher, pFilter ? &aTmpName: 0, 0 );
- const sal_Bool bOk = RET_OK == pDlg->Execute();
- if (bOk)
- pFilter = pMatcher->GetFilter4UIName( pDlg->GetSelectEntry());
-
- if( bPlugIn && pFilter )
- delete pMatcher;
- delete pDlg;
-
- if ( !bOk)
- nErr = ERRCODE_ABORT;
- else
- nErr = ERRCODE_NONE;
- }
-*/
*ppFilter = pFilter;
if ( bHidden || (bAPI && nErr == ERRCODE_SFX_CONSULTUSER) )
@@ -644,7 +610,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
::rtl::OUString aValue;
// try to get the preferred filter (works without loading all filters!)
- if ( (aProps[::rtl::OUString::createFromAscii("PreferredFilter")] >>= aValue) && aValue.getLength() )
+ if ( (aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"))] >>= aValue) && aValue.getLength() )
{
const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue );
if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) )
@@ -660,7 +626,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
{
// preferred filter belongs to another document type; now we must search the filter
pImpl->InitForIterating();
- aProps[::rtl::OUString::createFromAscii("Name")] >>= aValue;
+ aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] >>= aValue;
pFilter = GetFilter4EA( aValue, nMust, nDont );
if ( pFilter )
return pFilter;
@@ -681,10 +647,9 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const String& rMediaType,SfxF
{
if ( pImpl->pList )
{
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
+ const SfxFilter* pFilter = pImpl->pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetMimeType() == rMediaType )
return pFilter;
@@ -694,7 +659,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const String& rMediaType,SfxF
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString::createFromAscii("MediaType");
+ aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
aSeq[0].Value <<= ::rtl::OUString( rMediaType );
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -703,11 +668,10 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl
{
if ( pImpl->pList )
{
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
const SfxFilter* pFirst = 0;
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
+ const SfxFilter* pFilter = pImpl->pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetTypeName() == rType )
{
@@ -724,7 +688,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString::createFromAscii("Name");
+ aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
aSeq[0].Value <<= ::rtl::OUString( rType );
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -733,10 +697,9 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
{
if ( pImpl->pList )
{
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
+ const SfxFilter* pFilter = pImpl->pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) )
{
@@ -764,7 +727,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
sExt.Erase(0,1);
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString::createFromAscii("Extensions");
+ aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions"));
::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1);
aExts[0] = sExt;
aSeq[0].Value <<= aExts;
@@ -773,28 +736,12 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
{
- /*
- if ( pImpl->pList )
- {
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
- {
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
- SfxFilterFlags nFlags = pFilter->GetFilterFlags();
- if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetFormat() == nId )
- return pFilter;
- }
-
- return 0;
- }
- */
-
if (nId == 0)
return 0;
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
::rtl::OUString aName = SotExchange::GetFormatName( nId );
- aSeq[0].Name = ::rtl::OUString::createFromAscii("ClipboardFormat");
+ aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClipboardFormat"));
aSeq[0].Value <<= aName;
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -803,10 +750,9 @@ const SfxFilter* SfxFilterMatcher::GetFilter4UIName( const String& rName, SfxFil
{
pImpl->InitForIterating();
const SfxFilter* pFirstFilter=0;
- sal_uInt16 nCount = ( sal_uInt16 ) pImpl->pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pImpl->pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pImpl->pList->GetObject( n );
+ const SfxFilter* pFilter = pImpl->pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust &&
!(nFlags & nDont ) && pFilter->GetUIName() == rName )
@@ -847,9 +793,9 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
CreateFilterArr();
else
{
- for( sal_uInt16 n=0; n<pFilterArr->Count(); n++ )
+ for ( size_t i = 0, n = pFilterArr->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pFilterArr->GetObject( n );
+ const SfxFilter* pFilter = pFilterArr->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetFilterName().CompareIgnoreCaseToAscii( aName ) == COMPARE_EQUAL )
return pFilter;
@@ -864,10 +810,9 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
if ( !pList )
pList = pFilterArr;
- sal_uInt16 nCount = ( sal_uInt16 ) pList->Count();
- for( sal_uInt16 n = 0; n < nCount; n++ )
+ for ( size_t i = 0, n = pList->size(); i < n; ++i )
{
- const SfxFilter* pFilter = pList->GetObject( n );
+ const SfxFilter* pFilter = pList->at( i );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if ( (nFlags & nMust) == nMust && !(nFlags & nDont ) && pFilter->GetFilterName().CompareIgnoreCaseToAscii( aName ) == COMPARE_EQUAL )
return pFilter;
@@ -893,7 +838,7 @@ SfxFilterMatcherIter::SfxFilterMatcherIter(
: nOrMask( nOrMaskP ), nAndMask( nAndMaskP ),
nCurrent(0), pMatch( pMatchP->pImpl)
{
- if( nOrMask == 0xffff ) //Wg. Fehlbuild auf s
+ if( nOrMask == 0xffff ) //Due to falty build on s
nOrMask = 0;
pMatch->InitForIterating();
}
@@ -903,9 +848,9 @@ SfxFilterMatcherIter::SfxFilterMatcherIter(
const SfxFilter* SfxFilterMatcherIter::Find_Impl()
{
const SfxFilter* pFilter = 0;
- while( nCurrent < pMatch->pList->Count() )
+ while( nCurrent < pMatch->pList->size() )
{
- pFilter = pMatch->pList->GetObject(nCurrent++);
+ pFilter = pMatch->pList->at( nCurrent++ );
SfxFilterFlags nFlags = pFilter->GetFilterFlags();
if( ((nFlags & nOrMask) == nOrMask ) && !(nFlags & nAndMask ) )
break;
@@ -998,33 +943,33 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nFilterProperty = 0 ;
for( nFilterProperty=0; nFilterProperty<nFilterPropertyCount; ++nFilterProperty )
{
- if( lFilterProperties[nFilterProperty].Name.compareToAscii( "FileFormatVersion" ) == 0 )
+ if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileFormatVersion")) )
{
lFilterProperties[nFilterProperty].Value >>= nFormatVersion;
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "TemplateName" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TemplateName")) )
{
lFilterProperties[nFilterProperty].Value >>= sDefaultTemplate;
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "Flags" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Flags")) )
{
lFilterProperties[nFilterProperty].Value >>= nFlags;
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "UIName" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")) )
{
lFilterProperties[nFilterProperty].Value >>= sUIName;
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "UserData" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lUserData;
lFilterProperties[nFilterProperty].Value >>= lUserData;
sUserData = implc_convertStringlistToString( lUserData, ',', ::rtl::OUString() );
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "DocumentService" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentService")) )
{
lFilterProperties[nFilterProperty].Value >>= sServiceName;
}
- else if( lFilterProperties[nFilterProperty].Name.compareToAscii( "Type" ) == 0 )
+ else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
{
lFilterProperties[nFilterProperty].Value >>= sType;
// Try to get filter .. but look for any exceptions!
@@ -1046,25 +991,25 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nTypeProperty = 0 ;
for( nTypeProperty=0; nTypeProperty<nTypePropertyCount; ++nTypeProperty )
{
- if( lTypeProperties[nTypeProperty].Name.compareToAscii( "ClipboardFormat" ) == 0 )
+ if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat")) )
{
lTypeProperties[nTypeProperty].Value >>= sHumanName;
}
- else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "DocumentIconID" ) == 0 )
+ else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentIconID")) )
{
lTypeProperties[nTypeProperty].Value >>= nDocumentIconId;
}
- else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "MediaType" ) == 0 )
+ else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
{
lTypeProperties[nTypeProperty].Value >>= sMimeType;
}
- else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "Extensions" ) == 0 )
+ else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Extensions")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions;
lTypeProperties[nTypeProperty].Value >>= lExtensions;
sExtension = implc_convertStringlistToString( lExtensions, ';', DEFINE_CONST_UNICODE("*.") );
}
- else if( lTypeProperties[nTypeProperty].Name.compareToAscii( "URLPattern" ) == 0 )
+ else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URLPattern")) )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > lPattern;
lTypeProperties[nTypeProperty].Value >>= lPattern;
@@ -1138,7 +1083,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
pFilter->SetURLPattern(sPattern);
if (bNew)
- rList.Insert( pFilter, USHRT_MAX );
+ rList.push_back( pFilter );
}
}
@@ -1176,15 +1121,14 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
// ReadExternalFilters must work in update mode.
// Best way seams to mark all filters NOT_INSTALLED
// and change it back for all valid filters afterwards.
- if( rList.Count() > 0 )
+ if( !rList.empty() )
{
bUpdate = TRUE;
- USHORT nCount = (USHORT)rList.Count();
SfxFilter* pFilter;
- for (USHORT f=0; f<nCount; ++f)
+ for ( size_t i = 0, n = rList.size(); i < n; ++i )
{
pFilter = NULL;
- pFilter = rList.GetObject(f);
+ pFilter = rList[ i ];
pFilter->nFormatType |= SFX_FILTER_NOTINSTALLED;
}
}
@@ -1204,7 +1148,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
// And conditional breakpoints on unicode values seams not to be supported .-(
#ifdef DEBUG
bool bDBGStop = FALSE;
- if (sFilterName.indexOf(::rtl::OUString::createFromAscii("DBG_"))>-1)
+ if (sFilterName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBG_")))>-1)
bDBGStop = TRUE;
#endif
@@ -1225,3 +1169,5 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
pImplArr->GetObject(n)->Update();
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index bb830f9926..a9637faa62 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.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.
@@ -41,7 +42,7 @@
#include <sfx2/docfac.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//*****************************************************************************************************************
// namespaces
@@ -95,7 +96,7 @@ SfxFilterListener::~SfxFilterListener()
void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< util::XRefreshable > xContainer( aSource.Source, uno::UNO_QUERY );
if(
(xContainer.is() ) &&
@@ -108,7 +109,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< util::XRefreshable > xNotifier( aSource.Source, uno::UNO_QUERY );
if (!xNotifier.is())
return;
@@ -116,3 +117,5 @@ void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) t
if (xNotifier == m_xFilterCache)
m_xFilterCache.clear();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index dc802419ca..b775d9d831 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.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,5 @@ class SfxFilterListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util
}; // SfxFilterListener
#endif // _SFX_FLTLST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 1ea0c00aeb..ac1a4000d6 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.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.
@@ -50,14 +51,14 @@
#define SFX_HTMLFRMSIZE_REL 0x0001
#define SFX_HTMLFRMSIZE_PERCENT 0x0002
-static sal_Char __READONLY_DATA sHTML_SC_yes[] = "YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] = "NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO";
+static sal_Char const sHTML_SC_yes[] = "YES";
+static sal_Char const sHTML_SC_no[] = "NO";
+static sal_Char const sHTML_SC_auto[] = "AUTO";
#define HTML_O_READONLY "READONLY"
#define HTML_O_EDIT "EDIT"
-static HTMLOptionEnum __READONLY_DATA aScollingTable[] =
+static HTMLOptionEnum const aScollingTable[] =
{
{ sHTML_SC_yes, ScrollingYes },
{ sHTML_SC_no, ScrollingNo },
@@ -67,14 +68,14 @@ static HTMLOptionEnum __READONLY_DATA aScollingTable[] =
void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HTMLOptions *pOptions, const String& rBaseURL )
{
- // die Optionen holen und setzen
+ // Get and set the options
Size aMargin( pFrame->GetMargin() );
- // MIB 15.7.97: Netscape scheint marginwidth auf 0 zu setzen, sobald
- // marginheight gesetzt wird und umgekehrt. Machen wir jetzt wegen
- // bug #41665# auch so.
- // Netscape l"a\st aber ein direktes Setzen auf 0 nicht zu, IE4.0 schon.
- // Den Bug machen wir nicht mit!
+ // MIB 07/15/1997: Netscape seems to set marginwidth to 0 as soon as
+ // marginheight is set, and vice versa. Due to bug #41665# let us also
+ // do like that for now. Netscape does however not aallow for a direct
+ // seting to 0, while IE4.0 does
+ // We will not mimic that bug !
BOOL bMarginWidth = FALSE, bMarginHeight = FALSE;
USHORT nArrLen = pOptions->Count();
@@ -161,3 +162,5 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
pFrame->SetMargin( aMargin );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 4762c4e622..12e749e1f9 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.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.
@@ -62,13 +63,13 @@
using namespace ::com::sun::star;
-static sal_Char __READONLY_DATA sHTML_SC_yes[] = "YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] = "NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO";
-static sal_Char __READONLY_DATA sHTML_MIME_text_html[] = "text/html; charset=";
+static sal_Char const sHTML_SC_yes[] = "YES";
+static sal_Char const sHTML_SC_no[] = "NO";
+static sal_Char const sHTML_SC_auto[] = "AUTO";
+static sal_Char const sHTML_MIME_text_html[] = "text/html; charset=";
/* not used anymore?
-static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] =
+static HTMLOutEvent aFrameSetEventTable[] =
{
{ sHTML_O_SDonload, sHTML_O_onload, SFX_EVENT_OPENDOC },
{ sHTML_O_SDonunload, sHTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC },
@@ -81,7 +82,7 @@ static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] =
#if defined(UNX)
const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012";
#else
-const sal_Char __FAR_DATA SfxFrameHTMLWriter::sNewLine[] = "\015\012";
+const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012";
#endif
void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
@@ -236,7 +237,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
uno::Reference < script::XTypeConverter > xConverter(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
uno::UNO_QUERY_THROW );
uno::Reference<beans::XPropertySet> xUserDefinedProps(
i_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -278,7 +279,7 @@ void SfxFrameHTMLWriter::OutHeader( rtl_TextEncoding eDestEnc )
Strm() << sNewLine;
HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head, FALSE ) << sNewLine;
-//! OutScript(); // Hier fehlen noch die Scripten im Header
+//! OutScript(); // Hear the scripts in the Header are still missing
}
*/
@@ -290,7 +291,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
ByteString sOut;
::rtl::OUString aStr;
- uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameURL") );
+ uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
if ( (aAny >>= aStr) && aStr.getLength() )
{
String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI );
@@ -305,7 +306,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
}
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
if ( (aAny >>= aStr) && aStr.getLength() )
{
((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
@@ -315,18 +316,18 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
sal_Int32 nVal = SIZE_NOT_SET;
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
(((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal );
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
(((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal );
sal_Bool bVal = sal_True;
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")) );
if ( (aAny >>= bVal) && !bVal )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) );
if ( aAny >>= bVal )
{
const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
@@ -335,10 +336,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
// frame border (MS+Netscape-Erweiterung)
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) );
if ( (aAny >>= bVal) && !bVal )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder") );
+ aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) );
if ( aAny >>= bVal )
{
const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
@@ -379,3 +380,4 @@ String SfxFrameHTMLWriter::CreateURL( SfxFrame* pFrame )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 0b698070da..d4ce417f53 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.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.
@@ -56,13 +57,16 @@
#include <ucbhelper/commandenvironment.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/file.hxx>
+#include <vector>
using namespace com::sun::star;
using namespace rtl;
using namespace comphelper;
using namespace osl;
-DECLARE_LIST( StringList_Impl, OUString* )
+using ::std::vector;
+
+typedef vector< OUString* > StringList_Impl;
#define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
aToolsDT = DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \
@@ -102,7 +106,7 @@ sal_Bool SfxContentHelper::Transfer_Impl( const String& rSource, const String& r
{
::ucbhelper::Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
uno::Reference< ucb::XCommandInfo > xInfo = aDestPath.getCommands();
- OUString aTransferName = OUString::createFromAscii( "transfer" );
+ OUString aTransferName(RTL_CONSTASCII_USTRINGPARAM("transfer"));
if ( xInfo->hasCommandByName( aTransferName ) )
{
aDestPath.executeCommand( aTransferName, uno::makeAny(
@@ -205,7 +209,7 @@ sal_Bool SfxContentHelper::GetTitle( const String& rContent, String& rTitle )
{
::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
OUString aTemp;
- aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTemp;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTemp;
rTitle = String( aTemp );
bRet = sal_True;
}
@@ -231,7 +235,7 @@ sal_Bool SfxContentHelper::Kill( const String& rContent )
try
{
::ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( ucb::CommandAbortedException& )
{
@@ -260,8 +264,8 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Sequence< OUString > aProps(2);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString::createFromAscii( "Title" );
- pProps[1] = OUString::createFromAscii( "IsFolder" );
+ pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
try
{
@@ -278,7 +282,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
uno::Reference < ucb::XAnyCompareFactory > xFactory;
uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
- xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), uno::UNO_QUERY );
+ xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -307,7 +311,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
if ( xResultSet.is() )
{
- pFiles = new StringList_Impl;
+ pFiles = new StringList_Impl();
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
try
{
@@ -315,7 +319,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
{
OUString aId = xContentAccess->queryContentIdentifierString();
OUString* pFile = new OUString( aId );
- pFiles->Insert( pFile, LIST_APPEND );
+ pFiles->push_back( pFile );
}
}
catch( ucb::CommandAbortedException& )
@@ -335,15 +339,16 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
if ( pFiles )
{
- ULONG nCount = pFiles->Count();
+ size_t nCount = pFiles->size();
uno::Sequence < OUString > aRet( nCount );
OUString* pRet = aRet.getArray();
- for ( ULONG i = 0; i < nCount; ++i )
+ for ( size_t i = 0; i < nCount; ++i )
{
- OUString* pFile = pFiles->GetObject(i);
+ OUString* pFile = pFiles->at( i );
pRet[i] = *( pFile );
delete pFile;
}
+ pFiles->clear();
delete pFiles;
return aRet;
}
@@ -368,11 +373,11 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Sequence< OUString > aProps(5);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString::createFromAscii( "Title" );
- pProps[1] = OUString::createFromAscii( "ContentType" );
- pProps[2] = OUString::createFromAscii( "Size" );
- pProps[3] = OUString::createFromAscii( "DateModified" );
- pProps[4] = OUString::createFromAscii( "IsFolder" );
+ pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
+ pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
+ pProps[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"));
+ pProps[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
try
{
@@ -383,7 +388,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
uno::Reference < ucb::XAnyCompareFactory > xCmpFactory;
uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
- xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), uno::UNO_QUERY );
+ xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -399,9 +404,6 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
{
xResultSet = xDynamicResultSet->getStaticResultSet();
}
-
-// if ( xDynResultSet.is() )
-// xResultSet = xDynResultSet->getStaticResultSet();
}
catch( ucb::CommandAbortedException& )
{
@@ -415,10 +417,10 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
if ( xResultSet.is() )
{
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- pProperties = new StringList_Impl;
+ pProperties = new StringList_Impl();
uno::Reference< sdbc::XRow > xRow( xResultSet, uno::UNO_QUERY );
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
- ULONG nFolderPos = LIST_APPEND;
+ size_t nFolderPos = size_t(-1);
try
{
@@ -428,12 +430,10 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
String aType( xRow->getString(2) );
sal_Int64 nSize = xRow->getLong(3);
util::DateTime aDT = xRow->getTimestamp(4);
- sal_Bool bFolder = xRow->getBoolean(5);
+ sal_Bool bFolder = xRow->getBoolean(5); // true = directory, else file
String aRow = aTitle;
aRow += '\t';
-//! aRow += aType;
-//! aRow += '\t';
aRow += String::CreateFromInt64( nSize );
aRow += '\t';
AppendDateTime_Impl( aDT, aRow, aLocaleWrapper );
@@ -442,16 +442,23 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
aRow += '\t';
aRow += bFolder ? '1' : '0';
OUString* pRow = new OUString( aRow );
- ULONG nPos = LIST_APPEND;
- if ( bFolder )
+ size_t nPos = size_t(-1);
+ if ( bFolder ) // place the directories at the top of the listing
{
- if ( LIST_APPEND == nFolderPos )
+ if ( nFolderPos == size_t(-1) )
nFolderPos = 0;
else
nFolderPos++;
nPos = nFolderPos;
}
- pProperties->Insert( pRow, nPos );
+ if ( nPos >= pProperties->size() )
+ pProperties->push_back( pRow );
+ else
+ {
+ StringList_Impl::iterator it = pProperties->begin();
+ ::std::advance( it, nPos );
+ it = pProperties->insert( it, pRow );
+ }
}
}
catch( ucb::CommandAbortedException& )
@@ -471,15 +478,16 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
if ( pProperties )
{
- ULONG nCount = pProperties->Count();
+ size_t nCount = pProperties->size();
uno::Sequence < OUString > aRet( nCount );
OUString* pRet = aRet.getArray();
- for ( ULONG i = 0; i < nCount; ++i )
+ for ( size_t i = 0; i < nCount; ++i )
{
- OUString* pProperty = pProperties->GetObject(i);
+ OUString* pProperty = pProperties->at(i);
pRet[i] = *( pProperty );
delete pProperty;
}
+ pProperties->clear();
delete pProperties;
return aRet;
}
@@ -499,9 +507,9 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
uno::Sequence< OUString > aProps(3);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString::createFromAscii( "Title" );
- pProps[1] = OUString::createFromAscii( "ContentType" );
- pProps[2] = OUString::createFromAscii( "IsFolder" );
+ pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
+ pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
try
{
@@ -520,7 +528,7 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
if ( xResultSet.is() )
{
- pList = new StringList_Impl;
+ pList = new StringList_Impl();
uno::Reference< sdbc::XRow > xRow( xResultSet, uno::UNO_QUERY );
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
@@ -536,7 +544,7 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
aRow += '\t';
aRow += String( xContentAccess->queryContentIdentifierString() );
OUString* pRow = new OUString( aRow );
- pList->Insert( pRow, LIST_APPEND );
+ pList->push_back( pRow );
}
}
catch( ucb::CommandAbortedException& )
@@ -564,15 +572,16 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
if ( pList )
{
- ULONG nCount = pList->Count();
+ size_t nCount = pList->size();
uno::Sequence < OUString > aRet( nCount );
OUString* pRet = aRet.getArray();
- for ( ULONG i = 0; i < nCount; ++i )
+ for ( size_t i = 0; i < nCount; ++i )
{
- OUString* pEntry = pList->GetObject(i);
+ OUString* pEntry = pList->at(i);
pRet[i] = *( pEntry );
delete pEntry;
}
+ pList->clear();
delete pList;
return aRet;
}
@@ -595,8 +604,8 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Sequence< OUString > aProps(2);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString::createFromAscii( "Title" );
- pProps[1] = OUString::createFromAscii( "IsFolder" );
+ pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
try
{
@@ -614,7 +623,7 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
if ( xResultSet.is() )
{
- pProperties = new StringList_Impl;
+ pProperties = new StringList_Impl();
uno::Reference< sdbc::XRow > xRow( xResultSet, uno::UNO_QUERY );
uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
@@ -630,7 +639,7 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
aRow += '\t';
aRow += bFolder ? '1' : '0';
OUString* pRow = new OUString( aRow );
- pProperties->Insert( pRow, LIST_APPEND );
+ pProperties->push_back( pRow );
}
}
catch( ucb::CommandAbortedException& )
@@ -647,15 +656,16 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
if ( pProperties )
{
- ULONG nCount = pProperties->Count();
+ size_t nCount = pProperties->size();
uno::Sequence < OUString > aRet( nCount );
OUString* pRet = aRet.getArray();
- for ( ULONG i = 0; i < nCount; ++i )
+ for ( size_t i = 0; i < nCount; ++i )
{
- OUString* pProperty = pProperties->GetObject(i);
+ OUString* pProperty = pProperties->at(i);
pRet[i] = *( pProperty );
delete pProperty;
}
+ pProperties->clear();
delete pProperties;
return aRet;
}
@@ -706,7 +716,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
{
::ucbhelper::Content aCnt( INetURLObject( rURL ).GetMainURL( INetURLObject::NO_DECODE ),
uno::Reference< ucb::XCommandEnvironment > () );
- if ( !( aCnt.getPropertyValue( OUString::createFromAscii( "IsErrorDocument" ) ) >>= bRet ) )
+ if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) ) >>= bRet ) )
{
DBG_ERRORFILE( "Property 'IsErrorDocument' is missing" );
}
@@ -784,7 +794,7 @@ ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeB
try
{
::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- aCnt.getPropertyValue( OUString::createFromAscii( "FreeSpace" ) ) >>= rFreeBytes;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FreeSpace")) ) >>= rFreeBytes;
}
catch( ucb::CommandAbortedException& )
{
@@ -810,7 +820,7 @@ ULONG SfxContentHelper::GetSize( const String& rContent )
try
{
::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= nTemp;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) >>= nTemp;
}
catch( ucb::CommandAbortedException& )
{
@@ -877,3 +887,4 @@ sal_Bool SfxContentHelper::Find( const String& rFolder, const String& rName, Str
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 9695e86bd5..97686aa9ff 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.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.
@@ -93,3 +94,4 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
return pStrm;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 3fa4ddf68e..7ed7c5239b 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.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,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
-
#include <sfx2/minarray.hxx>
// -----------------------------------------------------------------------
@@ -103,7 +101,7 @@ void SfxPtrArr::Append( void* aElem )
{
DBG_MEMTEST();
DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
- // musz das Array umkopiert werden?
+ // Does the Array need to be copied?
if ( nUnused == 0 )
{
USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
@@ -118,7 +116,7 @@ void SfxPtrArr::Append( void* aElem )
pData = pNewData;
}
- // jetzt hinten in den freien Raum schreiben
+ // now write at the back in the open space
pData[nUsed] = aElem;
++nUsed;
--nUnused;
@@ -129,14 +127,14 @@ void SfxPtrArr::Append( void* aElem )
USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
{
DBG_MEMTEST();
- // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
+ // Adjust nLen, thus to avoid deleting beyond the end
nLen = Min( (USHORT)(nUsed-nPos), nLen );
- // einfache Aufgaben erfordern einfache Loesungen!
+ // simple problems require simple solutions!
if ( nLen == 0 )
return 0;
- // bleibt vielleicht keiner uebrig
+ // Maybe no one will remain
if ( (nUsed-nLen) == 0 )
{
delete [] pData;
@@ -146,10 +144,10 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // feststellen, ob das Array dadurch physikalisch schrumpft...
+ // Determine whether the array has physically shrunk...
if ( (nUnused+nLen) >= nGrow )
{
- // auf die naechste Grow-Grenze aufgerundet verkleinern
+ // reduce (rounded up) to the next Grow-border
USHORT nNewUsed = nUsed-nLen;
USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
@@ -170,7 +168,7 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // in allen anderen Faellen nur zusammenschieben
+ // in all other cases, only push together
if ( nUsed-nPos-nLen > 0 )
memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(void*) );
nUsed = nUsed - nLen;
@@ -183,11 +181,11 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
BOOL SfxPtrArr::Remove( void* aElem )
{
DBG_MEMTEST();
- // einfache Aufgaben ...
+ // simple tasks ...
if ( nUsed == 0 )
return FALSE;
- // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
+ // backwards, since most of the last is first removed
void* *pIter = pData + nUsed - 1;
for ( USHORT n = 0; n < nUsed; ++n, --pIter )
if ( *pIter == aElem )
@@ -203,11 +201,11 @@ BOOL SfxPtrArr::Remove( void* aElem )
BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
{
DBG_MEMTEST();
- // einfache Aufgaben ...
+ // simple tasks ...
if ( nUsed == 0 )
return FALSE;
- // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
+ // backwards, since most of the last is first removed
void* *pIter = pData + nUsed - 1;
for ( USHORT n = 0; n < nUsed; ++n, --pIter )
if ( *pIter == aOldElem )
@@ -242,10 +240,10 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
{
DBG_MEMTEST();
DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
- // musz das Array umkopiert werden?
+ // Does the Array have o be copied?
if ( nUnused == 0 )
{
- // auf die naechste Grow-Grenze aufgerundet vergroeszern
+ // increase (rounded up ) to the next Grow-border
USHORT nNewSize = nUsed+nGrow;
void** pNewData = new void*[nNewSize];
@@ -259,11 +257,11 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
pData = pNewData;
}
- // jetzt den hinteren Teil verschieben
+ // Now move the rear part
if ( nPos < nUsed )
memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(void*) );
- // jetzt in den freien Raum schreiben
+ // Now write into the free space.
memmove( pData+nPos, &rElem, sizeof(void*) );
nUsed += 1;
nUnused -= 1;
@@ -338,7 +336,7 @@ ByteArr& ByteArr::operator=( const ByteArr& rOrig )
void ByteArr::Append( char aElem )
{
DBG_MEMTEST();
- // musz das Array umkopiert werden?
+ // Does the Array have o be copied?
if ( nUnused == 0 )
{
USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
@@ -353,7 +351,7 @@ void ByteArr::Append( char aElem )
pData = pNewData;
}
- // jetzt hinten in den freien Raum schreiben
+ // now write at the back in the open space
pData[nUsed] = aElem;
++nUsed;
--nUnused;
@@ -364,14 +362,14 @@ void ByteArr::Append( char aElem )
USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
{
DBG_MEMTEST();
- // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
+ // Adjust nLen, thus to avoid deleting beyond the end
nLen = Min( (USHORT)(nUsed-nPos), nLen );
- // einfache Aufgaben erfordern einfache Loesungen!
+ // simple problems require simple solutions!
if ( nLen == 0 )
return 0;
- // bleibt vielleicht keiner uebrig
+ // Maybe no one will remain
if ( (nUsed-nLen) == 0 )
{
delete [] pData;
@@ -381,10 +379,10 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // feststellen, ob das Array dadurch physikalisch schrumpft...
+ // Determine whether the array has physically shrunk...
if ( (nUnused+nLen) >= nGrow )
{
- // auf die naechste Grow-Grenze aufgerundet verkleinern
+ // reduce (rounded up) to the next Grow-border
USHORT nNewUsed = nUsed-nLen;
USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
@@ -405,7 +403,7 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // in allen anderen Faellen nur zusammenschieben
+ // in all other cases, only push together
if ( nUsed-nPos-nLen > 0 )
memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(char) );
nUsed = nUsed - nLen;
@@ -418,11 +416,11 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
BOOL ByteArr::Remove( char aElem )
{
DBG_MEMTEST();
- // einfache Aufgaben ...
+ // simple tasks ...
if ( nUsed == 0 )
return FALSE;
- // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
+ // backwards, since most of the last is first removed
char *pIter = pData + nUsed - 1;
for ( USHORT n = 0; n < nUsed; ++n, --pIter )
if ( *pIter == aElem )
@@ -456,10 +454,10 @@ BOOL ByteArr::Contains( const char rItem ) const
void ByteArr::Insert( USHORT nPos, char rElem )
{
DBG_MEMTEST();
- // musz das Array umkopiert werden?
+ // Does the Array need to be copied?
if ( nUnused == 0 )
{
- // auf die naechste Grow-Grenze aufgerundet vergroeszern
+ // increase (rounded up) to the next Grow-border
USHORT nNewSize = nUsed+nGrow;
char* pNewData = new char[nNewSize];
@@ -473,11 +471,11 @@ void ByteArr::Insert( USHORT nPos, char rElem )
pData = pNewData;
}
- // jetzt den hinteren Teil verschieben
+ // Now move the rear part
if ( nPos < nUsed )
memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(char) );
- // jetzt in den freien Raum schreiben
+ // now write at the back in the open space
memmove( pData+nPos, &rElem, sizeof(char) );
nUsed += 1;
nUnused -= 1;
@@ -570,7 +568,7 @@ WordArr& WordArr::operator=( const WordArr& rOrig )
void WordArr::Append( short aElem )
{
DBG_MEMTEST();
- // musz das Array umkopiert werden?
+ // Does the Array need to be copied?
if ( nUnused == 0 )
{
USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
@@ -585,7 +583,7 @@ void WordArr::Append( short aElem )
pData = pNewData;
}
- // jetzt hinten in den freien Raum schreiben
+ // now write at the back in the open space
pData[nUsed] = aElem;
++nUsed;
--nUnused;
@@ -596,14 +594,14 @@ void WordArr::Append( short aElem )
USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
{
DBG_MEMTEST();
- // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
+ // Adjust nLen, thus to avoid deleting beyond the end
nLen = Min( (USHORT)(nUsed-nPos), nLen );
- // einfache Aufgaben erfordern einfache Loesungen!
+ // simple problems require simple solutions!
if ( nLen == 0 )
return 0;
- // bleibt vielleicht keiner uebrig
+ // Maybe no one will remain
if ( (nUsed-nLen) == 0 )
{
delete [] pData;
@@ -613,10 +611,10 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // feststellen, ob das Array dadurch physikalisch schrumpft...
+ // Determine whether the array has physically shrunk...
if ( (nUnused+nLen) >= nGrow )
{
- // auf die naechste Grow-Grenze aufgerundet verkleinern
+ // reduce (rounded up) to the next Grow-border
USHORT nNewUsed = nUsed-nLen;
USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
@@ -637,7 +635,7 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
return nLen;
}
- // in allen anderen Faellen nur zusammenschieben
+ // in all other cases, only push together
if ( nUsed-nPos-nLen > 0 )
memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(short) );
nUsed = nUsed - nLen;
@@ -650,11 +648,11 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
BOOL WordArr::Remove( short aElem )
{
DBG_MEMTEST();
- // einfache Aufgaben ...
+ // simple tasks ...
if ( nUsed == 0 )
return FALSE;
- // rueckwaerts, da meist der letzte zuerst wieder entfernt wird
+ // backwards, since most of the last is first removed
short *pIter = pData + nUsed - 1;
for ( USHORT n = 0; n < nUsed; ++n, --pIter )
if ( *pIter == aElem )
@@ -688,10 +686,10 @@ BOOL WordArr::Contains( const short rItem ) const
void WordArr::Insert( USHORT nPos, short rElem )
{
DBG_MEMTEST();
- // musz das Array umkopiert werden?
+ // Does the Array need to be copied?
if ( nUnused == 0 )
{
- // auf die naechste Grow-Grenze aufgerundet vergroeszern
+ // increase (rounded up) to the next Grow-border
USHORT nNewSize = nUsed+nGrow;
short* pNewData = new short[nNewSize];
@@ -705,11 +703,11 @@ void WordArr::Insert( USHORT nPos, short rElem )
pData = pNewData;
}
- // jetzt den hinteren Teil verschieben
+ // Now move the rear part
if ( nPos < nUsed )
memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(short) );
- // jetzt in den freien Raum schreiben
+ // now write at the back in the open space
memmove( pData+nPos, &rElem, sizeof(short) );
nUsed += 1;
nUnused -= 1;
@@ -734,3 +732,4 @@ short& WordArr::operator [] (USHORT nPos)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 822d337797..73117c0543 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.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,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
-
#include "sfxtypes.hxx"
//--------------------------------------------------------------------
@@ -73,3 +71,4 @@ String SfxStringDecode( const String &, const char * )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index f7d4737113..d703562c8b 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.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,14 +33,12 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#ifndef _SBX_HXX //autogen
#include <basic/sbx.hxx>
-#endif
#include <svl/eitem.hxx>
#include <tools/time.hxx>
-// wg. nRescheduleLocks
+// includes below due to nRescheduleLocks
#include "appdata.hxx"
#include <sfx2/request.hxx>
#include <sfx2/frame.hxx>
@@ -114,7 +113,7 @@ struct SfxProgress_Impl
#define aTypeLibInfo aProgressTypeLibImpl
//========================================================================
-extern ULONG Get10ThSec();
+extern sal_uInt32 Get10ThSec();
// -----------------------------------------------------------------------
@@ -150,31 +149,30 @@ SfxProgress_Impl::SfxProgress_Impl( const String &/*rTitle*/ )
SfxProgress::SfxProgress
(
- SfxObjectShell* pObjSh, /* SfxObjectShell, an der die Aktion ausgef"uhrt
- wird. Kann NULL sein, dann wird die Applikation
- verwendet */
+ SfxObjectShell* pObjSh, /* The action is performed on the
+ SfxObjectShell which can be NULL.
+ When it is then the application will be
+ used */
- const String& rText, /* Text, der in der Statuszeile vor den Statusmonitor
- erscheint */
+ const String& rText, /* Text, which appears before the Statusmonitor
+ in the status line */
- ULONG nRange, /* Maximalwert des Bereiches */
+ ULONG nRange, /* Max value for range */
- BOOL bAll /* alle Dokumente oder nur das Dokument des ViewFrames
- disablen (FALSE) */
- ,BOOL bWait /* initial den Wait-Pointer aktivieren (TRUE) */
+ BOOL bAll /* Disable all documents or only the document of the ViewFram */
+ ,BOOL bWait /* Aktivate the wait-Pointer initially (TRUE) */
)
-/* [Beschreibung]
+/* [Description]
- Der Konstruktor der Klasse SfxProgress schaltet den als Parameter
- "ubergebenen SfxObjectShell und SfxViewFrames, welche dieses Dokument
- anzeigen in einen Progress-Mode. D.h. solange eine dieser SfxViewFrame
- Instanzen aktiv ist, ist der dazugeh"orige SfxDispatcher und das
- dazugeh"orige Window disabled. In der Statuszeile wird ein Balken zur
- Fortschritts-Anzeige angezeigt.
+ The constructor of the class SfxProgress switches the SfxObjectShell
+ passed as parameter and SfxViewFrames which display this document in
+ a progress mode. Ie as long as one of those SfxViewFrame instances is
+ active the associated SfxDispatcher and associated Window is disabled.
+ A progress-bar will be displayed in the status bar,
*/
-: pImp( new SfxProgress_Impl( rText ) ),
+: pImp( new SfxProgress_Impl( rText ) ),
nVal(0),
bSuspended(TRUE)
{
@@ -207,11 +205,10 @@ SfxProgress::SfxProgress
SfxProgress::~SfxProgress()
-/* [Beschreibung]
+/* [Description]
- Der Destruktor der Klasse SfxProgress restauriert den alten Zustand;
- die Dokumente werden wieder freigeschaltet und die Statuszeile zeigt
- wieder Items an.
+ The destructor of the class SfxProgress restores the old status,
+ the documents are released again and the status bar shows the items again.
*/
{
@@ -228,9 +225,9 @@ SfxProgress::~SfxProgress()
void SfxProgress::Stop()
-/* [Beschreibung]
+/* [Description]
- Vorzeitiges Beenden des <SfxProgress>.
+ Early Exit of <SfxProgress>.
*/
{
@@ -259,13 +256,12 @@ void SfxProgress::Stop()
void SfxProgress::SetText
(
- const String& /* neuer Text */
+ const String& /* new Text */
)
-/* [Beschreibung]
+/* [Description]
- "Andert den Text, der links neben dem Fortschritts-Balken
- angezeigt wird.
+ Changes the text that appears to the left next to progress bar.
*/
{
@@ -307,7 +303,7 @@ IMPL_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus*, pStatus )
// -----------------------------------------------------------------------
-// muss in AppDaten
+// Required in App data
static ULONG nLastTime = 0;
long TimeOut_Impl( void*, void* pArgV )
@@ -327,9 +323,9 @@ long TimeOut_Impl( void*, void* pArgV )
BOOL SfxProgress::SetStateText
(
- ULONG nNewVal, /* neuer Wert f"ur die Fortschritts-Anzeige */
- const String& rNewVal, /* Status als Text */
- ULONG nNewRange /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
+ ULONG nNewVal, /* New value for the progress-bar */
+ const String& rNewVal, /* Status as Text */
+ ULONG nNewRange /* new maximum value, 0 for retaining the old */
)
{
@@ -341,23 +337,21 @@ BOOL SfxProgress::SetStateText
BOOL SfxProgress::SetState
(
- ULONG nNewVal, /* neuer Wert f"ur die Fortschritts-Anzeige */
+ ULONG nNewVal, /* new value for the progress bar */
- ULONG nNewRange /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
+ ULONG nNewRange /* new maximum value, 0 for retaining the old */
)
-/* [Beschreibung]
+/* [Description]
- Setzen des aktuellen Status; nach einem zeitlichen Versatz
- wird Reschedule aufgerufen.
+ Setting the current status, after a time delay Reschedule is called.
-
- [R"uckgabewert]
+ [Return value]
BOOL TRUE
- Fortfahren mit der Aktion
+ Proceed with the action
FALSE
- Abbrechen der Aktion
+ Cancel action
*/
{
@@ -367,17 +361,14 @@ BOOL SfxProgress::SetState
if( pImp->pActiveProgress ) return TRUE;
- // neuen Wert "ubernehmen
- BOOL bOver=FALSE;
nVal = nNewVal;
- // neuer Range?
+ // new Range?
if ( nNewRange && nNewRange != pImp->nMax )
{
DBG( DbgOutf( "SfxProgress: range changed from %lu to %lu",
pImp->nMax, nNewRange ) );
pImp->nMax = nNewRange;
- bOver = TRUE;
}
if ( !pImp->xStatusInd.is() )
@@ -443,11 +434,12 @@ BOOL SfxProgress::SetState
void SfxProgress::Resume()
-/* [Beschreibung]
+/* [Description]
- Nimmt die Anzeige des Status nach einer Unterbrechung wieder auf.
+ Resumed the status of the display after an interrupt.
- [Querverweise]
+ [Cross-reference]
+
<SfxProgress::Suspend()>
*/
@@ -488,11 +480,12 @@ void SfxProgress::Resume()
void SfxProgress::Suspend()
-/* [Beschreibung]
+/* [Description]
- Unterbricht die Anzeige des Status
+ Interrupts the status of the display
- [Querverweise]
+ [Cross-reference]
+
<SfxProgress::Resume()>
*/
@@ -530,8 +523,8 @@ void SfxProgress::Suspend()
void SfxProgress::Lock()
{
if( pImp->pActiveProgress ) return;
- // kein Reschedule bei Embedded-Objekten,
- // da wir gegen das OLE Protokoll wehrlos sind
+ // No Reschedule for Embedded-Objects,
+ // because we are defenseless against the OLE protocol
if ( !pImp->xObjSh.Is() )
{
for ( SfxObjectShell *pDocSh = SfxObjectShell::GetFirst();
@@ -581,10 +574,9 @@ void SfxProgress::UnLock()
void SfxProgress::Reschedule()
-/* [Beschreibung]
-
- Reschedule von au"sen rufbar
+/* [Description]
+ Reschedule, callable from the outside
*/
{
@@ -608,17 +600,14 @@ void SfxProgress::Reschedule()
void SfxProgress::SetWaitMode
(
- BOOL bWait /* TRUE
- Wartecursor wird verwendet
+ BOOL bWait /* TRUE Wait-cursor is used
- FALSE
- Es wird kein Wartecursor verwendet */
+ FALSE Wait-cursor not used */
)
-/* [Beschreibung]
-
- Wartecursor-Modus umschalten.
+/* [Description]
+ Switch Wait-mode.
*/
{
@@ -656,10 +645,9 @@ void SfxProgress::SetWaitMode
BOOL SfxProgress::GetWaitMode() const
-/* [Beschreibung]
-
- Wartecursor-Modus abfragen.
+/* [Description]
+ Get Wait-cursor mode.
*/
{
@@ -670,36 +658,34 @@ BOOL SfxProgress::GetWaitMode() const
SfxProgress* SfxProgress::GetActiveProgress
(
- SfxObjectShell* pDocSh /* <SfxObjectShell>, die nach einem laufenden
- <SfxProgress> gefragt werden soll, oder
- 0, wenn ein f"ur die gesamte Applikation
- laufender SfxProgress erfragt werden soll.
- Der Pointer braucht nur zum Zeitpunkt des
- Aufrufs g"ultig zu sein. */
+ SfxObjectShell* pDocSh /* the <SfxObjectShell>, which should be
+ queried after a current <SfxProgress>,
+ or 0 if an current SfxProgress for the
+ entire application should be obtained.
+ The pointer only needs at the time of
+ the call to be valid.
+ */
)
-/* [Beschreibung]
-
- Mit dieser Methode kann erfragt werden, ob und welcher <SfxProgress>-
- f"ur eine bestimmte Instanz von SfxObjectShell oder gar die gesamte
- Applikation zur Zeit aktiv ist. Dies kann z.B. zum Abfangen von
- Time-Out-Events etc. verwendet werden.
-
- Anstelle eines Pointer auf den SfxProgress der SfxObjectShell wird
- ggf. der auf den SfxProgress der Applikation geliefert, mit der
- Abfrage 'SfxProgress::GetActiveProgress(pMyDocSh)' wird also
- insofern vorhanden der SfxProgress von 'pMyDocSh' geliefert,
- sonst der SfxProgress der Applikation bzw. ein 0-Pointer.
+/* [Description]
+ This method is used to check whether and which <SfxProgress> is currently
+ active for a specific instance of SfxObjectShell or even an entire
+ application. This can for example be used to check for Time-Out-Events, etc.
- [Anmerkung]
+ Instead of a pointer to the SfxProgress the SfxObjectShell may be
+ pointed at the SfxProgress of the application, with the query
+ 'SfxProgress:: GetActiveProgress (pMyDocSh)' thus the current
+ SfxProgress of 'pMyDocSh' is delivered, otherwise the SfxProgress of
+ the application or a 0-pointer.
- "auft kein SfxProgress an der Applikation und ebenfalls keiner an
- der angegebenen SfxObjectShell, dann wird immer 0 zur"uckgeliefert,
- auch wenn an einer anderen SfxObjectShell ein SfxProgress l"uft.
+ [Note]
+ If no SfxProgress is running in the application and also not at the
+ specified SfxObjectShell, then this method will always return 0,
+ even if one SfxProgress runs on another SfxObjectShell.
- [Querverweise]
+ [Cross-reference]
<SfxApplication::GetProgress()const>
<SfxObjectShell::GetProgress()const>
@@ -735,19 +721,19 @@ void SfxProgress::LeaveLock()
// -----------------------------------------------------------------------
-FASTBOOL SfxProgress::StatusBarManagerGone_Impl
+bool SfxProgress::StatusBarManagerGone_Impl
(
- SfxStatusBarManager * // dieser <SfxStatusBarManager> wird zerst"ort
+ SfxStatusBarManager * // This <SfxStatusBarManager> will be destroyed
)
-/* [Beschreibung]
+/* [Description]
- Interne Methode zum Benachrichtigen des SfxProgress, da\s der angegebene
- SfxStatusBarManger zerst"ort wird. Damit der Progress ihn loslassen
- kann.
+ Internal method for notifying the SfxProgress that the specified
+ SfxStatusBarManger will be destroyed so that the Progress can let go of it.
*/
{
return TRUE;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index b649d9d925..3df8304fce 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.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.
@@ -57,9 +58,9 @@
using namespace ::com::sun::star;
-sal_Char __FAR_DATA sHTML_MIME_text[] = "text/";
-sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
-sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
+sal_Char sHTML_MIME_text[] = "text/";
+sal_Char sHTML_MIME_application[] = "application/";
+sal_Char sHTML_MIME_experimental[] = "x-";
// <INPUT TYPE=xxx>
static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
@@ -85,24 +86,24 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
"SfxHTMLParser::SfxHTMLParser: Switch to UCS2?" );
// Altough the real default encoding is ISO8859-1, we use MS-1252
- // als default encoding.
+ // as default encoding.
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( TRUE );
}
-__EXPORT SfxHTMLParser::~SfxHTMLParser()
+SfxHTMLParser::~SfxHTMLParser()
{
- DBG_ASSERT( !pDLMedium, "Da ist ein File-Download stehengeblieben" );
+ DBG_ASSERT( !pDLMedium, "Here is a File Download that has got stuck" );
delete pDLMedium;
}
BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
const HTMLOptions * pOptions)
{
- DBG_ASSERT( pImageMap, "ParseMapOptions: keine Image-Map" );
- DBG_ASSERT( pOptions, "ParseMapOptions: keine Optionen" );
+ DBG_ASSERT( pImageMap, "ParseMapOptions: No Image-Map" );
+ DBG_ASSERT( pOptions, "ParseMapOptions: No Options" );
String aName;
@@ -128,8 +129,8 @@ BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseUR
USHORT nEventMouseOver,
USHORT nEventMouseOut )
{
- DBG_ASSERT( pImageMap, "ParseAreaOptions: keine Image-Map" );
- DBG_ASSERT( pOptions, "ParseAreaOptions: keine Optionen" );
+ DBG_ASSERT( pImageMap, "ParseAreaOptions: no Image-Map" );
+ DBG_ASSERT( pOptions, "ParseAreaOptions: no Options" );
USHORT nShape = IMAP_OBJ_RECTANGLE;
SvULongs aCoords;
@@ -246,53 +247,48 @@ IMAPOBJ_SETEVENT:
void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
SfxObjectShell *pSh )
{
- DBG_ASSERT( !pDLMedium, "StartFileDwonload bei aktivem Download" );
+ DBG_ASSERT( !pDLMedium, "StartFileDownload when active Download" );
if( pDLMedium )
return;
pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, FALSE );
if( pSh )
{
- // Medium registrieren, damit abgebrochen werden kann
+ // Register the medium, so that it can be stopped.
pSh->RegisterTransfer( *pDLMedium );
- // Target-Frame uebertragen, damit auch javascript:-URLs
- // "geladen" werden koennen.
+ // Transfer Target-Frame, so that also the javascript:-URLs
+ // can be "loaded".
//const SfxMedium *pShMedium = pSh->GetMedium();
//if( pShMedium )
- // pDLMedium->SetLoadTargetFrame( pShMedium->GetLoadTargetFrame() );
+ // pDLMedium->SetLoadTargetFrame( pShMedium->GetLoadTargetFrame() );
}
- // Download anstossen (Achtung: Kann auch synchron sein).
+ // Push Download (Note: Can also be synchronous).
if ( TRUE /*pMedium->GetDoneLink() == Link()*/ )
pDLMedium->DownLoad();
else
{
- // Downloading-Flag auf TRUE setzen. Es werden dann auch
- // Data-Available-Links, wenn wir in den Pending-Staus gelangen.
+ // Set Downloading-Flag to TRUE. When we get into the Pending-status
+ // we will then also have Data-Available-Links.
SetDownloadingFile( TRUE );
pDLMedium->DownLoad( STATIC_LINK( this, SfxHTMLParser, FileDownloadDone ) );
- // Wenn das Dowsnloading-Flag noch gesetzt ist erfolgt der Download
- // asynchron. Wir gehen dann in den Pedning-Staus und warten dort.
- // Solange sind alle Aufrufe des Data-Avaialble-Link gesperrt.
+ // If the Downloading-Flag is still set downloading will be done
+ // asynchronously. We will go into Pedning-status and wait there.
+ // As long as we are there all calls to the Data-Link Avaialble are
+ // locked.
if( IsDownloadingFile() )
{
- // Den aktuellen Zustand einfrieren und in den Pending-Status gehen.
- // Wenn der Download beendet oder abgebrochen wurde, wird ueber
- // NewDataRead ein Continue mit dem uebergeben Token angesteossen.
+ // Unfreeze the current state and go into the Pending-Status.
+ // When the download is completed or aborted, a Continue with
+ // the transfer token will be pushed by passedNewDataRead.
SaveState( nToken );
eState = SVPAR_PENDING;
}
}
}
-BOOL SfxHTMLParser::GetFileDownloadMIME( String& rMIME )
-{
- return pDLMedium && pDLMedium->GetErrorCode()==0 &&
- pDLMedium->GetMIMEAndRedirect(rMIME)==0;
-}
-
BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
{
String aStr;
@@ -304,7 +300,7 @@ BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
DBG_ASSERT( pStream, "Kein In-Stream vom Medium erhalten" );
SvMemoryStream aStream;
- if( pStream ) // HACK wegen #65563#
+ if( pStream ) // HACK due to bug #65563#
aStream << *pStream;
aStream.Seek( STREAM_SEEK_TO_END );
@@ -314,17 +310,6 @@ BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
? (xub_StrLen)aStream.Tell()
: STRING_MAXLEN;
- // TODO: untested!!!
- rtl_TextEncoding eEnc =
- GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 );
- String sMime;
- if( pDLMedium->GetMIMEAndRedirect( sMime ) == 0 )
- {
- rtl_TextEncoding eMimeEnc = GetEncodingByMIME( sMime );
- if( RTL_TEXTENCODING_DONTKNOW != eMimeEnc )
- eEnc = eMimeEnc;
- }
-
ByteString sBuffer;
sal_Char* pBuffer = sBuffer.AllocBuffer(nLen);
aStream.Seek( 0 );
@@ -340,11 +325,11 @@ BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
{
- // Der Download ist jetzt abgeschlossen. Ausserdem muss/darf der
- // Data-Available-Link wieder durchgelassen werden.
+ // The Download is now completed. also the Data-Available-Link
+ // must or are allowed to be passed through.
pThis->SetDownloadingFile( FALSE );
- // ... und einmal aufrufen, damit weitergelesen wird.
+ // ... and call once, thus will continue reading.
pThis->CallAsyncCallLink();
return 0;
@@ -445,3 +430,4 @@ double SfxHTMLParser::GetTableDataOptionsValNum( sal_uInt32& nNumForm,
return fVal;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 361f52ea2d..6731d282cc 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.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,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
#include <tools/simplerm.hxx>
#include "sfx2/sfxresid.hxx"
@@ -71,3 +70,4 @@ void SfxResId::DeleteResMgr()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index c2308c7b61..96de652a54 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.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.
@@ -66,24 +67,20 @@ using namespace com::sun::star;
SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl )
{
DelDtor();
- for (USHORT n=0; n<rTbl.Count(); n++ )
+ for ( size_t i = 0, n = rTbl.size(); i < n; ++i )
{
- SfxEventName* pTmp = ((SfxEventNamesList&)rTbl).GetObject(n);
- SfxEventName *pNew = new SfxEventName( *pTmp );
- Insert( pNew, n );
+ SfxEventName* pTmp = rTbl.at( i );
+ SfxEventName* pNew = new SfxEventName( *pTmp );
+ aEventNamesList.push_back( pNew );
}
return *this;
}
void SfxEventNamesList::DelDtor()
{
- SfxEventName* pTmp = First();
- while( pTmp )
- {
- delete pTmp;
- pTmp = Next();
- }
- Clear();
+ for ( size_t i = 0, n = aEventNamesList.size(); i < n; ++i )
+ delete aEventNamesList[ i ];
+ aEventNamesList.clear();
}
int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
@@ -93,13 +90,13 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
const SfxEventNamesList& rOwn = aEventsList;
const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
- if ( rOwn.Count() != rOther.Count() )
+ if ( rOwn.size() != rOther.size() )
return FALSE;
- for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
+ for ( size_t nNo = 0, nCnt = rOwn.size(); nNo < nCnt; ++nNo )
{
- const SfxEventName *pOwn = rOwn.GetObject(nNo);
- const SfxEventName *pOther = rOther.GetObject(nNo);
+ const SfxEventName *pOwn = rOwn.at( nNo );
+ const SfxEventName *pOther = rOther.at( nNo );
if ( pOwn->mnId != pOther->mnId ||
pOwn->maEventName != pOther->maEventName ||
pOwn->maUIName != pOther->maUIName )
@@ -145,7 +142,7 @@ USHORT SfxEventNamesItem::GetVersion( USHORT ) const
void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
{
- aEventsList.Insert( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
+ aEventsList.push_back( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
}
@@ -173,17 +170,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
uno::Sequence < beans::PropertyValue > aProperties(3);
beans::PropertyValue *pValues = aProperties.getArray();
- ::rtl::OUString aType = ::rtl::OUString::createFromAscii( STAR_BASIC );;
+ ::rtl::OUString aType(RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
pValues[ 0 ].Value <<= aType;
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_LIBRARY );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
pValues[ 1 ].Value <<= aLib;
- pValues[ 2 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+ pValues[ 2 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
pValues[ 2 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -196,10 +193,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
pValues[ 0 ].Value <<= aLib;
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_SCRIPT );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -211,10 +208,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
- pValues[ 0 ].Value <<= ::rtl::OUString::createFromAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+ pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+ pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
- pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+ pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -245,7 +242,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
{
xSupplier = uno::Reference < document::XEventsSupplier >
( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), uno::UNO_QUERY );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), uno::UNO_QUERY );
}
if ( xSupplier.is() )
@@ -291,3 +288,5 @@ SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any&
{
return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ef0c1e80c3..ae4ce0819d 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.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.
@@ -49,10 +50,7 @@
#include <comphelper/processfactory.hxx>
#include <svtools/itemdel.hxx>
-#ifndef GCC
-#endif
-
-// wg. nInReschedule
+//Includes below due to nInReschedule
#include "appdata.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/msg.hxx>
@@ -151,33 +149,33 @@ public:
SfxWorkWindow* pWorkWin;
SfxBindings* pSubBindings;
SfxBindings* pSuperBindings;
- SfxStateCacheArr_Impl* pCaches; // je ein cache fuer jede gebundene
- sal_uInt16 nCachedFunc1; // index der zuletzt gerufenen
- sal_uInt16 nCachedFunc2; // index der vorletzt gerufenen
- sal_uInt16 nMsgPos; // Message-Position, ab der zu aktualisieren ist
- SfxPopupAction ePopupAction; // in DeleteFloatinWindow() abgefragt
- sal_Bool bContextChanged;
- sal_Bool bMsgDirty; // wurde ein MessageServer invalidiert?
- sal_Bool bAllMsgDirty; // wurden die MessageServer invalidiert?
- sal_Bool bAllDirty; // nach InvalidateAll
- sal_Bool bCtrlReleased; // waehrend EnterRegistrations
- AutoTimer aTimer; // fuer volatile Slots
- sal_Bool bInUpdate; // fuer Assertions
- sal_Bool bInNextJob; // fuer Assertions
- sal_Bool bFirstRound; // Erste Runde im Update
- sal_uInt16 nFirstShell; // Shell, die in erster Runde bevorzugt wird
- sal_uInt16 nOwnRegLevel; // z"ahlt die echten Locks, ohne die der SuperBindings
- InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update
+ SfxStateCacheArr_Impl* pCaches; // One chache for each binding
+ sal_uInt16 nCachedFunc1; // index for the last one called
+ sal_uInt16 nCachedFunc2; // index for the second last called
+ sal_uInt16 nMsgPos; // Message-Position relative the one to be updated
+ SfxPopupAction ePopupAction; // Checked in DeleteFloatinWindow()
+ sal_Bool bContextChanged;
+ sal_Bool bMsgDirty; // Has a MessageServer been invalidated?
+ sal_Bool bAllMsgDirty; // Has a MessageServer been invalidated?
+ sal_Bool bAllDirty; // After InvalidateAll
+ sal_Bool bCtrlReleased; // while EnterRegistrations
+ AutoTimer aTimer; // for volatile Slots
+ sal_Bool bInUpdate; // for Assertions
+ sal_Bool bInNextJob; // for Assertions
+ sal_Bool bFirstRound; // First round in Update
+ sal_uInt16 nFirstShell; // Shell, the first round is prefered
+ sal_uInt16 nOwnRegLevel; // Counts the real Locks, exept those of the Super Bindings
+ InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update
};
//--------------------------------------------------------------------
struct SfxFoundCache_Impl
{
- sal_uInt16 nSlotId; // die Slot-Id
- sal_uInt16 nWhichId; // falls verf"ugbar die Which-Id, sonst nSlotId
- const SfxSlot* pSlot; // Pointer auf den <Master-Slot>
- SfxStateCache* pCache; // Pointer auf den StatusCache, ggf. 0
+ sal_uInt16 nSlotId; // the Slot-Id
+ sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
+ const SfxSlot* pSlot; // Pointer to <Master-Slot>
+ SfxStateCache* pCache; // Pointer to StatusCache, if possible NULL
SfxFoundCache_Impl():
nSlotId(0),
@@ -217,7 +215,7 @@ SV_IMPL_OP_PTRARR_SORT(SfxFoundCacheArr_Impl, SfxFoundCache_Impl*);
SfxBindings::SfxBindings()
: pImp(new SfxBindings_Impl),
pDispatcher(0),
- nRegLevel(1) // geht erst auf 0, wenn Dispatcher gesetzt
+ nRegLevel(1) // first becomes 0, when the Dispatcher is set
{
pImp->nMsgPos = 0;
pImp->bAllMsgDirty = sal_True;
@@ -247,21 +245,20 @@ SfxBindings::SfxBindings()
SfxBindings::~SfxBindings()
-/* [Beschreibung]
+/* [Description]
- Destruktor der Klasse SfxBindings. Die eine, f"ur jede <SfxApplication>
- existierende Instanz wird von der <SfxApplication> nach Ausf"urhung
- von <SfxApplication::Exit()> automatisch zerst"ort.
+ Destructor of the SfxBindings class. The one, for each <SfxApplication>
+ existing Instance is automatica├Âlly destroyed by the <SfxApplication>
+ after the execution of <SfxApplication::Exit()>.
- Noch existierende <SfxControllerItem> Instanzen, die bei dieser
- SfxBindings Instanz angemeldet sind, werden im Destruktor
- automatisch zerst"ort. Dies sind i.d.R. Floating-Toolboxen, Value-Sets
- etc. Arrays von SfxControllerItems d"urfen zu diesem Zeitpunkt nicht
- mehr exisitieren.
+ The still existing <SfxControllerItem> instances, which are registered
+ by the SfxBindings instance, are automatically destroyed in the Destructor.
+ These are usually the Floating-Toolboxen, Value-Sets
+ etc. Arrays of SfxControllerItems may at this time no longer exist.
*/
{
- // Die SubBindings sollen ja nicht gelocked werden !
+ // The SubBindings should not be locked!
pImp->pSubBindings = NULL;
ENTERREGISTRATIONS();
@@ -269,7 +266,7 @@ SfxBindings::~SfxBindings()
pImp->aTimer.Stop();
DeleteControllers_Impl();
- // Caches selbst l"oschen
+ // Delete Caches
sal_uInt16 nCount = pImp->pCaches->Count();
for ( sal_uInt16 nCache = 0; nCache < nCount; ++nCache )
delete pImp->pCaches->GetObject(nCache);
@@ -284,19 +281,19 @@ SfxBindings::~SfxBindings()
void SfxBindings::DeleteControllers_Impl()
{
- // in der ersten Runde den SfxPopupWindows l"oschen
+ // in the first round delete SfxPopupWindows
sal_uInt16 nCount = pImp->pCaches->Count();
sal_uInt16 nCache;
for ( nCache = 0; nCache < nCount; ++nCache )
{
- // merken wo man ist
+ // Remember were you are
SfxStateCache *pCache = pImp->pCaches->GetObject(nCache);
sal_uInt16 nSlotId = pCache->GetId();
- // SfxPopupWindow l"oschen lassen
+ // Delete SfxPopupWindow
pCache->DeleteFloatingWindows();
- // da der Cache verkleinert worden sein kann, wiederaufsetzen
+ // Re-align, because the cache may have been reduced
sal_uInt16 nNewCount = pImp->pCaches->Count();
if ( nNewCount < nCount )
{
@@ -308,13 +305,13 @@ void SfxBindings::DeleteControllers_Impl()
}
}
- // alle Caches l"oschen
+ // Delete all Caches
for ( nCache = pImp->pCaches->Count(); nCache > 0; --nCache )
{
- // Cache via ::com::sun::star::sdbcx::Index besorgen
+ // Get Cache via ::com::sun::star::sdbcx::Index
SfxStateCache *pCache = pImp->pCaches->GetObject(nCache-1);
- // alle Controller in dem Cache unbinden
+ // unbind all controllers in the cache
SfxControllerItem *pNext;
for ( SfxControllerItem *pCtrl = pCache->GetItemLink();
pCtrl; pCtrl = pNext )
@@ -326,7 +323,7 @@ void SfxBindings::DeleteControllers_Impl()
if ( pCache->GetInternalController() )
pCache->GetInternalController()->UnBind();
- // Cache l"oschen
+ // Delete Cache
if( nCache-1 < pImp->pCaches->Count() )
delete (*pImp->pCaches)[nCache-1];
pImp->pCaches->Remove(nCache-1, 1);
@@ -341,7 +338,7 @@ void SfxBindings::DeleteControllers_Impl()
pCtrl->ReleaseBindings();
}
- DBG_ASSERT( !pImp->pUnoCtrlArr->Count(), "UnoControllerItems nicht entfernt!" );
+ DBG_ASSERT( !pImp->pUnoCtrlArr->Count(), "Do not remove UnoControllerItems!" );
DELETEZ( pImp->pUnoCtrlArr );
}
}
@@ -358,7 +355,7 @@ SfxPopupAction SfxBindings::GetPopupAction_Impl() const
void SfxBindings::HidePopups( bool bHide )
{
- // SfxPopupWindows hiden
+ // Hide SfxPopupWindows
HidePopupCtrls_Impl( bHide );
SfxBindings *pSub = pImp->pSubBindings;
while ( pSub )
@@ -367,22 +364,22 @@ void SfxBindings::HidePopups( bool bHide )
pSub = pSub->pImp->pSubBindings;
}
- // SfxChildWindows hiden
+ // Hide SfxChildWindows
DBG_ASSERT( pDispatcher, "HidePopups not allowed without dispatcher" );
if ( pImp->pWorkWin )
pImp->pWorkWin->HidePopups_Impl( bHide, sal_True );
}
-void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide )
+void SfxBindings::HidePopupCtrls_Impl( bool bHide )
{
if ( bHide )
{
- // SfxPopupWindows hiden
+ // Hide SfxPopupWindows
pImp->ePopupAction = SFX_POPUP_HIDE;
}
else
{
- // SfxPopupWindows showen
+ // Show SfxPopupWindows
pImp->ePopupAction = SFX_POPUP_SHOW;
}
@@ -395,7 +392,7 @@ void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide )
void SfxBindings::Update_Impl
(
- SfxStateCache* pCache // der upzudatende SfxStatusCache
+ SfxStateCache* pCache // The up to date SfxStatusCache
)
{
if( pCache->GetDispatch().is() && pCache->GetItemLink() )
@@ -409,7 +406,7 @@ void SfxBindings::Update_Impl
return;
DBG_PROFSTART(SfxBindingsUpdate_Impl);
- // alle mit derselben Statusmethode zusammensammeln, die dirty sind
+ // gather together all with the same status method which are dirty
SfxDispatcher &rDispat = *pDispatcher;
const SfxSlot *pRealSlot = 0;
const SfxSlotServer* pMsgServer = 0;
@@ -418,10 +415,10 @@ void SfxBindings::Update_Impl
sal_Bool bUpdated = sal_False;
if ( pSet )
{
- // Status erfragen
+ // Query Status
if ( rDispat._FillState( *pMsgServer, *pSet, pRealSlot ) )
{
- // Status posten
+ // Post Status
const SfxInterface *pInterface =
rDispat.GetShell(pMsgServer->GetShellLevel())->GetInterface();
for ( sal_uInt16 nPos = 0; nPos < aFound.Count(); ++nPos )
@@ -442,8 +439,9 @@ void SfxBindings::Update_Impl
if ( !bUpdated && pCache )
{
- // Wenn pCache == NULL und kein SlotServer ( z.B. weil Dispatcher gelockt! ),
- // darf nat"urlich kein Update versucht werden
+ // When pCache == NULL and no SlotServer
+ // (for example due to locked Dispatcher! ),
+ // obviously do not try to update
SfxFoundCache_Impl aFoundCache(
pCache->GetId(), 0,
pRealSlot, pCache );
@@ -477,13 +475,13 @@ void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( USHORT nId )
void SfxBindings::Update
(
- sal_uInt16 nId // die gebundene und upzudatende Slot-Id
+ sal_uInt16 nId // the bound and up-to-date Slot-Id
)
{
DBG_MEMTEST();
DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
-//!!TLX: Fuehrte zu Vorlagenkatalogstillstand
+//!!TLX: leads to Template Gallery freeze
// if ( nRegLevel )
// return;
@@ -514,7 +512,7 @@ void SfxBindings::Update
if ( bInternalUpdate )
{
- // Status erfragen
+ // Query Status
const SfxSlotServer* pMsgServer = pCache->GetSlotServer(*pDispatcher, pImp->xProv);
if ( !pCache->IsControllerDirty() &&
( !pMsgServer ||
@@ -572,10 +570,10 @@ void SfxBindings::Update()
void SfxBindings::SetState
(
- const SfxItemSet& rSet // zu setzende Status-Werte
+ const SfxItemSet& rSet // status values to be set
)
{
- // wenn gelockt, dann nur invalidieren
+ // when locked then only invalidate
if ( nRegLevel )
{
SfxItemIter aIter(rSet);
@@ -586,12 +584,12 @@ void SfxBindings::SetState
}
else
{
- // Status d"urfen nur angenommen werden, wenn alle Slot-Pointer gesetzt sind
+ // Status may be accepted only if all slot-pointers are set
if ( pImp->bMsgDirty )
UpdateSlotServer_Impl();
- // "uber das ItemSet iterieren, falls Slot gebunden, updaten
- //! Bug: WhichIter verwenden und ggf. VoidItems hochschicken
+ // Iterate over the itemset, update if the slot bound
+ //! Bug: Use WhichIter and possibly send VoidItems up
SfxItemIter aIter(rSet);
for ( const SfxPoolItem *pItem = aIter.FirstItem();
pItem;
@@ -601,12 +599,12 @@ void SfxBindings::SetState
GetStateCache( rSet.GetPool()->GetSlotId(pItem->Which()) );
if ( pCache )
{
- // Status updaten
+ // Update status
if ( !pCache->IsControllerDirty() )
pCache->Invalidate(sal_False);
pCache->SetState( SFX_ITEM_AVAILABLE, pItem );
- //! nicht implementiert: Updates von EnumSlots via MasterSlots
+ //! Not implemented: Updates from EnumSlots via master slots
}
}
}
@@ -616,7 +614,7 @@ void SfxBindings::SetState
void SfxBindings::SetState
(
- const SfxPoolItem& rItem // zu setzender Status-Wert
+ const SfxPoolItem& rItem // Status value to be set
)
{
if ( nRegLevel )
@@ -625,22 +623,22 @@ void SfxBindings::SetState
}
else
{
- // Status d"urfen nur angenommen werden, wenn alle Slot-Pointer gesetzt sind
+ // Status may be accepted only if all slot-pointers are set
if ( pImp->bMsgDirty )
UpdateSlotServer_Impl();
- // falls der Slot gebunden ist, updaten
+ //update if the slot bound
DBG_ASSERT( SfxItemPool::IsSlot( rItem.Which() ),
"cannot set items with which-id" );
SfxStateCache* pCache = GetStateCache( rItem.Which() );
if ( pCache )
{
- // Status updaten
+ // Update Status
if ( !pCache->IsControllerDirty() )
pCache->Invalidate(sal_False);
pCache->SetState( SFX_ITEM_AVAILABLE, &rItem );
- //! nicht implementiert: Updates von EnumSlots via MasterSlots
+ //! Not implemented: Updates from EnumSlots via master slots
}
}
}
@@ -658,13 +656,11 @@ SfxStateCache* SfxBindings::GetAnyStateCache_Impl( sal_uInt16 nId )
SfxStateCache* SfxBindings::GetStateCache
(
- sal_uInt16 nId /* Slot-Id, deren SfxStatusCache gefunden
- werden soll */,
- sal_uInt16* pPos /* 0 bzw. Position, ab der die Bindings
- bin"ar durchsucht werden sollen. Liefert
- die Position zur"uck, an der nId gefunden
- wurde, bzw. an der es einfef"ugt werden
- w"urde. */
+ sal_uInt16 nId, /* Slot-Id, which SfxStatusCache is to be found */
+ sal_uInt16* pPos /* NULL for instance the position from which the
+ bindings are to be searched binary. Returns the
+ position back for where the nId was found,
+ or where it was inserted. */
)
{
DBG_MEMTEST();
@@ -687,11 +683,8 @@ SfxStateCache* SfxBindings::GetStateCache
void SfxBindings::InvalidateAll
(
- sal_Bool bWithMsg /* sal_True
- Slot-Server als ung"ultig markieren
-
- sal_False
- Slot-Server bleiben g"ultig */
+ sal_Bool bWithMsg /* sal_True Mark Slot Server as invalid
+ sal_False Slot Server remains valid */
)
{
DBG_PROFSTART(SfxBindingsInvalidateAll);
@@ -702,7 +695,7 @@ void SfxBindings::InvalidateAll
if ( pImp->pSubBindings )
pImp->pSubBindings->InvalidateAll( bWithMsg );
- // ist schon alles dirty gesetzt oder downing => nicht zu tun
+ // everything is already set dirty or downing => nothing to do
if ( !pDispatcher ||
( pImp->bAllDirty && ( !bWithMsg || pImp->bAllMsgDirty ) ) ||
SFX_APP()->IsDowning() )
@@ -741,8 +734,8 @@ void SfxBindings::InvalidateAll
void SfxBindings::Invalidate
(
- const sal_uInt16* pIds /* numerisch sortiertes 0-terminiertes Array
- von Slot-Ids (einzel, nicht als Paare!) */
+ const sal_uInt16* pIds /* numerically sorted NULL-terminated array of
+ slot IDs (individual, not as a couple!) */
)
{
DBG_PROFSTART(SfxBindingsInvalidateAll);
@@ -764,27 +757,27 @@ void SfxBindings::Invalidate
if ( pImp->pSubBindings )
pImp->pSubBindings->Invalidate( pIds );
- // ist schon alles dirty gesetzt oder downing => nicht zu tun
+ // everything is already set dirty or downing => nothing to do
if ( !pDispatcher || pImp->bAllDirty || SFX_APP()->IsDowning() )
return;
- // in immer kleiner werdenden Berichen bin"ar suchen
+ // Search binary in always smaller areas
for ( sal_uInt16 n = GetSlotPos(*pIds);
*pIds && n < pImp->pCaches->Count();
n = GetSlotPos(*pIds, n) )
{
- // falls SID "uberhaupt gebunden ist, den Cache invalidieren
+ // If SID is ever bound, then invalidate the cache
SfxStateCache *pCache = pImp->pCaches->GetObject(n);
if ( pCache->GetId() == *pIds )
pCache->Invalidate(sal_False);
- // n"achste SID
+ // Next SID
if ( !*++pIds )
break;
DBG_ASSERT( *pIds > *(pIds-1), "pIds unsorted" );
}
- // falls nicht gelockt, Update-Timer starten
+ // if not enticed to start update timer
pImp->nMsgPos = 0;
if ( !nRegLevel )
{
@@ -802,17 +795,15 @@ void SfxBindings::Invalidate
void SfxBindings::InvalidateShell
(
- const SfxShell& rSh /* Die <SfxShell>, deren Slot-Ids
- invalidiert werden sollen. */,
-
- sal_Bool bDeep /* sal_True
- auch die, von der SfxShell
- ererbten Slot-Ids werden invalidert
-
- sal_False
- die ererbten und nicht "uberladenen
- Slot-Ids werden invalidiert */
- //! MI: z. Zt. immer bDeep
+ const SfxShell& rSh, /* <SfxShell>, which Slot-Ids should be
+ invalidated */
+ sal_Bool bDeep /* sal_True
+ also inherited slot IDs of SfxShell are invalidert
+
+ sal_False
+ the inherited and not overloaded Slot-Ids were
+ invalidiert */
+ //! MI: for now alwayds bDeep
)
{
DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
@@ -834,11 +825,11 @@ void SfxBindings::InvalidateShell
( pImp->bAllDirty && pImp->bAllMsgDirty ) ||
SFX_APP()->IsDowning() )
{
- // Wenn sowieso demn"achst alle Server geholt werden
+ // if the next one is anyway, then all the servers are collected
return;
}
- // Level finden
+ // Find Level
sal_uInt16 nLevel = pDispatcher->GetShellLevel(rSh);
if ( nLevel != USHRT_MAX )
{
@@ -868,7 +859,7 @@ void SfxBindings::InvalidateShell
void SfxBindings::Invalidate
(
- sal_uInt16 nId // zu invalidierende Slot-Id
+ sal_uInt16 nId // Status value to be set
)
{
DBG_MEMTEST();
@@ -906,9 +897,9 @@ void SfxBindings::Invalidate
void SfxBindings::Invalidate
(
- sal_uInt16 nId, // zu invalidierende Slot-Id
- sal_Bool bWithItem, // StateCache clearen ?
- sal_Bool bWithMsg // SlotServer neu holen ?
+ sal_uInt16 nId, // Status value to be set
+ sal_Bool bWithItem, // Clear StateCache?
+ sal_Bool bWithMsg // Get new SlotServer?
)
{
DBG_MEMTEST();
@@ -997,7 +988,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
while ( !bFound && nLow <= nHigh )
{
nMid = (nLow + nHigh) >> 1;
- DBG_ASSERT( nMid < pImp->pCaches->Count(), "bsearch ist buggy" );
+ DBG_ASSERT( nMid < pImp->pCaches->Count(), "bsearch is buggy" );
int nDiff = (int) nId - (int) ( ((*pImp->pCaches)[nMid])->GetId() );
if ( nDiff < 0)
{ if ( nMid == 0 )
@@ -1273,7 +1264,8 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
if ( SFX_KIND_ENUM == pSlot->GetKind() )
{
- // bei Enum-Slots muss der Master mit dem Wert des Enums executet werden
+ // for Enum-Slots, the Master has to be excecuted with the value
+ // of the enums Wert
const SfxSlot *pRealSlot = pShell->GetInterface()->GetRealSlot(pSlot);
const sal_uInt16 nSlotId = pRealSlot->GetSlotId();
aReq.SetSlot( nSlotId );
@@ -1282,12 +1274,12 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
}
else if ( SFX_KIND_ATTR == pSlot->GetKind() )
{
- // bei Attr-Slots muss der Which-Wert gemapped werden
+ // Which value has to be mapped for Attribute slots
const sal_uInt16 nSlotId = pSlot->GetSlotId();
aReq.SetSlot( nSlotId );
if ( pSlot->IsMode(SFX_SLOT_TOGGLE) )
{
- // an togglebare-Attribs (Bools) wird der Wert angeheangt
+ // The value is attached to a toggleable attribute (Bools)
sal_uInt16 nWhich = pSlot->GetWhich(rPool);
SfxItemSet aSet(rPool, nWhich, nWhich, 0);
SfxStateFunc aFunc = pSlot->GetStateFnc();
@@ -1307,7 +1299,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
{
if ( pOldItem->ISA(SfxBoolItem) )
{
- // wir koennen Bools toggeln
+ // we can toggle Bools
sal_Bool bOldValue = ((const SfxBoolItem *)pOldItem)->GetValue();
SfxBoolItem *pNewItem = (SfxBoolItem*) (pOldItem->Clone());
pNewItem->SetValue( !bOldValue );
@@ -1317,7 +1309,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
else if ( pOldItem->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pOldItem)->HasBoolValue())
{
- // und Enums mit Bool-Interface
+ // and Enums with Bool-Interface
SfxEnumItemInterface *pNewItem =
(SfxEnumItemInterface*) (pOldItem->Clone());
pNewItem->SetBoolValue(!((SfxEnumItemInterface *)pOldItem)->GetBoolValue());
@@ -1330,21 +1322,21 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
}
else if ( SFX_ITEM_DONTCARE == eState )
{
- // ein Status-Item per Factory erzeugen
+ // Create one Status-Item for each Factory
SfxPoolItem *pNewItem = pSlot->GetType()->CreateItem();
DBG_ASSERT( pNewItem, "Toggle an Slot ohne ItemFactory" );
pNewItem->SetWhich( nWhich );
if ( pNewItem->ISA(SfxBoolItem) )
{
- // wir koennen Bools toggeln
+ // we can toggle Bools
((SfxBoolItem*)pNewItem)->SetValue( sal_True );
aReq.AppendItem( *pNewItem );
}
else if ( pNewItem->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pNewItem)->HasBoolValue())
{
- // und Enums mit Bool-Interface
+ // and Enums with Bool-Interface
((SfxEnumItemInterface*)pNewItem)->SetBoolValue(sal_True);
aReq.AppendItem( *pNewItem );
}
@@ -1372,7 +1364,7 @@ void SfxBindings::UpdateSlotServer_Impl()
DBG_MEMTEST();
DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
- // synchronisieren
+ // synchronize
pDispatcher->Flush();
// pDispatcher->Update_Impl();
@@ -1411,9 +1403,9 @@ int __cdecl CmpUS_Impl(const void *p1, const void *p2)
int CmpUS_Impl(const void *p1, const void *p2)
#endif
-/* [Beschreibung]
+/* [Description]
- Interne Vergleichsfunktion fuer qsort.
+ Internal Comparison function for qsort.
*/
{
@@ -1424,10 +1416,10 @@ int CmpUS_Impl(const void *p1, const void *p2)
SfxItemSet* SfxBindings::CreateSet_Impl
(
- SfxStateCache*& pCache, // in: Status-Cache von nId
- const SfxSlot*& pRealSlot, // out: RealSlot zu nId
- const SfxSlotServer** pMsgServer, // out: Slot-Server zu nId
- SfxFoundCacheArr_Impl& rFound // out: Liste der Caches der Siblings
+ SfxStateCache*& pCache, // in: Status-Cache from nId
+ const SfxSlot*& pRealSlot, // out: RealSlot to nId
+ const SfxSlotServer** pMsgServer, // out: Slot-Server to nId
+ SfxFoundCacheArr_Impl& rFound // out: List of Caches for Siblings
)
{
DBG_MEMTEST();
@@ -1445,30 +1437,30 @@ SfxItemSet* SfxBindings::CreateSet_Impl
sal_uInt16 nShellLevel = pMsgSvr->GetShellLevel();
SfxShell *pShell = pDispatcher->GetShell( nShellLevel );
- if ( !pShell ) // seltener GPF beim Browsen durch Update aus Inet-Notify
+ if ( !pShell ) // rare GPF when browsing through update from Inet-Notify
return 0;
SfxItemPool &rPool = pShell->GetPool();
- // hole die Status-Methode, von der pCache bedient wird
+ // get the status method, which is served by the pCache
SfxStateFunc pFnc = 0;
const SfxInterface *pInterface = pShell->GetInterface();
if ( SFX_KIND_ENUM == pMsgSvr->GetSlot()->GetKind() )
{
pRealSlot = pInterface->GetRealSlot(pMsgSvr->GetSlot());
pCache = GetStateCache( pRealSlot->GetSlotId() );
-// DBG_ASSERT( pCache, "Kein Slotcache fuer den Masterslot gefunden!" );
+// DBG_ASSERT( pCache, "No slot cache found for the master slot!" );
}
else
pRealSlot = pMsgSvr->GetSlot();
//
- // Achtung: pCache darf auch NULL sein !!!
+ // Note: pCache can be NULL!
//
pFnc = pRealSlot->GetStateFnc();
- // der RealSlot ist immer drin
+ // the RealSlot is always on
const SfxFoundCache_Impl *pFound = new SfxFoundCache_Impl(
pRealSlot->GetSlotId(), pRealSlot->GetWhich(rPool), pRealSlot, pCache );
rFound.Insert( pFound );
@@ -1477,24 +1469,23 @@ SfxItemSet* SfxBindings::CreateSet_Impl
if ( !SfxMacroConfig::IsMacroSlot( nSlot ) && !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) )
{
pInterface = pInterface->GetRealInterfaceForSlot( pRealSlot );
- DBG_ASSERT (pInterface,"Slot in angegebener Shell nicht gefunden!");
+ DBG_ASSERT (pInterface,"Slot in the given shell is not found");
}
- // Durchsuche die Bindings nach den von derselben Funktion bedienten Slots.
- // Daf"ur kommen nur Slots in Frage, die es im gefundenen Interface gibt.
+ // Search through the bindings for slots served by the same function. This , // will only affect slots which are present in the found interface.
- // Die Position des Statecaches im StateCache-Array
+ // The position of the Statecaches in StateCache-Array
sal_uInt16 nCachePos = pImp->nMsgPos;
const SfxSlot *pSibling = pRealSlot->GetNextSlot();
- // Die Slots eines Interfaces sind im Kreis verkettet
+ // the Slots odf a interfaces ar linked in a circle
while ( pSibling > pRealSlot )
{
SfxStateFunc pSiblingFnc=0;
SfxStateCache *pSiblingCache =
GetStateCache( pSibling->GetSlotId(), &nCachePos );
- // Ist der Slot "uberhaupt gecached ?
+ // Is the slot cached ?
if ( pSiblingCache )
{
const SfxSlotServer *pServ = pSiblingCache->GetSlotServer(*pDispatcher, pImp->xProv);
@@ -1502,34 +1493,34 @@ SfxItemSet* SfxBindings::CreateSet_Impl
pSiblingFnc = pServ->GetSlot()->GetStateFnc();
}
- // Mu\s der Slot "uberhaupt upgedatet werden ?
- FASTBOOL bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
+ // Does the slot have to be updated at all?
+ bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
- // Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !!
- FASTBOOL bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
+ // Bugfix #26161#: It is not enough to ask for the same shell!!
+ bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
- // Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht
- // einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt.
+ // If the slot is a non-dirty master slot, then maybe one of his slaves
+ // is dirty? Then the master slot is still inserted.
if ( !bInsert && bSameMethod && pSibling->GetLinkedSlot() )
{
- // auch Slave-Slots auf Binding pru"fen
+ // Also check slave slots for Binding
const SfxSlot* pFirstSlave = pSibling->GetLinkedSlot();
for ( const SfxSlot *pSlaveSlot = pFirstSlave;
!bInsert;
pSlaveSlot = pSlaveSlot->GetNextSlot())
{
- // Die Slaves zeigen auf ihren Master
+ // the slaves points to its master
DBG_ASSERT(pSlaveSlot->GetLinkedSlot() == pSibling,
- "Falsche Master/Slave-Beziehung!");
+ "Wrong Master/Slave relationship!");
sal_uInt16 nCurMsgPos = pImp->nMsgPos;
const SfxStateCache *pSlaveCache =
GetStateCache( pSlaveSlot->GetSlotId(), &nCurMsgPos );
- // Ist der Slave-Slot gecached und dirty ?
+ // Is the slave slot chached and dirty ?
bInsert = pSlaveCache && pSlaveCache->IsControllerDirty();
- // Slaves sind untereinander im Kreis verkettet
+ // Slaves are chained together in a circle
if (pSlaveSlot->GetNextSlot() == pFirstSlave)
break;
}
@@ -1547,20 +1538,20 @@ SfxItemSet* SfxBindings::CreateSet_Impl
pSibling = pSibling->GetNextSlot();
}
- // aus den Ranges ein Set erzeugen
+ // Create a Set from the ranges
sal_uInt16 *pRanges = new sal_uInt16[rFound.Count() * 2 + 1];
int j = 0;
USHORT i = 0;
while ( i < rFound.Count() )
{
pRanges[j++] = rFound[i]->nWhichId;
- // aufeinanderfolgende Zahlen
+ // consecutive numbers
for ( ; i < rFound.Count()-1; ++i )
if ( rFound[i]->nWhichId+1 != rFound[i+1]->nWhichId )
break;
pRanges[j++] = rFound[i++]->nWhichId;
}
- pRanges[j] = 0; // terminierende NULL
+ pRanges[j] = 0; // terminating NULL
SfxItemSet *pSet = new SfxItemSet(rPool, pRanges);
delete [] pRanges;
DBG_PROFSTOP(SfxBindingsCreateSet);
@@ -1571,7 +1562,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
void SfxBindings::UpdateControllers_Impl
(
- const SfxInterface* pIF, // das diese Id momentan bedienende Interface
+ const SfxInterface* pIF, // Id of the current serving Interface
const SfxFoundCache_Impl* pFound, // Cache, Slot, Which etc.
const SfxPoolItem* pItem, // item to send to controller
SfxItemState eState // state of item
@@ -1585,18 +1576,18 @@ void SfxBindings::UpdateControllers_Impl
const SfxSlot* pSlot = pFound->pSlot;
DBG_ASSERT( !pCache || !pSlot || pCache->GetId() == pSlot->GetSlotId(), "SID mismatch" );
- // insofern gebunden, die Controller f"uer den Slot selbst updaten
+ // bound until now, the Controller to update the Slot.
if ( pCache && pCache->IsControllerDirty() )
{
if ( SFX_ITEM_DONTCARE == eState )
{
- // uneindeuting
+ // ambiguous
pCache->SetState( SFX_ITEM_DONTCARE, (SfxPoolItem *)-1 );
}
else if ( SFX_ITEM_DEFAULT == eState &&
pFound->nWhichId > SFX_WHICH_MAX )
{
- // kein Status oder Default aber ohne Pool
+ // no Status or Default but without Pool
SfxVoidItem aVoid(0);
pCache->SetState( SFX_ITEM_UNKNOWN, &aVoid );
}
@@ -1608,8 +1599,8 @@ void SfxBindings::UpdateControllers_Impl
DBG_PROFSTOP(SfxBindingsUpdateCtrl1);
- // insofern vorhanden und gebunden, die Controller f"uer Slave-Slots
- // (Enum-Werte) des Slots updaten
+ // Update the slots for so far available and bound Controllers for
+ // Slave-Slots (Enum-value)
DBG_PROFSTART(SfxBindingsUpdateCtrl2);
DBG_ASSERT( !pSlot || 0 == pSlot->GetLinkedSlot() || !pItem ||
pItem->ISA(SfxEnumItemInterface),
@@ -1617,7 +1608,7 @@ void SfxBindings::UpdateControllers_Impl
const SfxSlot *pFirstSlave = pSlot ? pSlot->GetLinkedSlot() : 0;
if ( pIF && pFirstSlave)
{
- // Items auf EnumItem casten
+ // Items cast on EnumItem
const SfxEnumItemInterface *pEnumItem =
PTR_CAST(SfxEnumItemInterface,pItem);
if ( eState == SFX_ITEM_AVAILABLE && !pEnumItem )
@@ -1625,14 +1616,14 @@ void SfxBindings::UpdateControllers_Impl
else
eState = SfxControllerItem::GetItemState( pEnumItem );
- // "uber alle Slaves-Slots iterieren
+ // Iterate over all Slaves-Slots
for ( const SfxSlot *pSlave = pFirstSlave; pSlave; pSlave = pSlave->GetNextSlot() )
{
- DBG_ASSERT(pSlave, "Falsche SlaveSlot-Verkettung!");
+ DBG_ASSERT(pSlave, "Wrong SlaveSlot binding!");
DBG_ASSERT(SFX_KIND_ENUM == pSlave->GetKind(),"non enum slaves aren't allowed");
DBG_ASSERT(pSlave->GetMasterSlotId() == pSlot->GetSlotId(),"falscher MasterSlot!");
- // ist die Funktion gebunden?
+ // Binding exist for function ?
SfxStateCache *pEnumCache = GetStateCache( pSlave->GetSlotId() );
if ( pEnumCache )
{
@@ -1657,14 +1648,14 @@ void SfxBindings::UpdateControllers_Impl
}
else if ( SFX_ITEM_AVAILABLE == eState )
{
- // enum-Wert ermitteln
+ // Determine enum value
sal_uInt16 nValue = pEnumItem->GetEnumValue();
SfxBoolItem aBool( pFound->nWhichId, pSlave->GetValue() == nValue );
pEnumCache->SetState(SFX_ITEM_AVAILABLE, &aBool);
}
else
{
- // uneindeuting
+ // ambiguous
pEnumCache->SetState( SFX_ITEM_DONTCARE, (SfxPoolItem *)-1 );
}
}
@@ -1683,8 +1674,8 @@ void SfxBindings::UpdateControllers_Impl
IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
{
#ifdef DBG_UTIL
- // on Windows very often C++ Exceptions (GPF etc.) are caught by MSVCRT or another MS library
- // try to get them here
+ // on Windows very often C++ Exceptions (GPF etc.) are caught by MSVCRT
+ // or another MS library try to get them here
try
{
#endif
@@ -1722,7 +1713,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
return sal_True;
}
- // gfs. alle Server aktualisieren / geschieht in eigener Zeitscheibe
+ // if possible Update all server / happens in its own time slice
if ( pImp->bMsgDirty )
{
UpdateSlotServer_Impl();
@@ -1736,7 +1727,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
// at least 10 loops and further if more jobs are available but no input
- FASTBOOL bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+ bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
sal_uInt16 nLoops = 10;
pImp->bInNextJob = sal_True;
const sal_uInt16 nCount = pImp->pCaches->Count();
@@ -1745,7 +1736,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
// iterate through the bound functions
sal_Bool bJobDone = sal_False;
while ( !bJobDone )
- {
+ {
SfxStateCache* pCache = (*pImp->pCaches)[pImp->nMsgPos];
DBG_ASSERT( pCache, "invalid SfxStateCache-position in job queue" );
sal_Bool bWasDirty = pCache->IsControllerDirty();
@@ -1755,8 +1746,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
sal_Bool bSkip = sal_False;
if ( pImp->bFirstRound )
{
- // Falls beim Update eine Shell vorgezogen werden soll,
- // kommt in einer ersten Update-Runde nur diese dran
const SfxSlotServer *pMsgServer =
pCache->GetSlotServer(*pDispatcher, pImp->xProv);
if ( pMsgServer &&
@@ -1780,8 +1769,9 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
bJobDone = pImp->nMsgPos >= nCount;
if ( bJobDone && pImp->bFirstRound )
{
- // Update der bevorzugten Shell ist gelaufen, nun d"urfen
- // auch die anderen
+
+ // Update of the preferred shell has been done, now may
+ // also the others shells be updated
bJobDone = sal_False;
pImp->bFirstRound = sal_False;
pImp->nMsgPos = 0;
@@ -1816,7 +1806,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
else
pImp->aTimer.Stop();
- // Update-Runde ist beendet
+ // Update round is finished
pImp->bInNextJob = sal_False;
Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE));
DBG_PROFSTOP(SfxBindingsNextJob_Impl);
@@ -1860,15 +1850,15 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
DbgTrace( aMsg.GetBuffer() );
#endif
- // Wenn Bindings gelockt werden, auch SubBindings locken
+ // When bindings are locked, also lock sub bindings.
if ( pImp->pSubBindings )
{
pImp->pSubBindings->ENTERREGISTRATIONS();
- // Dieses EnterRegistrations ist f"ur die SubBindings kein "echtes"
+ // These EnterRegistrations are not "real" for the SubBindings
pImp->pSubBindings->pImp->nOwnRegLevel--;
- // Bindings synchronisieren
+ // Synchronize Bindings
pImp->pSubBindings->nRegLevel = nRegLevel + pImp->pSubBindings->pImp->nOwnRegLevel + 1;
}
@@ -1884,7 +1874,7 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
pImp->nCachedFunc1 = 0;
pImp->nCachedFunc2 = 0;
- // merken, ob ganze Caches verschwunden sind
+ // Mark if the all of the Caches have dissapered.
pImp->bCtrlReleased = sal_False;
}
@@ -1901,14 +1891,14 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
DBG_ASSERT( nRegLevel, "Leave without Enter" );
DBG_ASSERT( nLevel == USHRT_MAX || nLevel == nRegLevel, "wrong Leave" );
- // Nur wenn die SubBindings noch von den SuperBindings gelockt sind, diesen Lock entfernen
- // ( d.h. wenn es mehr Locks als "echte" Locks dort gibt )
+ // Only when the SubBindings are still locked by the Superbindings,
+ // remove this lock (i.e. if there are more locks than "real" ones)
if ( pImp->pSubBindings && pImp->pSubBindings->nRegLevel > pImp->pSubBindings->pImp->nOwnRegLevel )
{
- // Bindings synchronisieren
+ // Synchronize Bindings
pImp->pSubBindings->nRegLevel = nRegLevel + pImp->pSubBindings->pImp->nOwnRegLevel;
- // Dieses LeaveRegistrations ist f"ur die SubBindings kein "echtes"
+ // This LeaveRegistrations is not "real" for SubBindings
pImp->pSubBindings->pImp->nOwnRegLevel++;
pImp->pSubBindings->LEAVEREGISTRATIONS();
}
@@ -1931,25 +1921,25 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
#ifndef slow
SfxViewFrame* pFrame = pDispatcher->GetFrame();
- // ggf unbenutzte Caches entfernen bzw. PlugInInfo aufbereiten
+ // If possible remove unused Caches, for example prepare PlugInInfo
if ( pImp->bCtrlReleased )
{
for ( sal_uInt16 nCache = pImp->pCaches->Count(); nCache > 0; --nCache )
{
- // Cache via ::com::sun::star::sdbcx::Index besorgen
+ // Get Cache via ::com::sun::star::sdbcx::Index
SfxStateCache *pCache = pImp->pCaches->GetObject(nCache-1);
- // kein Controller mehr interessiert
+ // No interested Controller present
if ( pCache->GetItemLink() == 0 && !pCache->GetInternalController() )
{
- // Cache entfernen. Safety: first remove and then delete
+ // Remove Cache. Safety: first remove and then delete
SfxStateCache* pSfxStateCache = (*pImp->pCaches)[nCache-1];
pImp->pCaches->Remove(nCache-1, 1);
delete pSfxStateCache;
}
else
{
- // neue Controller mit den alten Items benachrichtigen
+ // new controller to notify the old items
//!pCache->SetCachedState();
}
}
@@ -1996,7 +1986,7 @@ const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId)
DBG_MEMTEST();
DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
- // syncronisieren
+ // synchronizing
pDispatcher->Flush();
if ( pImp->bMsgDirty )
UpdateSlotServer_Impl();
@@ -2040,7 +2030,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
{
if ( pImp->pSubBindings && pImp->pSubBindings->pDispatcher != pOldDispat )
{
- DBG_ERROR( "SubBindings vor Aktivieren schon gesetzt!" );
+ DBG_ERROR( "SubBindings already set before activating!" );
pImp->pSubBindings->ENTERREGISTRATIONS();
}
LEAVEREGISTRATIONS();
@@ -2050,7 +2040,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
ENTERREGISTRATIONS();
if ( pImp->pSubBindings && pImp->pSubBindings->pDispatcher != pOldDispat )
{
- DBG_ERROR( "SubBindings im Deaktivieren immer noch gesetzt!" );
+ DBG_ERROR( "SubBindings still set even when deactivating!" );
pImp->pSubBindings->LEAVEREGISTRATIONS();
}
}
@@ -2088,10 +2078,10 @@ void SfxBindings::StartUpdate_Impl( sal_Bool bComplete )
pImp->pSubBindings->StartUpdate_Impl( bComplete );
if ( !bComplete )
- // Update darf unterbrochen werden
+ // Update may be interrupted
NextJob_Impl(&pImp->aTimer);
else
- // alle Slots am St"uck updaten
+ // Update all slots in a row
NextJob_Impl(0);
}
@@ -2192,14 +2182,14 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
}
}
- // Dann am Dispatcher testen; da die von dort zur"uckgegebenen Items immer
- // DELETE_ON_IDLE sind, mu\s eine Kopie davon gezogen werden, um einen
- // Eigent"umer"ubergang zu erm"oglichen
+ // Then test at the dispatcher to check if the returned items from
+ // there are always DELETE_ON_IDLE, a copy of it has to be made in
+ // order to allow for transition of ownership.
const SfxPoolItem *pItem = NULL;
SfxItemState eState = pDispatcher->QueryState( nSlot, pItem );
if ( eState == SFX_ITEM_SET )
{
- DBG_ASSERT( pItem, "SFX_ITEM_SET aber kein Item!" );
+ DBG_ASSERT( pItem, "SFX_ITEM_SET but no item!" );
if ( pItem )
rpState = pItem->Clone();
}
@@ -2357,7 +2347,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
{
::com::sun::star::util::URL aURL;
aURL.Complete = rCommand;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aURL );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
if ( xDisp.is() )
@@ -2367,7 +2357,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
::rtl::OUString sAppName;
try
{
- static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+ static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
::comphelper::getProcessServiceFactory();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -2378,7 +2368,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
sAppName = xModuleManager->identify(xFrame);
} catch(::com::sun::star::uno::Exception&) {}
Sequence<beans::PropertyValue> source;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxAsyncExec"));
+ ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxAsyncExec")));
::comphelper::UiEventsLogger::logDispatch(aURL, source);
}
new SfxAsyncExec_Impl( aURL, xDisp );
@@ -2431,3 +2421,5 @@ uno::Reference < frame::XDispatch > SfxBindings::GetDispatch( const SfxSlot* pSl
return xRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 99dd04f3d4..2ff9d0c0a5 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.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.
@@ -47,11 +48,11 @@ DBG_NAME(SfxControllerItem);
void SfxControllerItem::CheckConfigure_Impl( ULONG nType )
{
- // echter Slot? (also kein Separator etc.)
+ // Real Slot? (i.e. no Separator etc.)
if ( !nId )
return;
- // ist die Id "uberhaupt in 'nType' konfigurierbar?
+ // is the ID configurable at all in 'nType'?
const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nId);
DBG_ASSERTWARNING( pSlot, "SfxControllerItem: binding not existing slot" );
if ( pSlot && !pSlot->IsMode(nType) )
@@ -65,7 +66,6 @@ void SfxControllerItem::CheckConfigure_Impl( ULONG nType )
#endif
//--------------------------------------------------------------------
-
// returns the next registered SfxControllerItem with the same id
SfxControllerItem* SfxControllerItem::GetItemLink()
@@ -76,7 +76,6 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
}
//--------------------------------------------------------------------
-
// returns TRUE if this binding is really bound to a function
BOOL SfxControllerItem::IsBound() const
@@ -87,23 +86,21 @@ BOOL SfxControllerItem::IsBound() const
}
//--------------------------------------------------------------------
-
// returns the associated function-id or 0 if none
// USHORT SfxControllerItem::GetId() const;
//====================================================================
-
// registeres with the id at the bindings
void SfxControllerItem::Bind( USHORT nNewId, SfxBindings *pBindinx )
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxControllerItem, 0);
- DBG_ASSERT(pBindings || pBindinx, "Keine Bindings");
+ DBG_ASSERT(pBindings || pBindinx, "No Bindings");
if ( IsBound() ) {
- DBG_ASSERT(pBindings, "Keine Bindings");
+ DBG_ASSERT(pBindings, "No Bindings");
pBindings->Release(*this);
}
@@ -119,10 +116,10 @@ void SfxControllerItem::BindInternal_Impl( USHORT nNewId, SfxBindings *pBindinx
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxControllerItem, 0);
- DBG_ASSERT(pBindings || pBindinx, "Keine Bindings");
+ DBG_ASSERT(pBindings || pBindinx, "No Bindings");
if ( IsBound() ) {
- DBG_ASSERT(pBindings, "Keine Bindings");
+ DBG_ASSERT(pBindings, "No Bindings");
pBindings->Release(*this);
}
@@ -139,14 +136,14 @@ void SfxControllerItem::BindInternal_Impl( USHORT nNewId, SfxBindings *pBindinx
void SfxControllerItem::UnBind()
-/* [Beschreibung]
-
- "ost die Verbindung dieses SfxControllerItems mit der SfxBindings-Instanz,
- an der es zur Zeit gebunden ist. Ab diesem Zeitpunkt erh"alt es keine
- Statusbenachrichtigungen (<SfxControllerItem::StateChented()>) mehr.
+/* [Description]
+ Unbinds the connection of this SfxControllerItems with the SfxBindings
+ instance with which it to time is bound. From this time on it does not
+ receive any status notifications (<SfxControllerItem::StateChented()>)
+ anymore.
- [Querverweise]
+ [Cross-reference]
<SfxControllerItem::ReBind()>
<SfxControllerItem::ClearCache()>
@@ -154,7 +151,7 @@ void SfxControllerItem::UnBind()
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxControllerItem, 0);
- DBG_ASSERT(pBindings, "Keine Bindings");
+ DBG_ASSERT(pBindings, "No Bindings");
DBG_ASSERT( IsBound(), "unbindings unbound SfxControllerItem" );
pBindings->Release(*this);
@@ -165,14 +162,13 @@ void SfxControllerItem::UnBind()
void SfxControllerItem::ReBind()
-/* [Beschreibung]
-
- Binded dieses SfxControllerItem wieder an die SfxBindings-Instanz,
- an der es zuletzt gebunden war. Ab diesem Zeitpunkt erh"alt es wieder
- Statusbenachrichtigungen (<SfxControllerItem::StateChented()>).
+/* [Description]
+ Binds this SfxControllerItem with the SfxBindings instance again,
+ with which it was last bound. From this time on it does receive status
+ notifications (<SfxControllerItem::StateChented()>) again.
- [Querverweise]
+ [Cross-reference]
<SfxControllerItem::UnBind()>
<SfxControllerItem::ClearCache()>
@@ -181,7 +177,7 @@ void SfxControllerItem::ReBind()
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxControllerItem, 0);
- DBG_ASSERT(pBindings, "Keine Bindings");
+ DBG_ASSERT(pBindings, "No Bindings");
DBG_ASSERT( !IsBound(), "bindings rebound SfxControllerItem" );
pBindings->Register(*this);
@@ -191,11 +187,11 @@ DBG_CHKTHIS(SfxControllerItem, 0);
void SfxControllerItem::UpdateSlot()
-/* [Beschreibung]
+/* [Description]
- Holt den Status 'hart' neu.
+ Get the Status again.
- [Querverweise]
+ [Cross-reference]
<SfxControllerItem::ClearCache()>
*/
@@ -212,24 +208,20 @@ void SfxControllerItem::UpdateSlot()
void SfxControllerItem::ClearCache()
-/* [Beschreibung]
-
- "oscht den Status-Cache f"ur dieses SfxControllerItem. D.h. beim
- n"achsten Status-Update wird das <SfxPoolItem> auf jeden Fall geschickt,
- auch wenn zuvor dasselbe geschickt wurde. Dies wird ben"otigt, wenn
- ein Controller umgeschaltet werden kann und sich diesen Status
- selbst merkt.
+/* [Description]