summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-19 12:24:29 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-19 12:24:29 +0200
commit92667c8edbaee9a252b1d5d221eb62849f76697c (patch)
tree8f1d329f2259b7d5bff054bc14d0965637df6961 /sfx2
parentbaecdfb578cb7bc992944857ad4d8882ef7e842c (diff)
parent48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff)
Merge branch 'master' into feature/gnumake4
Conflicts: connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/evoab/LCatalog.cxx connectivity/source/drivers/evoab/LColumnAlias.cxx connectivity/source/drivers/evoab/LColumnAlias.hxx connectivity/source/drivers/evoab/LColumns.cxx connectivity/source/drivers/evoab/LColumns.hxx connectivity/source/drivers/evoab/LConfigAccess.cxx connectivity/source/drivers/evoab/LConfigAccess.hxx connectivity/source/drivers/evoab/LConnection.cxx connectivity/source/drivers/evoab/LConnection.hxx connectivity/source/drivers/evoab/LDatabaseMetaData.cxx connectivity/source/drivers/evoab/LDatabaseMetaData.hxx connectivity/source/drivers/evoab/LDriver.cxx connectivity/source/drivers/evoab/LDriver.hxx connectivity/source/drivers/evoab/LFolderList.cxx connectivity/source/drivers/evoab/LFolderList.hxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LPreparedStatement.cxx connectivity/source/drivers/evoab/LPreparedStatement.hxx connectivity/source/drivers/evoab/LResultSet.cxx connectivity/source/drivers/evoab/LResultSet.hxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab/LStatement.cxx connectivity/source/drivers/evoab/LStatement.hxx connectivity/source/drivers/evoab/LTable.cxx connectivity/source/drivers/evoab/LTable.hxx connectivity/source/drivers/evoab/LTables.cxx connectivity/source/drivers/evoab/LTables.hxx connectivity/source/drivers/evoab/evoab.xml connectivity/source/drivers/evoab/makefile.mk editeng/Library_editeng.mk framework/Library_fwe.mk framework/test/test.cxx idl/prj/d.lst idl/util/idlpch.cxx linguistic/Makefile linguistic/Module_linguistic.mk linguistic/inc/linguistic/lngdllapi.h linguistic/inc/linguistic/lngprophelp.hxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/prj/d.lst linguistic/qa/unoapi/Test.java linguistic/source/grammarchecker.cxx linguistic/source/grammarchecker.hxx linguistic/source/hyphdta.cxx linguistic/source/lngprophelp.cxx linguistic/source/makefile.mk linguistic/source/spelldta.cxx sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/inc/sfx2/qswin32.h sfx2/prj/build.lst sfx2/qa/cppunit/makefile.mk xmlscript/inc/xmlscript/xcrdllapi.h xmlscript/prj/d.lst xmlscript/util/makefile.mk
Diffstat (limited to 'sfx2')
-rwxr-xr-x[-rw-r--r--]sfx2/AllLangResTarget_sfx2.mk8
-rwxr-xr-xsfx2/CppunitTest_sfx2_metadatable.mk1
-rwxr-xr-xsfx2/JunitTest_sfx2_complex.mk15
-rwxr-xr-x[-rw-r--r--]sfx2/JunitTest_sfx2_unoapi.mk0
-rwxr-xr-xsfx2/Library_qstart.mk3
-rwxr-xr-xsfx2/Library_sfx.mk21
-rwxr-xr-x[-rw-r--r--]sfx2/Makefile0
-rwxr-xr-xsfx2/Module_sfx2.mk2
-rwxr-xr-x[-rw-r--r--]sfx2/Package_inc.mk0
-rwxr-xr-x[-rw-r--r--]sfx2/Package_sdi.mk0
-rwxr-xr-xsfx2/README3
-rw-r--r--sfx2/inc/arrdecl.hxx15
-rw-r--r--sfx2/inc/bitset.hxx4
-rw-r--r--sfx2/inc/brokenpackageint.hxx103
-rw-r--r--sfx2/inc/configmgr.hxx6
-rw-r--r--sfx2/inc/docvor.hxx15
-rwxr-xr-x[-rw-r--r--]sfx2/inc/filedlghelper.hrc0
-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.hxx102
-rw-r--r--sfx2/inc/msgnodei.hxx219
-rw-r--r--sfx2/inc/orgmgr.hxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.cxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx17
-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.hxx4
-rw-r--r--sfx2/inc/sfx2/XmlIdRegistry.hxx6
-rw-r--r--sfx2/inc/sfx2/app.hxx37
-rw-r--r--sfx2/inc/sfx2/appuno.hxx3
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx8
-rw-r--r--sfx2/inc/sfx2/basmgr.hxx3
-rw-r--r--sfx2/inc/sfx2/bindings.hxx83
-rw-r--r--[-rwxr-xr-x]sfx2/inc/sfx2/brokenpackageint.hxx0
-rw-r--r--sfx2/inc/sfx2/chalign.hxx29
-rw-r--r--sfx2/inc/sfx2/childwin.hxx98
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/cntids.hrc48
-rw-r--r--sfx2/inc/sfx2/controlwrapper.hxx4
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx15
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dialogs.hrc0
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx10
-rw-r--r--sfx2/inc/sfx2/dinfedt.hxx4
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx75
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dllapi.h3
-rw-r--r--sfx2/inc/sfx2/docfac.hxx46
-rw-r--r--sfx2/inc/sfx2/docfile.hxx19
-rw-r--r--sfx2/inc/sfx2/docfilt.hxx3
-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.hxx11
-rw-r--r--sfx2/inc/sfx2/event.hxx3
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx24
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx24
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx17
-rw-r--r--sfx2/inc/sfx2/frame.hxx44
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx31
-rw-r--r--sfx2/inc/sfx2/frmhtml.hxx4
-rw-r--r--sfx2/inc/sfx2/frmhtmlw.hxx2
-rw-r--r--sfx2/inc/sfx2/genlink.hxx3
-rw-r--r--sfx2/inc/sfx2/hintpost.hxx22
-rw-r--r--sfx2/inc/sfx2/htmlmode.hxx24
-rw-r--r--sfx2/inc/sfx2/imagemgr.hxx9
-rw-r--r--sfx2/inc/sfx2/imgdef.hxx2
-rw-r--r--sfx2/inc/sfx2/imgmgr.hxx17
-rw-r--r--sfx2/inc/sfx2/ipclient.hxx5
-rw-r--r--sfx2/inc/sfx2/itemconnect.hxx4
-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.hxx91
-rw-r--r--sfx2/inc/sfx2/linksrc.hxx11
-rw-r--r--sfx2/inc/sfx2/lnkbase.hxx40
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx141
-rw-r--r--sfx2/inc/sfx2/mailmodelapi.hxx9
-rw-r--r--sfx2/inc/sfx2/mgetempl.hxx14
-rw-r--r--sfx2/inc/sfx2/mieclip.hxx2
-rw-r--r--sfx2/inc/sfx2/minarray.hxx12
-rw-r--r--sfx2/inc/sfx2/minfitem.hxx3
-rw-r--r--sfx2/inc/sfx2/minstack.hxx3
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx39
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx12
-rw-r--r--sfx2/inc/sfx2/module.hxx11
-rw-r--r--sfx2/inc/sfx2/msg.hxx115
-rw-r--r--sfx2/inc/sfx2/msgpool.hxx2
-rw-r--r--sfx2/inc/sfx2/navigat.hxx2
-rw-r--r--sfx2/inc/sfx2/new.hxx23
-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.hxx134
-rw-r--r--sfx2/inc/sfx2/objuno.hxx3
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx2
-rw-r--r--sfx2/inc/sfx2/passwd.hxx13
-rw-r--r--sfx2/inc/sfx2/printer.hxx5
-rw-r--r--sfx2/inc/sfx2/printopt.hxx13
-rw-r--r--sfx2/inc/sfx2/prnmon.hxx37
-rw-r--r--sfx2/inc/sfx2/progress.hxx6
-rw-r--r--sfx2/inc/sfx2/qswin32.h4
-rw-r--r--sfx2/inc/sfx2/querystatus.hxx3
-rw-r--r--sfx2/inc/sfx2/request.hxx7
-rw-r--r--sfx2/inc/sfx2/securitypage.hxx4
-rwxr-xr-xsfx2/inc/sfx2/sfx.hrc23
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx5
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx12
-rw-r--r--sfx2/inc/sfx2/sfxdefs.hxx8
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/sfxhelp.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx53
-rw-r--r--sfx2/inc/sfx2/sfxmodelfactory.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxresid.hxx3
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxsids.hrc27
-rw-r--r--sfx2/inc/sfx2/sfxstatuslistener.hxx3
-rw-r--r--sfx2/inc/sfx2/sfxuno.hxx5
-rw-r--r--sfx2/inc/sfx2/shell.hxx86
-rw-r--r--sfx2/inc/sfx2/signaturestate.hxx3
-rw-r--r--sfx2/inc/sfx2/stbitem.hxx5
-rw-r--r--sfx2/inc/sfx2/styfitem.hxx33
-rw-r--r--sfx2/inc/sfx2/styledlg.hxx4
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx31
-rw-r--r--sfx2/inc/sfx2/taskpane.hxx3
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx56
-rw-r--r--sfx2/inc/sfx2/templdlg.hxx2
-rw-r--r--sfx2/inc/sfx2/titledockwin.hxx3
-rw-r--r--sfx2/inc/sfx2/tplpitem.hxx7
-rw-r--r--sfx2/inc/sfx2/unoctitm.hxx4
-rw-r--r--sfx2/inc/sfx2/userinputinterception.hxx3
-rw-r--r--sfx2/inc/sfx2/viewfac.hxx2
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx8
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx83
-rw-r--r--sfx2/inc/sfxbasic.hxx44
-rw-r--r--sfx2/inc/sorgitm.hxx6
-rw-r--r--sfx2/inc/srchdlg.hxx8
-rw-r--r--sfx2/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]sfx2/prj/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/DocumentInfo.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/DocumentMetadataAccess.java35
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/DocumentProperties.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java0
-rwxr-xr-xsfx2/qa/complex/sfx2/UndoManager.java1
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/testdocuments/empty.rdf0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/DialogThread.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/TestDocument.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/WriterHelper.java2
-rw-r--r--sfx2/qa/cppunit/test_metadatable.cxx14
-rwxr-xr-x[-rw-r--r--]sfx2/qa/cppunit/version.map0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/Test.java0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/knownissues.xcl0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/sfx.sce0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdwbin8192 -> 8192 bytes
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/report.stwbin11186 -> 11186 bytes
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/report2.stwbin11000 -> 11000 bytes
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/appslots.sdi7
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/docslots.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/frmslots.sdi11
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfx.sdi83
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfxitems.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfxslots.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/viwslots.sdi0
-rw-r--r--sfx2/source/appl/app.cxx263
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/app.hrc45
-rw-r--r--sfx2/source/appl/app.src70
-rw-r--r--sfx2/source/appl/appbas.cxx58
-rw-r--r--[-rwxr-xr-x]sfx2/source/appl/appbaslib.cxx12
-rw-r--r--sfx2/source/appl/appcfg.cxx86
-rw-r--r--sfx2/source/appl/appchild.cxx28
-rw-r--r--sfx2/source/appl/appdata.cxx21
-rw-r--r--sfx2/source/appl/appdde.cxx244
-rw-r--r--sfx2/source/appl/appinit.cxx51
-rw-r--r--sfx2/source/appl/appmain.cxx47
-rw-r--r--sfx2/source/appl/appmisc.cxx59
-rw-r--r--sfx2/source/appl/appopen.cxx209
-rw-r--r--sfx2/source/appl/appquit.cxx42
-rw-r--r--sfx2/source/appl/appreg.cxx12
-rw-r--r--sfx2/source/appl/appserv.cxx201
-rw-r--r--sfx2/source/appl/appuno.cxx84
-rw-r--r--sfx2/source/appl/childwin.cxx106
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/dde.hrc0
-rw-r--r--sfx2/source/appl/fileobj.cxx123
-rw-r--r--sfx2/source/appl/fileobj.hxx5
-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.hxx8
-rw-r--r--sfx2/source/appl/imagemgr.cxx44
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx61
-rw-r--r--sfx2/source/appl/imestatuswindow.hxx5
-rw-r--r--sfx2/source/appl/impldde.cxx65
-rw-r--r--sfx2/source/appl/impldde.hxx7
-rw-r--r--sfx2/source/appl/linkmgr2.cxx210
-rw-r--r--sfx2/source/appl/linksrc.cxx15
-rw-r--r--sfx2/source/appl/lnkbase2.cxx168
-rw-r--r--sfx2/source/appl/module.cxx71
-rw-r--r--sfx2/source/appl/newhelp.cxx161
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/newhelp.hrc0
-rw-r--r--sfx2/source/appl/newhelp.hxx7
-rw-r--r--sfx2/source/appl/newhelp.src141
-rw-r--r--sfx2/source/appl/opengrf.cxx35
-rw-r--r--sfx2/source/appl/panelist.hxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx377
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx76
-rw-r--r--sfx2/source/appl/shutdownicon.cxx129
-rw-r--r--sfx2/source/appl/shutdownicon.hxx11
-rw-r--r--sfx2/source/appl/shutdowniconOs2.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdowniconaqua.mm13
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx175
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx92
-rw-r--r--sfx2/source/appl/workwin.cxx477
-rw-r--r--sfx2/source/appl/xpackcreator.cxx8
-rw-r--r--sfx2/source/appl/xpackcreator.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/bastyp.hrc14
-rw-r--r--sfx2/source/bastyp/bitset.cxx8
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx303
-rw-r--r--sfx2/source/bastyp/fltlst.cxx45
-rw-r--r--sfx2/source/bastyp/fltlst.hxx18
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx28
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx85
-rw-r--r--sfx2/source/bastyp/helper.cxx212
-rw-r--r--sfx2/source/bastyp/mieclip.cxx2
-rw-r--r--sfx2/source/bastyp/minarray.cxx93
-rw-r--r--sfx2/source/bastyp/misc.cxx7
-rw-r--r--sfx2/source/bastyp/progress.cxx212
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx89
-rw-r--r--sfx2/source/bastyp/sfxresid.cxx6
-rw-r--r--sfx2/source/config/evntconf.cxx77
-rw-r--r--sfx2/source/control/bindings.cxx479
-rw-r--r--sfx2/source/control/ctrlitem.cxx169
-rw-r--r--[-rwxr-xr-x]sfx2/source/control/dispatch.cxx993
-rw-r--r--sfx2/source/control/macrconf.cxx794
-rw-r--r--sfx2/source/control/macro.cxx434
-rw-r--r--sfx2/source/control/minfitem.cxx4
-rw-r--r--sfx2/source/control/msg.cxx4
-rw-r--r--sfx2/source/control/msgpool.cxx81
-rw-r--r--sfx2/source/control/objface.cxx105
-rw-r--r--sfx2/source/control/querystatus.cxx15
-rw-r--r--sfx2/source/control/request.cxx330
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx12
-rw-r--r--sfx2/source/control/shell.cxx538
-rw-r--r--sfx2/source/control/sorgitm.cxx18
-rw-r--r--sfx2/source/control/statcach.cxx84
-rw-r--r--sfx2/source/control/unoctitm.cxx94
-rw-r--r--sfx2/source/dialog/alienwarn.cxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/alienwarn.hrc0
-rw-r--r--sfx2/source/dialog/basedlgs.cxx233
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dialog.hrc2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx153
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfdlg.hrc1
-rw-r--r--sfx2/source/dialog/dinfdlg.src18
-rw-r--r--sfx2/source/dialog/dinfedt.cxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfedt.hrc0
-rw-r--r--sfx2/source/dialog/dockwin.cxx362
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx243
-rw-r--r--sfx2/source/dialog/filedlghelper.src5
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx46
-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.cxx97
-rw-r--r--sfx2/source/dialog/mgetempl.cxx185
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mgetempl.hrc0
-rw-r--r--sfx2/source/dialog/mgetempl.src2
-rw-r--r--sfx2/source/dialog/navigat.cxx9
-rw-r--r--sfx2/source/dialog/newstyle.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/newstyle.hrc0
-rw-r--r--sfx2/source/dialog/partwnd.cxx43
-rw-r--r--sfx2/source/dialog/passwd.cxx99
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/passwd.hrc12
-rw-r--r--sfx2/source/dialog/passwd.src16
-rw-r--r--sfx2/source/dialog/printopt.cxx73
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/printopt.hrc0
-rw-r--r--sfx2/source/dialog/printopt.src2
-rw-r--r--sfx2/source/dialog/recfloat.cxx5
-rw-r--r--sfx2/source/dialog/recfloat.src1
-rw-r--r--sfx2/source/dialog/securitypage.cxx35
-rw-r--r--[-rwxr-xr-x]sfx2/source/dialog/securitypage.src8
-rw-r--r--[-rwxr-xr-x]sfx2/source/dialog/sfxdlg.cxx3
-rw-r--r--sfx2/source/dialog/splitwin.cxx322
-rw-r--r--sfx2/source/dialog/srchdlg.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/srchdlg.hrc0
-rw-r--r--sfx2/source/dialog/styfitem.cxx55
-rw-r--r--sfx2/source/dialog/styledlg.cxx45
-rw-r--r--sfx2/source/dialog/tabdlg.cxx478
-rw-r--r--sfx2/source/dialog/taskpane.cxx8
-rw-r--r--sfx2/source/dialog/templdlg.cxx580
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/templdlg.hrc5
-rw-r--r--sfx2/source/dialog/templdlg.src16
-rw-r--r--sfx2/source/dialog/titledockwin.cxx10
-rw-r--r--sfx2/source/dialog/titledockwin.src6
-rw-r--r--sfx2/source/dialog/tplcitem.cxx26
-rw-r--r--sfx2/source/dialog/tplpitem.cxx18
-rw-r--r--sfx2/source/dialog/versdlg.cxx66
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/versdlg.hrc0
-rw-r--r--sfx2/source/dialog/versdlg.src1
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx234
-rw-r--r--sfx2/source/doc/Metadatable.cxx140
-rw-r--r--sfx2/source/doc/QuerySaveDocument.cxx4
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx302
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doc.hrc18
-rw-r--r--sfx2/source/doc/doc.src16
-rw-r--r--sfx2/source/doc/docfac.cxx92
-rw-r--r--sfx2/source/doc/docfile.cxx639
-rw-r--r--sfx2/source/doc/docfilt.cxx8
-rw-r--r--sfx2/source/doc/docinf.cxx31
-rw-r--r--sfx2/source/doc/docinsert.cxx16
-rw-r--r--sfx2/source/doc/docmacromode.cxx64
-rw-r--r--sfx2/source/doc/docstoragemodifylistener.cxx11
-rw-r--r--sfx2/source/doc/doctdlg.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctdlg.hrc0
-rw-r--r--sfx2/source/doc/doctempl.cxx758
-rw-r--r--sfx2/source/doc/doctempl.src2
-rw-r--r--sfx2/source/doc/doctemplates.cxx211
-rw-r--r--sfx2/source/doc/doctemplateslocal.cxx14
-rw-r--r--sfx2/source/doc/doctemplateslocal.hxx4
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/docundomanager.cxx0
-rw-r--r--sfx2/source/doc/docvor.cxx518
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docvor.hrc4
-rw-r--r--sfx2/source/doc/docvor.src57
-rw-r--r--sfx2/source/doc/frmdescr.cxx6
-rw-r--r--sfx2/source/doc/graphhelp.cxx28
-rw-r--r--sfx2/source/doc/graphhelp.hxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx202
-rw-r--r--sfx2/source/doc/iframe.cxx16
-rw-r--r--sfx2/source/doc/new.cxx32
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/new.hrc0
-rw-r--r--sfx2/source/doc/objcont.cxx243
-rw-r--r--sfx2/source/doc/objembed.cxx61
-rw-r--r--sfx2/source/doc/objitem.cxx19
-rw-r--r--sfx2/source/doc/objmisc.cxx312
-rw-r--r--sfx2/source/doc/objserv.cxx116
-rw-r--r--sfx2/source/doc/objstor.cxx552
-rw-r--r--sfx2/source/doc/objuno.cxx136
-rw-r--r--sfx2/source/doc/objxtor.cxx166
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/oleprops.cxx3
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/oleprops.hxx15
-rw-r--r--sfx2/source/doc/ownsubfilterservice.cxx8
-rw-r--r--sfx2/source/doc/plugin.cxx30
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/printhelper.cxx47
-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.cxx7
-rw-r--r--sfx2/source/doc/sfxacldetect.hxx42
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx264
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx9
-rw-r--r--sfx2/source/doc/syspath.cxx6
-rw-r--r--sfx2/source/doc/syspath.hxx5
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/syspathw32.cxx6
-rw-r--r--sfx2/source/explorer/nochaos.cxx9
-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.hxx19
-rw-r--r--sfx2/source/inc/doctemplates.hxx3
-rw-r--r--[-rwxr-xr-x]sfx2/source/inc/docundomanager.hxx0
-rw-r--r--sfx2/source/inc/eventsupplier.hxx5
-rw-r--r--sfx2/source/inc/fltfnc.hxx2
-rw-r--r--sfx2/source/inc/fltoptint.hxx2
-rw-r--r--sfx2/source/inc/helper.hxx2
-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.hxx6
-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.hxx21
-rw-r--r--sfx2/source/inc/openflag.hxx14
-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.hxx4
-rw-r--r--sfx2/source/inc/recfloat.hxx2
-rw-r--r--sfx2/source/inc/referers.hxx3
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/sfxlocal.hrc2
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx10
-rw-r--r--sfx2/source/inc/sfxtypes.hxx20
-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.hxx33
-rw-r--r--sfx2/source/inc/templdgi.hxx27
-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.hxx12
-rw-r--r--sfx2/source/inc/workwin.hxx40
-rw-r--r--sfx2/source/inet/inettbc.cxx30
-rw-r--r--sfx2/source/layout/factory.cxx5
-rw-r--r--sfx2/source/layout/sfxdialog.cxx3
-rw-r--r--sfx2/source/layout/sfxtabdialog.cxx3
-rw-r--r--sfx2/source/layout/sfxtabpage.cxx27
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/menu.hrc0
-rw-r--r--sfx2/source/menu/mnuitem.cxx70
-rw-r--r--[-rwxr-xr-x]sfx2/source/menu/mnumgr.cxx27
-rw-r--r--sfx2/source/menu/objmnctl.cxx32
-rw-r--r--[-rwxr-xr-x]sfx2/source/menu/thessubmenu.cxx24
-rw-r--r--sfx2/source/menu/thessubmenu.hxx11
-rw-r--r--sfx2/source/menu/virtmenu.cxx243
-rw-r--r--sfx2/source/notify/eventsupplier.cxx75
-rw-r--r--sfx2/source/notify/hintpost.cxx14
-rw-r--r--sfx2/source/statbar/stbitem.cxx186
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx217
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx158
-rw-r--r--sfx2/source/view/frame.cxx109
-rw-r--r--sfx2/source/view/frame2.cxx7
-rw-r--r--sfx2/source/view/frmload.cxx15
-rw-r--r--sfx2/source/view/impframe.hxx2
-rw-r--r--sfx2/source/view/impviewframe.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx33
-rw-r--r--sfx2/source/view/orgmgr.cxx292
-rw-r--r--sfx2/source/view/printer.cxx37
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx94
-rw-r--r--sfx2/source/view/userinputinterception.cxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/view.hrc0
-rw-r--r--sfx2/source/view/viewfac.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx520
-rw-r--r--sfx2/source/view/viewfrm2.cxx79
-rw-r--r--sfx2/source/view/viewimp.hxx2
-rw-r--r--[-rwxr-xr-x]sfx2/source/view/viewprn.cxx133
-rw-r--r--sfx2/source/view/viewsh.cxx573
-rwxr-xr-x[-rw-r--r--]sfx2/util/make_tco.btm0
-rwxr-xr-x[-rw-r--r--]sfx2/util/mkdemo.pl0
-rwxr-xr-x[-rw-r--r--]sfx2/util/sfx.component3
-rwxr-xr-x[-rw-r--r--]sfx2/util/sfx.xml2
-rw-r--r--sfx2/workben/custompanel/ctp_factory.cxx7
-rw-r--r--sfx2/workben/custompanel/ctp_factory.hxx3
-rw-r--r--sfx2/workben/custompanel/ctp_panel.cxx3
-rw-r--r--sfx2/workben/custompanel/ctp_panel.hxx3
-rw-r--r--sfx2/workben/custompanel/ctp_services.cxx7
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/delzip0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/description.xml0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/manifest.xml0
450 files changed, 11421 insertions, 13157 deletions
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index c49fd42cd96e..77691fe88025 100644..100755
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_SrsTarget_set_include,sfx/res,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(WORKDIR)/inc \
- -I$(SRCDIR)/sfx2/source/dialog \
- -I$(SRCDIR)/sfx2/source/inc \
- -I$(SRCDIR)/sfx2/inc/ \
- -I$(SRCDIR)/sfx2/inc/sfx \
+ -I$(realpath $(SRCDIR)/sfx2/source/dialog) \
+ -I$(realpath $(SRCDIR)/sfx2/source/inc) \
+ -I$(realpath $(SRCDIR)/sfx2/inc/) \
+ -I$(realpath $(SRCDIR)/sfx2/inc/sfx) \
))
$(eval $(call gb_SrsTarget_add_files,sfx/res,\
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index 0899eeb04b9e..0824d40cfa64 100755
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \
$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
sal \
sfx \
- stl \
$(gb_STDLIBS) \
))
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index 0ab800aee9b5..8f09f3d799a9 100755
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -42,18 +42,18 @@ $(eval $(call gb_JunitTest_add_jars,sfx2_complex,\
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
- sfx2/qa/complex/sfx2/tools/DialogThread \
- sfx2/qa/complex/sfx2/tools/WriterHelper \
- sfx2/qa/complex/sfx2/tools/TestDocument \
- sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
+ sfx2/qa/complex/sfx2/DocumentInfo \
sfx2/qa/complex/sfx2/DocumentMetadataAccess \
sfx2/qa/complex/sfx2/DocumentProperties \
- sfx2/qa/complex/sfx2/DocumentInfo \
+ sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
sfx2/qa/complex/sfx2/StandaloneDocumentInfo \
sfx2/qa/complex/sfx2/UndoManager \
sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \
- sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \
sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \
+ sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \
+ sfx2/qa/complex/sfx2/tools/DialogThread \
+ sfx2/qa/complex/sfx2/tools/TestDocument \
+ sfx2/qa/complex/sfx2/tools/WriterHelper \
sfx2/qa/complex/sfx2/undo/CalcDocumentTest \
sfx2/qa/complex/sfx2/undo/ChartDocumentTest \
sfx2/qa/complex/sfx2/undo/DocumentTest \
@@ -68,8 +68,9 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
complex.sfx2.DocumentInfo \
complex.sfx2.DocumentProperties \
complex.sfx2.DocumentMetadataAccess \
- complex.sfx2.UndoManager \
))
+# fd#35663 fails currently:
+# complex.sfx2.UndoManager \
# #i115674# fails currently: misses some OnUnfocus event
# complex.sfx2.GlobalEventBroadcaster \
# breaks because binfilter export has been removed
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index f7fdfae94e76..f7fdfae94e76 100644..100755
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index ab8ced21b275..c775d21650d7 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
sax \
sb \
sot \
- stl \
svl \
svt \
tk \
@@ -69,8 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
ucbhelper \
utl \
vcl \
- vos3 \
- eggtray \
sfx \
))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 68fca0719e93..bb57c4d59d57 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
$(eval $(call gb_Library_set_include,sfx,\
- -I$(SRCDIR)/sfx2/inc \
- -I$(SRCDIR)/sfx2/inc/sfx2 \
- -I$(SRCDIR)/sfx2/source/inc \
- -I$(SRCDIR)/sfx2/inc/pch \
+ -I$(realpath $(SRCDIR)/sfx2/inc) \
+ -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+ -I$(realpath $(SRCDIR)/sfx2/source/inc) \
+ -I$(realpath $(SRCDIR)/sfx2/inc/pch) \
-I$(WORKDIR)/SdiTarget/sfx2/sdi \
-I$(WORKDIR)/inc/ \
$$(INCLUDE) \
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
sax \
sb \
sot \
- stl \
svl \
svt \
tk \
@@ -72,7 +71,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
ucbhelper \
utl \
vcl \
- vos3 \
$(gb_STDLIBS) \
))
@@ -240,9 +238,9 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
$$(INCLUDE) \
- -I$(SRCDIR)/sfx2/inc/sfx2 \
- -I$(SRCDIR)/sfx2/inc \
- -I$(SRCDIR)/sfx2/sdi \
+ -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+ -I$(realpath $(SRCDIR)/sfx2/inc) \
+ -I$(realpath $(SRCDIR)/sfx2/sdi) \
))
ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
@@ -251,11 +249,6 @@ $(eval $(call gb_Library_add_defs,sfx,\
))
endif
-ifeq ($(OS),OS2)
-$(eval $(call gb_Library_add_exception_objects,sfx,\
- sfx2/source/appl/shutdowniconOs2.ob \
-))
-endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_objcxxobjects,sfx,\
sfx2/source/appl/shutdowniconaqua \
diff --git a/sfx2/Makefile b/sfx2/Makefile
index a79aff831024..a79aff831024 100644..100755
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index f42b8122e9ef..33fd675822a1 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
JunitTest_sfx2_unoapi \
))
-ifeq ($(OS),LINUX)
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
$(eval $(call gb_Module_add_targets,sfx2,\
Library_qstart \
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 6ecf5f368d27..6ecf5f368d27 100644..100755
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
index 43e484b19a2d..43e484b19a2d 100644..100755
--- a/sfx2/Package_sdi.mk
+++ b/sfx2/Package_sdi.mk
diff --git a/sfx2/README b/sfx2/README
new file mode 100755
index 000000000000..3b160a25203b
--- /dev/null
+++ b/sfx2/README
@@ -0,0 +1,3 @@
+This is the gui code, much of which is now deprecated.
+List of documents open would be traceked,
+raw C__ code; gutsy core of document management and loading.
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index c6d2ed3c8e78..c7d181eb1110 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.
@@ -27,9 +28,9 @@
#ifndef _SFX_ARRDECL_HXX
#define _SFX_ARRDECL_HXX
-#include <tools/list.hxx>
#include <svl/svarray.hxx>
#include <sfx2/minarray.hxx>
+#include <vector>
struct CntUpdateResult;
@@ -70,22 +71,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 3fbf4eecffbd..98a7f583cfb2 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.
@@ -196,7 +197,7 @@ inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
}
//--------------------------------------------------------------------
-// detsermines if the other bitset is a superset or equal
+// determines if the other bitset is a superset or equal
inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
{
@@ -255,3 +256,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
new file mode 100644
index 000000000000..daa47dcd9d51
--- /dev/null
+++ b/sfx2/inc/brokenpackageint.hxx
@@ -0,0 +1,103 @@
+/* -*- 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "sal/config.h"
+#include "sfx2/dllapi.h"
+#include <com/sun/star/document/BrokenPackageRequest.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <framework/interaction.hxx>
+
+using namespace ::framework;
+typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove;
+typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove;
+
+class SFX2_DLLPUBLIC RequestPackageReparation :
+ public ::com::sun::star::task::XInteractionRequest,
+ public ::cppu::OWeakObject
+{
+ ::com::sun::star::uno::Any m_aRequest;
+
+ ::com::sun::star::uno::Sequence<
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
+ > m_lContinuations;
+
+ SfxContinuationApprove* m_pApprove;
+ SfxContinuationDisapprove* m_pDisapprove;
+
+public:
+ RequestPackageReparation( ::rtl::OUString aName );
+
+ // XInterface / OWeakObject
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire( ) throw ();
+ virtual void SAL_CALL release( ) throw ();
+
+ sal_Bool isApproved() { return m_pApprove->isSelected(); }
+
+ virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Sequence<
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
+ > SAL_CALL getContinuations()
+ throw( ::com::sun::star::uno::RuntimeException );
+};
+
+class SFX2_DLLPUBLIC NotifyBrokenPackage :
+ public ::com::sun::star::task::XInteractionRequest,
+ public ::cppu::OWeakObject
+{
+ ::com::sun::star::uno::Any m_aRequest;
+
+ ::com::sun::star::uno::Sequence<
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
+ > m_lContinuations;
+
+ ContinuationAbort* m_pAbort;
+
+public:
+ NotifyBrokenPackage( ::rtl::OUString aName );
+
+ // XInterface / OWeakObject
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire( ) throw ();
+ virtual void SAL_CALL release( ) throw ();
+
+ sal_Bool isAborted() { return m_pAbort->isSelected(); }
+
+ virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Sequence<
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >
+ > SAL_CALL getContinuations()
+ throw( ::com::sun::star::uno::RuntimeException );
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index 0cc4305349e8..5146fd662101 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 9e252123348b..c800d445f6af 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(sal_uInt16 nLevel) const;
const Image &GetOpenedBmp(sal_uInt16 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/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
index a5db7b4fdb30..a5db7b4fdb30 100644..100755
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/filedlghelper.hrc
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 437f3bf07439..a35ce9d5a263 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 7dd54559dc0b..1b23e4c2bae6 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 b10ed6c90819..28f8379c6f1f 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 b8e605b6ef13..d5fc4adb0ed7 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 sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 97b5275711f1..f0a73404320c 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 b6a0a2a655d5..b9e4b18dbe8d 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
@@ -16,11 +17,11 @@ class SfxMacro;
class SfxMacroStatement
{
- sal_uInt16 nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // aktuelle Parameter, falls nSlotId != 0
- String aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF)
- sal_Bool bDone; // auskommentieren wenn kein Done() gerufen
- void* pDummy; // f"ur alle F"alle zum kompatibel bleiben
+ sal_uInt16 nSlotId; // performed Slot-Id or 0, if manually
+ ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // current Parameter, in case nSlotId != 0
+ String aStatement; // Statement in BASIC-Syntax (if necessary with CR/LF)
+ sal_Bool bDone; // comment out if no Done() is called
+ void* pDummy; // for all cases, to remain compatible
#ifdef _SFXMACRO_HXX
private:
@@ -58,11 +59,10 @@ public:
inline sal_uInt16 SfxMacroStatement::GetSlotId() const
-/* [Beschreibung]
+/* [Description]
- Liefert die Slot-Id die das Statement beim Abspielen wieder ausf"uhren
- soll oder 0, falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>)
- aufgezeichnet wurde.
+ Returns the Slot-Id which the Statement should redo when called or 0
+ if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually.
*/
{
@@ -73,14 +73,13 @@ inline sal_uInt16 SfxMacroStatement::GetSlotId() const
inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& SfxMacroStatement::GetArgs() const
-/* [Beschreibung]
+/* [Description]
- Liefert die Parameter mit denen Statement ausgef"uhrt wurde oder 0,
- falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>) aufgezeichnet
- wurde.
+ Returns the Parameter which was used in the call of the Statement or 0
+ if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually
- Der R"uckgabewert geh"ort dem SfxMacroStatement und ist nur im
- unmittelbar aufrufenden Stackframe g"ultig.
+ The returned value belongs to the SfxMacroStatement and is only valid
+ to the Stackframe.
*/
{
@@ -91,11 +90,11 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property
inline sal_Bool SfxMacroStatement::IsDone() const
-/* [Beschreibung]
+/* [Description]
- Liefert TRUE, wenn das Statement wirklich ausgef"uhrt wurde,
- also z.B. nicht vom Benutzer abgebrochen wurde. Wurde es nicht
- wirklich ausgef"uhrt, dann wird es im BASIC-Source auskommentiert.
+ Returns TRUE only if the Statement really was excecuted, so for instance
+ not if it was canceled by the user. If it was not excecuted the
+ BASIC-Source would be commented out.
*/
{
@@ -104,18 +103,18 @@ inline sal_Bool SfxMacroStatement::IsDone() const
//--------------------------------------------------------------------
-/* [Beschreibung]
+/* [Description]
- Liefert das Statement in BASIC-Syntax. Wurde das Makro manuell erzeugt,
- wird genau der im Konstruktor angegebene String zur"uckgegeben, sonst
- der generierte Source-Code.
+ Returns the Statement in BASIC-Syntax. If the Macro was created manually,
+ the string will be returned exactly as given in the constructor, else the
+ generated Source-Code is returned.
- Bei beiden Arten ist es m"oglich, da\s mehrere BASIC-Statements, jeweils
- mit CR/LF getrennt in dem String enthalten sind, da ein SFx-Statement
- ggf. in mehrere BASIC-Statements "ubersetzt wird.
+ It is possible in both of the above cases that several BASIC-Statements,
+ each contains CR / LF separators in the string, since a SFx statement
+ is translated if necessary into several BASIC statements.
- Statements f"ur die nicht <SfxRequest::Done()> gerufen wurde, werden
- mit einem vorangestellten 'rem' gekennzeichnet.
+ Statements for which <SfxRequest::Done()> was not called are marked
+ with a preceding 'rem'.
*/
inline const String& SfxMacroStatement::GetStatement() const
@@ -127,41 +126,38 @@ inline const String& SfxMacroStatement::GetStatement() const
enum SfxMacroMode
-/* [Beschreibung]
+/* [Description]
- Mit diesem enum wird bestimmt, ob eine <SfxMacro>-Instanz zum
- absoluten oder relativen Recorden erzeugt wurde, oder um ein
- existierendendes Makro zu Referenzieren.
+ By using this enum it is determined, if a <SfxMacro>-Instance was created
+ by absolute or relative recording, or to create a reference to a existing
+ macro.
*/
{
- SFX_MACRO_EXISTING, /* es handelt sich um ein bereits
- exitistierendes Makro, welches lediglich
- referenziert wird */
-
- SFX_MACRO_RECORDINGABSOLUTE,/* dieses Makro soll aufgezeichnet werden,
- wobei die betroffenen Objekte m"oglichst
- direkt angesprochen werden sollen
- (Beispiel: "[doc.sdc]") */
-
- SFX_MACRO_RECORDINGRELATIVE/* dieses Makro soll aufgezeichnet werden,
- wobei die betroffenen Objekte so
- angesprochen werden sollen, da\s sich das
- Abspielen auf die dann g"ultige Selektion
- bezieht (Beispiel: "ActiveDocument()") */
+ SFX_MACRO_EXISTING, /* Indicates that it is a existing
+ macro, which will only referenced */
+
+ SFX_MACRO_RECORDINGABSOLUTE, /* This macro shall be recorded so that the
+ affected objects are to be addressed as
+ directly as possible (example: "[doc.sdc]") */
+
+ SFX_MACRO_RECORDINGRELATIVE /* This macro is recorded and the affected
+ objects are addressed in such a way so
+ that when running the macro it refers to
+ a vaild selection
+ (example:" active document () ") */
};
//====================================================================
class SfxMacro
-/* [Beschreibung]
+/* [Description]
- "Uber diese Klasse (bzw. genaugenommen ihre Subklassen) wird zum
- einen die Lokation einer BASIC-Funktion (also in welcher Library,
- in welchem Modul sowie der Funktions-Name) beschrieben, als auch
- ein aufzuzeichnendes Makro w"ahrend der Aufzeichnung zwischen-
- gespeichert.
+ Through using this class (and in fact its subclasses) the location of a
+ BASIC function will be discribed (also in which Library, in which module
+ and the Function name) as well as temporary storing a macro during the
+ recording.
*/
{
@@ -181,3 +177,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
deleted file mode 100644
index c6d714657ed6..000000000000
--- a/sfx2/inc/msgnodei.hxx
+++ /dev/null
@@ -1,219 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _MSGNODEI_HXX
-#define _MSGNODEI_HXX
-
-
-#include <svl/eitem.hxx>
-#include <tools/string.hxx>
-#include <svl/poolitem.hxx>
-#include <tools/list.hxx>
-struct SfxMsgAttachFile {
- String aFile;
- String aName;
-
- int operator==( const SfxMsgAttachFile& rRec ) const
- {
- if( aName == rRec.aName && aFile == rRec.aFile )
- return sal_True;
- return sal_False;
- }
-
- SfxMsgAttachFile( const String& rFile, const String& rName)
- : aName( rName ), aFile( rFile ) {}
-
- SfxMsgAttachFile( const SfxMsgAttachFile& rRec )
- : aName( rRec.aName), aFile( rRec.aFile ) {}
-};
-
-enum SfxMsgReceiverRole
-{
- MSG_RECEIVER_TO = 0,
- MSG_RECEIVER_CC,
- MSG_RECEIVER_BCC,
- MSG_RECEIVER_NEWSGROUP
-};
-
-struct SfxMsgReceiver {
- String aName;
- SfxMsgReceiverRole eRole;
-
- int operator==( const SfxMsgReceiver& rRec ) const
- {
- if( aName == rRec.aName && eRole == rRec.eRole )
- return sal_True;
- return sal_False;
- }
-
- SfxMsgReceiver( const String& rName, SfxMsgReceiverRole _eRole )
- : aName( rName ), eRole( _eRole ) {}
-
- SfxMsgReceiver( const SfxMsgReceiver& rRec )
- : aName( rRec.aName), eRole( rRec.eRole ) {}
-};
-
-// ------------------------------------------------------------------------
-
-class SfxMsgReceiverList_Impl : public List
-{
- sal_uIntPtr nRef;
- ~SfxMsgReceiverList_Impl();
- SfxMsgReceiverList_Impl& operator=( const SfxMsgReceiverList_Impl&); //n.i.
-public:
- SfxMsgReceiverList_Impl();
- SfxMsgReceiverList_Impl(const SfxMsgReceiverList_Impl&);
-
- void Load( SvStream& );
- void Store( SvStream& ) const;
- void IncRef() { nRef++; }
- void DecRef() { nRef--; if( !nRef ) delete this; }
- sal_uIntPtr GetRefCount() const { return nRef; }
- int operator==( const SfxMsgReceiverList_Impl& ) const;
-};
-
-class SfxMsgReceiverListItem : public SfxPoolItem
-{
- void Disconnect();
-protected:
- SfxMsgReceiverList_Impl* pImp;
-public:
- TYPEINFO();
-
- SfxMsgReceiverListItem();
- SfxMsgReceiverListItem( sal_uInt16 nWhich );
- SfxMsgReceiverListItem( sal_uInt16 nWhich, SvStream& rStream );
- SfxMsgReceiverListItem( const SfxMsgReceiverListItem& rItem );
- ~SfxMsgReceiverListItem();
-
- virtual int operator==( const SfxPoolItem& ) const;
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- XubString &rText ) const;
-
- sal_uInt16 Count() const;
- SfxMsgReceiver* GetObject( sal_uInt16 nPos );
- void Remove( sal_uInt16 nPos );
- void Add( const SfxMsgReceiver& );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
- virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const;
-};
-
-
-// ------------------------------------------------------------------------
-
-class SfxMsgAttachFileList_Impl : public List
-{
- sal_uIntPtr nRef;
- ~SfxMsgAttachFileList_Impl();
- SfxMsgAttachFileList_Impl& operator=( const SfxMsgAttachFileList_Impl&); //n.i.
-
-public:
- SfxMsgAttachFileList_Impl();
- SfxMsgAttachFileList_Impl(const SfxMsgAttachFileList_Impl&);
-
- int operator==( const SfxMsgAttachFileList_Impl& rRec ) const;
- SfxMsgAttachFile* GetReceiver(sal_uIntPtr nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
- void Load( SvStream& );
- void Store( SvStream& ) const;
- void IncRef() { nRef++; }
- void DecRef() { nRef--; if( !nRef ) delete this; }
- sal_uIntPtr GetRefCount() const { return nRef; }
-};
-
-class SfxMsgAttachFileListItem : public SfxPoolItem
-{
-protected:
- SfxMsgAttachFileList_Impl* pImp;
- void Disconnect();
-public:
- TYPEINFO();
-
- SfxMsgAttachFileListItem();
- SfxMsgAttachFileListItem( sal_uInt16 nWhich );
- SfxMsgAttachFileListItem( sal_uInt16 nWhich, SvStream& rStream );
- SfxMsgAttachFileListItem( const SfxMsgAttachFileListItem& rItem );
- ~SfxMsgAttachFileListItem();
-
- virtual int operator==( const SfxPoolItem& ) const;
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- XubString &rText ) const;
-
- sal_uInt16 Count() const;
- SfxMsgAttachFile* GetObject( sal_uInt16 nPos );
- void Remove( sal_uInt16 nPos );
- void Add( const SfxMsgAttachFile& );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
- virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const;
-};
-
-
-//=========================================================================
-
-enum SfxMsgPriority
-{
- MSG_PRIORITY_LOW = 0,
- MSG_PRIORITY_NORMAL,
- MSG_PRIORITY_URGENT
-};
-#define SFXMSGPRIORITYCOUNT 3
-
-class SfxMsgPriorityItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
-
- SfxMsgPriorityItem( sal_uInt16 nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL);
-
- virtual SfxPoolItem* Clone( SfxItemPool* pPool=0 ) const;
- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
- virtual SvStream& Store( SvStream&, sal_uInt16 ) const;
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresentationMetric,
- String &rText ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
-
- inline SfxMsgPriorityItem& operator=(const SfxMsgPriorityItem& rPrio)
- {
- SetValue( rPrio.GetValue() );
- return *this;
- }
-};
-
-
-#endif
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 99a87f75f860..da26a55f0921 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 c87b9d94ed2b..7f5f9dd3a307 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 86b9c9841fa0..f5a7c5a4187e 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"
@@ -596,8 +598,6 @@
#include "tools/globname.hxx"
#include "tools/inetmime.hxx"
#include "tools/link.hxx"
-#include "tools/list.hxx"
-#include "tools/ownlist.hxx"
#include "tools/rc.hxx"
#include "tools/rcid.h"
#include "tools/ref.hxx"
@@ -654,14 +654,11 @@
#include "vcl/timer.hxx"
#include "vcl/unohelp.hxx"
#include "tools/wintypes.hxx"
-#include "vos/diagnose.hxx"
-#include "vos/module.hxx"
-#include "vos/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/security.hxx"
-#include "vos/socket.hxx"
-#include "vos/thread.hxx"
-#include "vos/xception.hxx"
+#include "osl/diagnose.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/process.h"
//---MARKER---
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx
index a3857b14c4ed..e06665e41779 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 7fdb1eab2d7c..3e0fc3cfc1c5 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 def1e4ab5a0e..d22f37304445 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 273eb1afef87..143f0ec52efb 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 e25d1a23082c..89a2902b1081 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.
@@ -32,7 +33,7 @@
class Window;
class String;
-/** opens the generell query save document dialog.
+/** Opens the general query save document dialog.
@param _pParent
The parent window.
@_rTitle
@@ -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 7871fbe66ac5..00c5ae88063a 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 f8032b448291..79f08172a621 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.
@@ -45,6 +46,7 @@
#include <vcl/svapp.hxx>
#include <sfx2/shell.hxx>
+#include <vector>
class Timer;
class ApplicationEvent;
@@ -68,7 +70,6 @@ class SfxEventHint;
class SfxItemSet;
class SfxMacroConfig;
class SfxMedium;
-class SfxMediumList;
class SfxMenuCtrlFactArr_Impl;
class SfxNewFileDialog;
class SfxObjectShell;
@@ -102,6 +103,8 @@ class ModalDialog;
class SbxArray;
class SbxValue;
+typedef ::std::vector< SfxMedium* > SfxMediumList;
+
namespace sfx2
{
class SvLinkSource;
@@ -123,31 +126,9 @@ public:
};
//TODO/CLEANUP
-//wird anscheinend nur in SfxPickList/SfxFrameLoader benutzt
+//is apparently used only in SfxPickList/SfxFrameLoader
DECL_OBJHINT( SfxStringHint, String );
-/*
-typedef SfxPoolItem* (*SfxItemCreateFunc)();
-class SfxItemFactory_Impl;
-class SfxItemFactoryList
-{
- List aList;
-public:
- ~SfxItemFactoryList();
-
- SfxItemFactory_Impl* GetFactory_Impl( const SvGlobalName& rName ) const;
- SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const;
- const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const;
- SfxPoolItem* Create(
- const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const;
- void RegisterItemFactory(
- const SvGlobalName& rName, SfxItemCreateFunc );
-};
-
-#define REGISTER_ITEM( ItemClass, aGlobName ) \
-RegisterItemFactory( aGlobName, ( SfxItemCreateFunc) ItemClass::StaticType() );
-*/
-
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
#define SFX_DECL_OBJECTSHELL_DEFINED
SV_DECL_REF(SfxObjectShell)
@@ -236,9 +217,6 @@ public:
StarBASIC* GetBasic();
sal_uInt16 SaveBasicManager() const;
sal_uInt16 SaveBasicAndDialogContainer() const;
- void RegisterBasicConstants( const char *pPrefix,
- const SfxConstant *pConsts,
- sal_uInt16 nCount );
// misc.
sal_Bool GetOptions(SfxItemSet &);
@@ -254,7 +232,6 @@ public:
const String* pPostStr = 0);
void ResetLastDir();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;}
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
@@ -309,8 +286,9 @@ public:
SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
SAL_DLLPRIVATE SfxModule* GetModule_Impl();
SAL_DLLPRIVATE ResMgr* GetOffResManager_Impl();
-//#endif
+ /* loads a branded bitmap - that can be overridden per locale */
+ static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
/** loads the application logo as used in the about dialog and impress slideshow pause screen */
static Image GetApplicationLogo();
};
@@ -327,3 +305,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 8136caac2ad9..9c5727e62f1a 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 979cfe5693a9..428e4865aa9c 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;
@@ -217,11 +214,10 @@ private:
HelpButton* pHelpBtn;
SingleTabDlgImpl* pImpl;
-// const SfxItemSet* pOptions;
-// SfxItemSet* pOutSet;
DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx
index 0227ad6515ec..37096a6637ab 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 32a5fb1dd223..23354d1baf06 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.
@@ -69,12 +70,12 @@ SV_DECL_PTRARR( SfxUnoControllerArr_Impl, SfxUnoControllerItemPtr, 20, 20 )
// defines
//________________________________________________________________________________________________________________
-#define SFX_CALLMODE_SLOT 0x00 // sync/async vom Slot
-#define SFX_CALLMODE_SYNCHRON 0x01 // synchron im selben Stackframe
-#define SFX_CALLMODE_ASYNCHRON 0x02 // asynchron per AppEvent
-#define SFX_CALLMODE_RECORD 0x04 // beim Recorden ber"ucksichtigen
-#define SFX_CALLMODE_API 0x08 // Call von der API (silent)
-#define SFX_CALLMODE_MODAL 0x10 // trotz ModalMode
+#define SFX_CALLMODE_SLOT 0x00 // sync/async from Slot
+#define SFX_CALLMODE_SYNCHRON 0x01 // synchronously in the same Stackframe
+#define SFX_CALLMODE_ASYNCHRON 0x02 // asynchronously via AppEvent
+#define SFX_CALLMODE_RECORD 0x04 // take into accont while recording
+#define SFX_CALLMODE_API 0x08 // API call (silent)
+#define SFX_CALLMODE_MODAL 0x10 // despite ModalMode
#define SFX_CALLMODE_STANDARD SFX_CALLMODE_RECORD
typedef sal_uInt16 SfxCallMode;
@@ -89,23 +90,22 @@ enum SfxPopupAction
//====================================================================
class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster
-/* [Beschreibung]
-
- In jeder SFx-Applikation existiert "uber die Laufzeit von vor
- <SfxApplication::Init()> bis nach <SfxApplication::Exit()> eine Instanz
- der Klasse SfxBindings. Sie wird von der SfxApplication automatisch
- angelegt und zerst"ort. Instanzen werden aber i.d.R. "uber das
- Makro <SFX_BINDINGS> oder den zugeh"origen <SfxViewFrame> besorgt
- werden.
-
- Die SfxBindings verwalten alle in den an ihr angemeldeten Controllern
- gebundenen Slot-Ids und cachen die jeweiligen <Slot-Server>
- (so nenne wir die Kombination aus SfxShell-Instanz und SfxSlot).
- In den SfxBindings ist gespeichert, ob und welche Controller dirty
- sind sowie welche Slot-Server-Caches jeweils dirty sind. Sie fa"st
- Status-Anfragen (Aufrufe der in der IDL genannten Status-Methoden)
- zusammen, die von derselben Status-Methode bedient werden, und sorgt
- f"ur die Simulation der <Pseudo-Slots>.
+/* [Description]
+
+ In each SFx application one instance of the SfxBindings-Class will
+ exists from <SfxApplication::Init()> until <SfxApplication::Exit()>.
+ This instance is automatically created and destroyed by SfxApplication.
+ However these instances will be handled by the Macro <SFX_BINDINGS>
+ or the associated <SfxViewFrame>.
+
+ The SfxBindings manages all of its Slot-Ids bound by the registerd
+ controllers and keeps a cache of the <Slot-Server> respectively.
+ (it is what we call the combination of SfxShell instance and SfxSlot).
+ In the SfxBindings it is stored, if and in this case which controllers
+ that are dirty and which Slot-Server-Caches are dirty respectively.
+ It summarizes status queries (calls to the status methods specified
+ in the IDL) that are served by the same state methods, and handles
+ the simulation of <Pseudo-Slots>.
*/
{
@@ -113,16 +113,15 @@ friend class SfxApplication;
friend class SfxShell;
friend class SfxBindings_Impl;
- SfxBindings_Impl*pImp; // Daten der Bindings-Instanz
- SfxDispatcher* pDispatcher; // zu verwendender Dispatcher
- sal_uInt16 nRegLevel; // Lock-Level waehrend Reconfig
+ SfxBindings_Impl*pImp; // Data of the Bindings instance
+ SfxDispatcher* pDispatcher; // Dispatcher, to be used
+ sal_uInt16 nRegLevel; // Lock-Level while 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, sal_Bool bGlobalOnly=sal_False);
SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
- SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren
+ SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer
SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache,
const SfxSlot* &pRealSlot,
const SfxSlotServer**,
@@ -135,18 +134,17 @@ 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( int bHide = sal_True );
+ SAL_DLLPRIVATE void HidePopupCtrls_Impl( bool bHide = true );
void SetDispatcher(SfxDispatcher *pDisp);
- void Update( sal_uInt16 nId ); // z.B. aus Menu::Activate
+ void Update( sal_uInt16 nId ); // For example, from Menu::Activate
void Update();
SAL_DLLPRIVATE void StartUpdate_Impl(sal_Bool bComplete=sal_False);
void Invalidate( sal_uInt16 nId );
@@ -193,7 +191,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 +211,6 @@ public:
SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
-//#endif
};
#ifdef DBG_UTIL
@@ -235,21 +231,21 @@ public:
inline int SfxBindings::IsInRegistrations() const
-/* [Beschreibung]
+/* [Description]
- Stellt fest, ob an der SfxBindings Instanz gerade <SfxContollerItems>
- an- oder abgemeldet werden, also noch <SfxBindings::EnterRegistrations()>
- Aufrufe nicht mit <SfxBindings::EnterRegistrations()> geschlo"sen wurden.
+ Determines whether the <SfxContollerItems> SfxBindings instance is
+ registerd or unregisted, i.e. <SfxBindings::EnterRegistrations()>
+ calls that have not been closed by <SfxBindings::LeaveRegistrations()>.
- [R"uckgabewert]
+ [Return value]
int sal_True
- Die SfxBindings Instanz ist gerade im Registrierungs-
- Modus. Es erfolgen also keine Status-Updates.
+ The SfxBindings instance is currently in
+ Registration-Mode. No status updates .
- sal_False
- Die SfxBindings Instanz ist gerade im normalen
- Modus. Es k"oennen also Status-Updates erfolgen.
+ int sal_False
+ The SfxBindings instance is the normal mode.
+ Status updates can be done.
*/
{
@@ -260,3 +256,4 @@ inline int SfxBindings::IsInRegistrations() const
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx
index 5186e875a6ea..5186e875a6ea 100755..100644
--- a/sfx2/inc/sfx2/brokenpackageint.hxx
+++ b/sfx2/inc/sfx2/brokenpackageint.hxx
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 26b13ee34bd7..6707424e816f 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.
@@ -29,35 +30,37 @@
#include <tools/solar.h>
-// Neue Reihenfolge: zuerst Navigationsleiste, dann senkrecht angedockte
-// ChildWindows (Explorer!), dann horizontal angedockte ChildWindows (Browser!),
-// dann die Formatleiste, die Statuszeile, am Ende die Werkzeugleiste.
+// New order: first, navigation bar, then vertically docked child windows
+// (Explorer!), then horizontally docked child windows (Browser!),
+// then the format bar, status bar, and at the end of the toolbar.
enum SfxChildAlignment
{
- SFX_ALIGN_HIGHESTTOP, // z.B. Navigationsleiste
+ SFX_ALIGN_HIGHESTTOP, // for example Navigation bar
SFX_ALIGN_LOWESTBOTTOM,
SFX_ALIGN_FIRSTLEFT,
SFX_ALIGN_LASTRIGHT,
- SFX_ALIGN_LEFT, // z.B. SplitWindow
+ SFX_ALIGN_LEFT, // for example SplitWindow
SFX_ALIGN_RIGHT,
SFX_ALIGN_LASTLEFT,
SFX_ALIGN_FIRSTRIGHT,
- SFX_ALIGN_TOP, // z.B. Hyperlink-Builder, SplitWindow
- SFX_ALIGN_BOTTOM, // z.B. SplitWindow
- SFX_ALIGN_TOOLBOXTOP, // z.B. Objektleiste
+ SFX_ALIGN_TOP, // for example Hyperlink-Builder, SplitWindow
+ SFX_ALIGN_BOTTOM, // for example SplitWindow
+ SFX_ALIGN_TOOLBOXTOP, // for example Objekt bar
SFX_ALIGN_TOOLBOXBOTTOM,
- SFX_ALIGN_LOWESTTOP, // z.B. Calc-Rechenleiste
- SFX_ALIGN_HIGHESTBOTTOM, // z.B. Statusleiste
- SFX_ALIGN_TOOLBOXLEFT, // z.B. Werkzeugleiste
+ SFX_ALIGN_LOWESTTOP, // for example Calc bar
+ SFX_ALIGN_HIGHESTBOTTOM, // for example Status bar
+ SFX_ALIGN_TOOLBOXLEFT, // for example Tool bar
SFX_ALIGN_TOOLBOXRIGHT,
- SFX_ALIGN_NOALIGNMENT // alle FloatingWindows
+ SFX_ALIGN_NOALIGNMENT // all FloatingWindows
};
-// "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird
+// Verifies that a valid alignment is used
inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign )
{
return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT );
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index 5570506b2c89..8aeaff3ad0ad 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.
@@ -33,7 +34,7 @@
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#ifdef ENABLE_INIMANAGER//MUSTINI
+#ifdef ENABLE_INIMANAGER
#include "inimgr.hxx"
#endif
#include <sfx2/shell.hxx>
@@ -47,22 +48,18 @@ class SfxChildWindow;
class SfxChildWindowContext;
class SfxChildWinContextArr_Impl;
-//ASDBG #ifndef _XFRAME_REF
-//ASDBG #define _XFRAME_REF
-//ASDBG USR_DECLIMPL_REF( ::com::sun::star::frame::XFrame, ::com::sun::star::uno::XInterface );
-//ASDBG #endif
-
-#define SFX_CHILDWIN_ZOOMIN 0x01 // ganz eingeklapptes Float
-#define SFX_CHILDWIN_SMALL 0x02 // halb eingeklapptes Float
-#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float verboten
-#define SFX_CHILDWIN_AUTOHIDE 0x08 // DockingWindow im AutoHide-Modus
-#define SFX_CHILDWIN_TASK 0x10 // ChildWindow innerhalb der Task
-#define SFX_CHILDWIN_CANTGETFOCUS 0x20 // ChildWindow kann keinen Focus bekommen
+#define SFX_CHILDWIN_ZOOMIN 0x01 // Fully retracted Float
+#define SFX_CHILDWIN_SMALL 0x02 // Half retracted Float
+#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float forbidden
+#define SFX_CHILDWIN_AUTOHIDE 0x08 // DockingWindow in AutoHide mode
+#define SFX_CHILDWIN_TASK 0x10 // ChildWindow inside the Task
+#define SFX_CHILDWIN_CANTGETFOCUS 0x20 // ChildWindow can not get focus
#define SFX_CHILDWIN_ALWAYSAVAILABLE 0x40 // ChildWindow is never disabled
-#define SFX_CHILDWIN_NEVERHIDE 0x80 // ChildWindow is can always made visible/is visible
+#define SFX_CHILDWIN_NEVERHIDE 0x80 // ChildWindow is can always made
+ // visible/is visible
#define CHILDWIN_NOPOS USHRT_MAX
-// Konfiguration eines ChildWindows
+// ChildWindow Configuration
struct SfxChildWinInfo
{
sal_Bool bVisible;
@@ -77,30 +74,28 @@ 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
+// ChildWindow factory methods
typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow,
sal_uInt16 nId,
SfxBindings *pBindings,
SfxChildWinInfo *pInfo);
-// Factory-Methode eines ChildWindowsContexts
+// ChildWindowsContexts factory methods
typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow,
SfxBindings *pBindings,
SfxChildWinInfo *pInfo);
struct SfxChildWinContextFactory
{
- SfxChildWinContextCtor pCtor; // Factory-Methode
- sal_uInt16 nContextId; // Identifier f"ur das SfxInterface
- SfxChildWinInfo aInfo; // Konfiguration
+ SfxChildWinContextCtor pCtor; // Factory method
+ sal_uInt16 nContextId; // Idenifier for SfxInterface
+ SfxChildWinInfo aInfo; // Configuration
SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID )
: pCtor(pTheCtor)
@@ -112,11 +107,11 @@ SV_DECL_PTRARR_DEL( SfxChildWinContextArr_Impl, SfxChildWinContextFactory*, 2, 2
struct SfxChildWinFactory
{
- SfxChildWinCtor pCtor; // Factory-Methode
+ SfxChildWinCtor pCtor; // Factory method
sal_uInt16 nId; // ChildWindow-Id ( SlotId )
- SfxChildWinInfo aInfo; // Konfiguration
- sal_uInt16 nPos; // ggf. Position im UI
- SfxChildWinContextArr_Impl *pArr; // Array f"ur Contexte
+ SfxChildWinInfo aInfo; // Configuration
+ sal_uInt16 nPos; // Position in UI
+ SfxChildWinContextArr_Impl *pArr; // Array for Contexts
SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID,
sal_uInt16 n )
@@ -126,16 +121,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;
@@ -173,13 +163,13 @@ class SFX2_DLLPUBLIC SfxChildWindow
sal_uInt16 nType; // ChildWindow-Id
protected:
- SfxChildAlignment eChildAlignment;// aktuelles ::com::sun::star::drawing::Alignment
- ::Window* pWindow; // eigentlicher Inhalt
- SfxChildWindow_Impl* pImp; // Imp-Daten
+ SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment
+ ::Window* pWindow; // actual contents
+ SfxChildWindow_Impl* pImp; // Implementation data
private:
- SfxChildWindowContext* pContext; // bei kontextsensitiven ChildWindows:
- // weiteres window in pWindow
+ SfxChildWindowContext* pContext; // With context-sensitive ChildWindows:
+ // Annother window in pWindow
SAL_DLLPRIVATE SfxChildWindowContext*
GetContext() const
{ return pContext; }
@@ -202,10 +192,8 @@ public:
void SetPosSizePixel(const Point& rPoint, Size& rSize);
Point GetPosPixel()
{ return pWindow->GetPosPixel(); }
-//<!--Modified by PengYunQuan for Validity Cell Range Picker
virtual void Hide();
virtual void Show( sal_uInt16 nFlags );
-//-->Modified by PengYunQuan for Validity Cell Range Picker
sal_uInt16 GetFlags() const
{ return GetInfo().nFlags; }
sal_Bool CanGetFocus() const;
@@ -240,11 +228,9 @@ 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* );
- //SfxWorkWindow* GetWorkWindow_Impl() const;
SAL_DLLPRIVATE void Activate_Impl();
SAL_DLLPRIVATE void Deactivate_Impl();
@@ -252,25 +238,24 @@ public:
GetContext_Impl() const
{ return pContext; }
SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* );
-//#endif
};
//------------------------------------------------------------------
-//! demn"achst hinf"allig !
+//! soon obsolete !
#define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \
static SfxChildWindowContext* CreateImpl(::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
static void RegisterChildWindowContext(SfxModule *pMod=0); \
-//! Das Macro der Zukunft ...
+//! The Macro of the future ...
#define SFX_DECL_CHILDWINDOWCONTEXT(Class) \
static SfxChildWindowContext* CreateImpl(::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \
-//! demn"achst hinf"allig !
+//! soon obsolete !
#define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \
- SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
SfxChildWindowContext *pContext = new Class(pParent, \
@@ -286,11 +271,12 @@ public:
SfxChildWindowContext::RegisterChildWindowContext(pMod, MyID, pFact); \
}
-//! Das Macro der Zukunft ...
-// CreateImpl mu\s noch als Parameter die Factory mitbekommen wg. ContextId
-// Solange wird diese Id auf 0 gesetzt und in SfxChildWindow::CreateContext gepatched
+//! The Macro of the future ...
+// As a parameter and because of ContextId, CreateImpl must be handed the
+// factory. As long as Id is set to 0 and patched in
+// SfxChildWindow::CreateContext
#define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \
- SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\
@@ -315,13 +301,13 @@ public:
SFX_IMPL_POS_CHILDWINDOW(Class, MyID, CHILDWIN_NOPOS)
#define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \
- SfxChildWindow* __EXPORT Class::CreateImpl( ::Window *pParent, \
+ SfxChildWindow* Class::CreateImpl( ::Window *pParent, \
sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
{ \
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 +320,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 +328,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 +336,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 +344,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 +353,5 @@ public:
//------------------------------------------------------------------
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index ef652981f76d..35cbf6e1fc6f 100644..100755
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -39,9 +39,9 @@
// Slot-ID's -----------------------------------------------------------------
#ifndef SID_SFX_START
-// HACK() - SID's duerfen nicht o.w. ihren numerischen Wert aendern,
-// sfxsids.hrc darf aber nicht included werden!!! Loesung: sfxsids.hrc
-// "tiefer legen" - z.B. svtools???
+// HACK() - SID's may not change its numerical value just like that,
+// sfxsids.hrc may not be included!!! Solution: sfxsids.hrc
+// include it on a lower level - for example svtools???
#define SID_SFX_START 5000
#endif
#define SID_TITLE (SID_SFX_START + 307)
@@ -349,24 +349,24 @@
// Tabpage-Ids ---------------------------------------------------------------
-#define CNT_TABPAGE_GENERAL 1 // "Allgemein"
-#define CNT_TABPAGE_SERVER_SETTINGS 2 // "Server"
-#define CNT_TABPAGE_RULES 3 // "Regeln"
-#define CNT_TABPAGE_VIEW_PROPERTIES 4 // "Ansicht"
-#define CNT_TABPAGE_CONTENT_PROPERTIES 5 // "Inhalte"
-#define CNT_TABPAGE_SUBSCRIBE 6 // "Abonniert"
-#define CNT_TABPAGE_RECIPIENT_STATE 7 // "Status" (Outtray-Msgs)
-#define CNT_TABPAGE_RECV_POP3 8 // "Empfangen" fuer POP3
-#define CNT_TABPAGE_RECV_NNTP 9 // - " - fuer NNTP-Accounts
-#define CNT_TABPAGE_RECV_IMAP 10 // - " - fuer IMAP-Accounts
-#define CNT_TABPAGE_RECV_VIM 11 // - " - fuer VIM-Accounts
-#define CNT_TABPAGE_SEND_SMTP 12 // "SMTP"
-#define CNT_TABPAGE_SEND_NNTP 13 // "NNTP"
-#define CNT_TABPAGE_SEND_VIM 14 // "VIM"
-#define CNT_TABPAGE_MAIL_NEWS_SEND 15 // "Versenden"
+#define CNT_TABPAGE_GENERAL 1
+#define CNT_TABPAGE_SERVER_SETTINGS 2
+#define CNT_TABPAGE_RULES 3
+#define CNT_TABPAGE_VIEW_PROPERTIES 4
+#define CNT_TABPAGE_CONTENT_PROPERTIES 5
+#define CNT_TABPAGE_SUBSCRIBE 6
+#define CNT_TABPAGE_RECIPIENT_STATE 7
+#define CNT_TABPAGE_RECV_POP3 8
+#define CNT_TABPAGE_RECV_NNTP 9
+#define CNT_TABPAGE_RECV_IMAP 10
+#define CNT_TABPAGE_RECV_VIM 11
+#define CNT_TABPAGE_SEND_SMTP 12
+#define CNT_TABPAGE_SEND_NNTP 13
+#define CNT_TABPAGE_SEND_VIM 14
+#define CNT_TABPAGE_MAIL_NEWS_SEND 15
#define CNT_TABPAGE_SEARCH_CRITERIA 16
#define CNT_TABPAGE_SEARCH_LOCATIONS 17
-#define CNT_TABPAGE_PROJECT_DATAEXCHANGE 18 // "Datenaustausch"
+#define CNT_TABPAGE_PROJECT_DATAEXCHANGE 18
#define CNT_TABPAGE_SBOX_LOCATION 19
#define CNT_TABPAGE_SBOX_SUBSCRIBTION 20
#define CNT_TABPAGE_SBOX_SCHEDULE 21
@@ -377,12 +377,12 @@
#define CNT_TABPAGE_SBOX_SDC_GENERAL 26
#define CNT_TABPAGE_SBOX_CDF_SUBSCRIBTION 27
#define CNT_TABPAGE_BACKGROUND 28
-#define CNT_TABPAGE_HEADER 29 // "Kopfzeilen" - Header bei Mail/News etc.
-#define CNT_TABPAGE_DESCRIPTION 30 // "Beschreibung" - Header im Filesys
+#define CNT_TABPAGE_HEADER 29
+#define CNT_TABPAGE_DESCRIPTION 30
#define CNT_TABPAGE_FONT 31
-#define CNT_TABPAGE_FOLDER_BMK 32 // Link auf Ordner
-#define CNT_TABPAGE_DOCUMENT_BMK 33 // Link auf Dokument
-#define CNT_TABPAGE_WEBVIEW 34 // Web-Ansicht
+#define CNT_TABPAGE_FOLDER_BMK 32
+#define CNT_TABPAGE_DOCUMENT_BMK 33
+#define CNT_TABPAGE_WEBVIEW 34
#define DEF_WIDTH_FROM 150
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index ed962342b6e3..5959e5eed2ea 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 4ceb2d940f52..e7b1dc6cfbc2 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.
@@ -40,30 +41,29 @@ class SFX2_DLLPUBLIC SfxControllerItem
{
private:
sal_uInt16 nId;
- SfxControllerItem* pNext; // zu benachrichtigendes weiteres ControllerItem
+ SfxControllerItem* pNext; // to notify next ControllerItem
SfxBindings* pBindings;
protected:
-//#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE )
#if defined( DBG_UTIL )
SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType );
#endif
public:
SfxBindings & GetBindings() {
- DBG_ASSERT(pBindings, "keine Bindings");
+ DBG_ASSERT(pBindings, "no Bindings");
return *pBindings;
}
const SfxBindings & GetBindings() const {
- DBG_ASSERT(pBindings, "keine Bindings");
+ DBG_ASSERT(pBindings, "no Bindings");
return *pBindings;
}
- SfxControllerItem(); // fuer arrays
+ SfxControllerItem(); // for arrays
SfxControllerItem( sal_uInt16 nId, SfxBindings & );
virtual ~SfxControllerItem();
- void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // in SfxBindings registrieren
+ void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // Register in SfxBindings
void UnBind();
void ReBind();
sal_Bool IsBound() const;
@@ -85,11 +85,9 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const
{ return pBindings != NULL; }
SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
-//#endif
};
//====================================================================
@@ -109,3 +107,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 97e9dd725c9a..97e9dd725c9a 100644..100755
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 61e972c99278..a8e9a6654472 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, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
// class SfxDocumentPage -------------------------------------------------
@@ -173,6 +174,7 @@ class SfxDocumentPage : public SfxTabPage
private:
FixedImage aBmp1;
Edit aNameED;
+ PushButton aChangePassBtn;
FixedLine aLine1FL;
FixedText aTypeFT;
@@ -212,7 +214,9 @@ private:
DECL_LINK( DeleteHdl, PushButton * );
DECL_LINK( SignatureHdl, PushButton * );
+ DECL_LINK( ChangePassHdl, PushButton * );
void ImplUpdateSignatures();
+ void ImplCheckPasswordState();
protected:
SfxDocumentPage( Window* pParent, const SfxItemSet& );
@@ -253,7 +257,6 @@ public:
// class SfxInternetPage -------------------------------------------------
-class TargetList;
namespace sfx2
{
class FileDialogHelper;
@@ -573,3 +576,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 64ad32cb1337..1560ae450da8 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 945d04b71f99..f6eb60be3755 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.
@@ -110,7 +111,7 @@ class SFX2_DLLPUBLIC SfxDispatcher
sal_Bool bFlushed;
private:
- // auf temporaer ausgewerteten Todos suchen
+ // Search for temporary evaluated Todos
SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep );
#ifndef _SFX_HXX
@@ -130,8 +131,8 @@ friend class SfxBindings;
friend class SfxStateCache;
friend class SfxPopupMenuManager;
friend class SfxHelp;
- // Fuer die Bindings: Finden einer Message; Level fuer
- // erneuten Zugriff
+ // For bindings: Finding the Message;
+ // level for re-access
SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
sal_Bool _FillState( const SfxSlotServer &rServer,
@@ -231,7 +232,6 @@ public:
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 );
SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc.
@@ -255,18 +255,16 @@ public:
SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool);
SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, String *pStr );
-//#endif
};
//--------------------------------------------------------------------
inline sal_Bool SfxDispatcher::IsFlushed() const
-/* [Beschreibung]
+/* [Description]
- Mit dieser Methode l"a"st sich erfragen, ob der Stack des
- SfxDispatchers geflusht ist, oder noch Push- oder Pop-Befehle
- ausstehen.
+ This method checks if the stack of the SfxDispatchers is flushed, or if
+ push- or pop- commands are pending.
*/
{
@@ -277,13 +275,12 @@ inline sal_Bool SfxDispatcher::IsFlushed() const
inline void SfxDispatcher::Flush()
-/* [Beschreibung]
+/* [Description]
- Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus.
- F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird
- <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur
- SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)>
- mit bMDI == sal_True aufgerufen.
+ This method performs outstanding push- and pop- commands. For <SfxShell>s,
+ which are new on the stack, the <SfxShell::Activate(sal_Bool)> is invoked with
+ bMDI == sal_True, for SfxShells that are removed from the stack, the
+ <SfxShell::Deactivate(sal_Bool)> is invoked with bMDI == sal_True
*/
{
@@ -294,14 +291,15 @@ inline void SfxDispatcher::Flush()
inline void SfxDispatcher::Push( SfxShell& rShell )
-/* [Beschreibung]
+/* [Description]
- Mit dieser Methode wird eine <SfxShell> auf den SfxDispatcher
- gepusht. Die SfxShell wird zun"achst zum pushen vermerkt und
- es wird ein Timer aufgesetzt. Erst bei Ablauf des Timers wird
- tats"achlich gepusht (<SfxDispatcher::Flush()>) und die <SfxBindings>
- werden invalidiert. W"ahrend der Timer l"auft gleichen sich
- entgegengesetzte Push und Pop Befehle mit derselben SfxShell aus.
+ With this method, a <SfxShell> pushed on to the SfxDispatcher.
+ The SfxShell is first marked for push and a timer is set up.
+ First when the timer has couted down to zero the push
+ ( <SfxDispatcher::Flush()> ) is actually performed and the
+ <SfxBindings> is invalidated. While the timer is counting down
+ the opposing push and pop commands on the same SfxShell are
+ leveled out.
*/
{
@@ -312,21 +310,18 @@ inline void SfxDispatcher::Push( SfxShell& rShell )
inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell )
-/* [Beschreibung]
+/* [Description]
- Mit dieser Methode kann abgefragt werden, ob sich eine bestimmte
- <SfxShell>-Instanz auf dem SfxDispatcher befindet.
+ This method checks whether a particular <SfxShell> instance is
+ on the SfxDispatcher.
- [R"uckgabewert]
+ [Return value]
sal_Bool sal_True
- Die SfxShell-Instanz befindet sich auf dem
- SfxDispatcher.
+ The SfxShell instance is on the SfxDispatcher.
sal_False
- Die SfxShell-Instanz befindet sich nicht auf dem
- SfxDispatcher.
-
+ The SfxShell instance is not on the SfxDispatcher.
*/
{
@@ -336,21 +331,20 @@ inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell )
inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell )
-/* [Beschreibung]
+/* [Description]
- Mit dieser Methode kann abgefragt werden, ob sich eine bestimmte
- <SfxShell>-Instanz zuoberst auf dem SfxDispatcher befindet.
+ This method checks whether a particular <SfxShell> instance is on
+ top of the SfxDispatcher.
- [R"uckgabewert]
+ [Return value]
sal_Bool sal_True
- Die SfxShell-Instanz befindet sich als oberste
- SfxShell auf dem SfxDispatcher.
+ The SfxShell instance is on the top of
+ the SfxDispatcher.
sal_False
- Die SfxShell-Instanz befindet sich nicht als
- oberste SfxShell auf dem SfxDispatcher.
-
+ The SfxShell instance is not on the top of
+ the SfxDispatcher.
*/
{
@@ -361,3 +355,4 @@ inline sal_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 78066a4b2d7c..82018b6480e5 100644..100755
--- 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 bc2d9bfc7be2..b0a047c7180b 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>
@@ -53,25 +54,25 @@ class SfxBindings;
typedef void (*SfxVoidFunc)();
#define SDT_SDT_DOCFACTPRIO 10 // Explorer
-#define SDT_SW_DOCFACTPRIO 20 // Text-Dokument
-#define SDT_SWW_DOCFACTPRIO 21 // Web-Dokument
-#define SDT_SC_DOCFACTPRIO 30 // Tabellen-Dokument
-#define SDT_SI_DOCFACTPRIO 40 // Impress-Dokument
-#define SDT_SD_DOCFACTPRIO 41 // Draw-Dokument
-#define SDT_SCH_DOCFACTPRIO 50 // Chart-Dokument
-#define SDT_SMA_DOCFACTPRIO 60 // Math-Dokument
-#define SDT_SIM_DOCFACTPRIO 70 // Image-Dokument
-#define SDT_FRM_DOCFACTPRIO 100 // Rahmen-Dokument
-#define SDT_MSG_DOCFACTPRIO 110 // Nachrichten-Dokument
-#define SDT_SDB_DOCFACTPRIO 200 // Datenbank-Dokument
+#define SDT_SW_DOCFACTPRIO 20 // Text Document
+#define SDT_SWW_DOCFACTPRIO 21 // Web Document
+#define SDT_SC_DOCFACTPRIO 30 // Table Document
+#define SDT_SI_DOCFACTPRIO 40 // Impress Document
+#define SDT_SD_DOCFACTPRIO 41 // Draw Document
+#define SDT_SCH_DOCFACTPRIO 50 // Chart Document
+#define SDT_SMA_DOCFACTPRIO 60 // Math Document
+#define SDT_SIM_DOCFACTPRIO 70 // Image Document
+#define SDT_FRM_DOCFACTPRIO 100 // Frame Document
+#define SDT_MSG_DOCFACTPRIO 110 // Message Document
+#define SDT_SDB_DOCFACTPRIO 200 // Database Document
//====================================================================
class SFX2_DLLPUBLIC SfxObjectFactory
{
private:
- const char* pShortName; // Objekt-Kurzname
- SfxObjectFactory_Impl* pImpl; // Zusatzdaten
+ const char* pShortName;
+ SfxObjectFactory_Impl* pImpl; // Additional Data
SfxObjectShellFlags nFlags;
SAL_DLLPRIVATE void Construct();
@@ -108,11 +109,9 @@ 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;
-//#endif
private:
// Kopieren verboten
@@ -123,19 +122,16 @@ private:
//=========================================================================
#define SFX_DECL_OBJECTFACTORY() \
-private: \
- static SfxObjectFactory* pObjectFactory; \
public: \
static SfxObjectFactory& Factory(); \
virtual SfxObjectFactory& GetFactory() const { return Factory(); }
#define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \
- SfxObjectFactory* ClassName::pObjectFactory = 0; \
- SfxObjectFactory& ClassName::Factory() \
- { if (!pObjectFactory) \
- pObjectFactory = \
- new SfxObjectFactory( GlobName, Flags, ShortName ); \
- return *pObjectFactory; \
- }
+ SfxObjectFactory& ClassName::Factory() \
+ { \
+ static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \
+ return aObjectFactory; \
+ }
#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 87e62aef5b63..273fb3d3ef45 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.
@@ -44,13 +45,14 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <svl/lstner.hxx>
#include <tools/globname.hxx>
#include <cppuhelper/weak.hxx>
#include <ucbhelper/content.hxx>
+#include <vector>
+
class SvKeyValueIterator;
class SfxObjectFactory;
class SfxFilter;
@@ -63,8 +65,6 @@ class SfxItemSet;
class DateTime;
class SvStringsDtor;
-#define S2BS(s) ByteString( s, RTL_TEXTENCODING_MS_1252 )
-
//____________________________________________________________________________________________________________________________________
// defines for namespaces
//____________________________________________________________________________________________________________________________________
@@ -92,7 +92,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
SvGlobalName aFilterClass;
SvStream* pInStream;
SvStream* pOutStream;
-//REMOVE SvStorageRef aStorage;
const SfxFilter* pFilter;
SfxItemSet* pSet;
SfxMedium_Impl* pImp;
@@ -160,11 +159,7 @@ public:
void ReOpen();
void CompleteReOpen();
const String& GetName() const {return aLogicName;}
-#if defined SINIX && defined GCC && defined C272
- const INetURLObject& GetURLObject();
-#else
const INetURLObject& GetURLObject() const;
-#endif
void CheckFileDate( const ::com::sun::star::util::DateTime& aInitDate );
sal_Bool DocNeedsFileDateCheck();
@@ -183,7 +178,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()); }
@@ -277,7 +271,6 @@ public:
SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool);
SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const;
-//REMOVE void SetStorage_Impl( SvStorage* pStor );
SAL_DLLPRIVATE void SetLongName(const String &rName)
{ aLongName = rName; }
SAL_DLLPRIVATE const String & GetLongName() const { return aLongName; }
@@ -329,10 +322,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 7a6af9040066..a951239d4a25 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.
@@ -38,6 +39,7 @@
#include <tools/wldcrd.hxx>
#include <comphelper/documentconstants.hxx>
+#define SFX_FILTER_STARTPRESENTATION 0x20000000L
#include <sfx2/sfxdefs.hxx>
@@ -119,3 +121,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 9f7da1932110..22b13be1d56d 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 c4e4be12185e..40969a76dbe1 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 c9138988fa45..021b9fdefe44 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 sal_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( sal_Bool bShow = sal_True );
DECL_LINK( TimerHdl, Timer* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
@@ -125,7 +123,6 @@ public:
SAL_DLLPRIVATE void Pin_Impl( sal_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 463e5dbe4aa2..48b58b4ecd9b 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 977916ed532c..b6ac0da8becb 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 9c991912448a..8d8e7dfdd546 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 bc0728b0ec1b..1216ef09bcdc 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.
@@ -69,7 +70,7 @@ public:
static sal_Bool SaveDir( /*SfxTemplateDir &rEntry */ ) ;
const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
- sal_Bool Rescan( ); // Aktualisieren
+ sal_Bool Rescan( );
void ReInitFromComponent();
sal_Bool IsRegionLoaded( sal_uInt16 nIdx ) const;
@@ -86,16 +87,15 @@ public:
String GetDefaultTemplatePath(const String &rLongName);
- // Pfad zur Vorlage geben lassen; logischer Name muss angegeben
- // werden, damit beim Ueberschreiben einer Vorlage der
- // richtige Dateiname gefunden werden kann
+ // Path to the template; the logical name must be given in order to find
+ // the correct file name when overwriting a template
String GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const;
// Allows to retrieve the target template URL from the UCB
::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName,
const ::rtl::OUString& aTitle );
- // Speichern als Vorlage hat geklappt -> Aktualisieren
+ // Save as template worked -> update
void NewTemplate(sal_uInt16 nRegion,
const String &rLongName,
const String &rFileName);
@@ -146,3 +146,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 d24a38be0deb..6e28386b4f19 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 791b63da930a..89fef8d61687 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.
@@ -44,6 +45,7 @@
#endif
#define ITEMID_MACRO SID_ATTR_MACROITEM
#include <svl/macitem.hxx>
+#include <vector>
class SfxObjectShell;
class SvxMacroTableDtor;
@@ -64,16 +66,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 sal_uInt16 nInitSz = 0, const sal_uInt16 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
@@ -117,3 +129,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 90c43c1ff774..513846614d4c 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.
@@ -39,6 +40,8 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/sfxdefs.hxx>
+#include <boost/utility.hpp>
+
class Window;
class SfxFilter;
class SfxFilterArr_Impl;
@@ -102,8 +105,6 @@ public:
SfxFilterContainer( const String& rName );
~SfxFilterContainer();
-// SfxFilterContainerFlags GetFlags() const;
-// void SetFlags( SfxFilterContainerFlags eFlags );
const String GetName() const;
@@ -115,31 +116,27 @@ 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( sal_Bool bUpdate=sal_False );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
sal_Bool bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
-//#endif
};
class SfxFilterMatcher_Impl;
-class SFX2_DLLPUBLIC SfxFilterMatcher
+class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable
{
friend class SfxFilterMatcherIter;
- SfxFilterMatcher_Impl *pImpl;
+ SfxFilterMatcher_Impl &m_rImpl;
public:
SfxFilterMatcher( const String& rFact );
SfxFilterMatcher();
~SfxFilterMatcher();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static sal_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;
@@ -157,22 +154,23 @@ public:
};
class SfxFilterContainer_Impl;
-class SFX2_DLLPUBLIC SfxFilterMatcherIter
+class SFX2_DLLPUBLIC SfxFilterMatcherIter : private boost::noncopyable
+
{
SfxFilterFlags nOrMask;
SfxFilterFlags nAndMask;
sal_uInt16 nCurrent;
- const SfxFilterMatcher_Impl *pMatch;
+ const SfxFilterMatcher_Impl &m_rMatch;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE const SfxFilter* Find_Impl();
-//#endif
public:
- SfxFilterMatcherIter( const SfxFilterMatcher* pMatchP, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED );
+ SfxFilterMatcherIter( const SfxFilterMatcher& rMatcher, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED );
const SfxFilter* First();
const SfxFilter* Next();
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 619358f077ac..bbcf9b8b5b27 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>
@@ -85,10 +84,10 @@ class Window;
#define SFXWB_READONLY WB_READONLY // ((WinBits)0x02000000)
#define SFXWB_PATHDIALOG WB_PATH // ((WinBits)0x00100000)
#define SFXWB_CLASSPATH ( 0x08000000L | SFXWB_PATHDIALOG )
-#define SFXWB_SHOWALLFOLDER 0x10000000L // alle Ordner auch Mail/News/...
-#define SFXWB_MULTISELECTION 0x20000000L // Multiselection an
+#define SFXWB_SHOWALLFOLDER 0x10000000L // All folders also mail/news/...
+#define SFXWB_MULTISELECTION 0x20000000L
#define SFXWB_NOREMOTE 0x40000000L
-#define SFXWB_SHOWVERSIONS 0x80000000L // Versionsauswahl anzeigen
+#define SFXWB_SHOWVERSIONS 0x80000000L
#define SFXWB_GRAPHIC 0x00800000L // FileOpen with link and preview box
#define SFXWB_SHOWSTYLES 0x01000000L // FileOpen with link and preview box and styles
@@ -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 622be188072a..1080824baeb7 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.
@@ -66,9 +67,9 @@ namespace com
#include <tools/ref.hxx>
#include <tools/string.hxx>
#include <svl/brdcst.hxx>
-#include <tools/list.hxx>
#include <svl/poolitem.hxx>
#include <comphelper/namedvaluecollection.hxx>
+#include <vector>
class SvBorder;
class SfxWorkWindow;
@@ -93,21 +94,20 @@ class SystemWindow;
typedef SfxFrame* SfxFramePtr;
class SfxFrameArr_Impl;
-DECLARE_LIST( TargetList, String* )
+typedef ::std::vector< String* > TargetList;
#define SFXFRAME_HASTITLE 0x0001
//==========================================================================
-// Ein SfxFrame ist eine Verwaltungsklasse f"ur Fenster und deren Inhalte.
-// Eine SfxApplication pr"asentiert sich als Hierarchie von SfxFrames, wobei
-// die konkreten Inhalte in den abgeleiteten Klassen festgelegt werden.
-// Die Basisklasse SfxFrame implementiert 2 Aspekte der Frames: Benennung und
-// Kontrolle der Lebensdauer.
-// Innerhalb einer Frames-Hierarchie kontrolliert immer der ParentFrame die
-// Lebensdauer seiner ChildFrames, auch wenn sie in der Regel gar nicht von
-// ihm selbst erzeugt wurden. Durch Aufruf vonn DoClose() an irgendeinem
-// Frame in der Hierarchie kann ein Teil des "Frameworks" entfernt werden,
-// wobei sich Frames an ihren ParentFrames selbst abmelden.
+// SfxFrame is a management class for windows and their content.
+// A SfxApplication represent a hierarchy of SfxFrames, with which the actual
+// content in the derived classes is defined. The base class SfxFrame
+// implements two aspects of frames: naming and control of its lifespan.
+// Inside a frame hierarchy the parent frame always controls the lifespan of
+// its child frames, even though they usually are not even produced by the
+// parent. By calling DoCloser() on any frame in the hierarchy,
+// a part of the "framework" can be removed, where frames unsubscribe
+// from their parent frames.
//==========================================================================
class SfxFrameArr_Impl;
@@ -183,7 +183,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 );
@@ -195,7 +194,7 @@ public:
SAL_DLLPRIVATE sal_Bool IsClosing_Impl() const;
SAL_DLLPRIVATE void SetIsClosing_Impl();
- // Methoden f"ur den Zugriff auf das aktuelle Set
+ // Methods for accessing the current set
SAL_DLLPRIVATE void SetDescriptor( SfxFrameDescriptor* );
SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
@@ -225,7 +224,6 @@ public:
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
-//#endif
private:
SAL_DLLPRIVATE void Construct_Impl();
};
@@ -237,9 +235,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 +263,8 @@ public:
virtual String GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
sal_Bool FrameKilled() const { return &wFrame != pFrame; }
@@ -286,8 +282,8 @@ public:
{ return aValue; }
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
@@ -304,10 +300,12 @@ 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, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
typedef SfxUsrAnyItem SfxUnoAnyItem;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index cc6ae5f4cb7e..f1c62c66f129 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.
@@ -46,16 +47,14 @@ typedef SfxFrameDescriptor* SfxFrameDescriptorPtr;
SV_DECL_PTRARR(SfxFramesArr, SfxFrameDescriptorPtr, 4, 2)
//===========================================================================
-// Die SfxFrame...descriptoren bauen eine rekursive Struktur auf, die
-// s"amtliche zur Anzeige des Frame-Dokuments erforderlichen Daten umfa\st.
-// "Uber einen SfxFrameSetDescriptor hat man Zugriff auf die gesamte darunter
-// liegende Struktur.
-// Aufgrund der besonderen Eigenschaften des SfxFrames-Dokuments ist ein
-// SfxFramesSetDescriptor nicht nur der Inhalt dieses Dokuments, sondern
-// beschreibt auch die View darauf.
-// Das FrameSet wird aus Zeilen aufgebaut, die wiederum die eigentlichen
-// Fenster enthalten. Eine Zeile kann horizontal oder vertikal ausgerichtet
-// sein, woraus sich auch das Alignment des FrameSets ergibt.
+// The SfxFrame descriptors build a recursive structure, that covers all the
+// required data in-order to display the frame document.
+// Through a SfxFrameSetDescriptor access is given to the whole underlying
+// structure. Due to the nature of the SfxFrames document, the
+// SfxFramesSetDescriptor is not only the content of this document, but also
+// describes the view on it. The FrameSet is made up of lines, which in turn,
+// contains the actual window . A line can be horizontally or vertically
+// aligned, from which also the alignment of the FrameSet is given.
//===========================================================================
enum ScrollingMode
@@ -104,7 +103,7 @@ public:
SfxFrameDescriptor();
~SfxFrameDescriptor();
- // Eigenschaften
+ // Properties
void TakeProperties( const SfxFrameProperties& rProp );
// FileName/URL
@@ -183,7 +182,7 @@ public:
void SetHasUI( sal_Bool bOn )
{ bHasUI = bOn; }
- // Attribute f"ur das Splitwindow
+ // Attribute for Splitwindow
sal_uInt16 GetItemId() const
{ return nItemId; }
void SetItemId( sal_uInt16 nId )
@@ -192,11 +191,11 @@ public:
long GetSize() const;
sal_uInt16 GetItemPos() const;
- // Kopie z.B. f"ur die Views
+ // Copy for example for Views
SfxFrameDescriptor* Clone( sal_Bool bWithIds = sal_True ) const;
};
-// Kein Bock, einen operator= zu implementieren...
+// No block to implement a =operator
struct SfxFrameProperties
{
String aURL;
@@ -280,9 +279,6 @@ public:
UniString &rText, const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- //virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- //virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- //virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
const SfxFrameProperties& GetProperties() const
{ return aProperties; }
@@ -292,3 +288,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 9c3ff64e688a..c6d007bea86d 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.
@@ -50,10 +51,11 @@ protected:
SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
public:
- // Diese Methoden koennen auch von anderen Parsern benutzt werden
+ // These methods can also be used by other parsers.
static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& );
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index e6b681c57f93..9521d6982fb6 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 35a7534e6294..81479a0af846 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 375a22f5b2ec..13c4993bca5d 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.
@@ -38,17 +39,16 @@ class SfxHint;
class SfxHintPoster: public SvRefBase
-/* [Beschreibung]
+/* [Description]
- Mit Instanzen dieser Klasse k"onnen eindeutige Events per PostUserEvent
- "uber die StarView-Application verschickt werden. Wenn das User-Event
- ausgel"ost wird, wird der Handler <Event()> gerufen, dessen
- Basisimplementierung den mit <SetEventHdl()> angegbenen Link ruft.
+ With instances of this class unique events per PostUserEvent can be sent
+ using the StarView-application. If the User-Event is triggered often,
+ the handler <Event()> is called, the base implementation with the
+ <SetEventHdl()> line is making these link calls.
- Die Instanz wird via Ref-Count mindestens solange gehalten, wie
- ein ggf. abgeschicktes Event noch nicht angekommen ist. Sollte das
- Ziel vorher sterben, ist die Verbindung zuvor mit 'SetEventHdl(GenLink())'
- zu kappen.
+ The instance are held via Ref-Count at least as long as a possible sent
+ event has not arrived yet. Should be killed before the goal, before the
+ connection is SetEventHdl (GenLink ()) .
*/
{
@@ -57,9 +57,7 @@ class SfxHintPoster: public SvRefBase
private:
void RegisterEvent();
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( DoEvent_Impl, SfxHint * );
-//#endif
protected:
virtual ~SfxHintPoster();
@@ -78,3 +76,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 51f341c5c3c0..5f3c36c147d5 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.
@@ -29,19 +30,19 @@
#define HTMLMODE_ON 0x0001
-#define HTMLMODE_PARA_BORDER 0x0002 /* Absatzumrandungen */
-#define HTMLMODE_PARA_DISTANCE 0x0004 /* bestimmte Absatzabstaende */
-#define HTMLMODE_SMALL_CAPS 0x0008 /* Kapitaelchen */
-#define HTMLMODE_FRM_COLUMNS 0x0010 /* spaltige Rahmen */
+#define HTMLMODE_PARA_BORDER 0x0002
+#define HTMLMODE_PARA_DISTANCE 0x0004
+#define HTMLMODE_SMALL_CAPS 0x0008
+#define HTMLMODE_FRM_COLUMNS 0x0010
#define HTMLMODE_SOME_STYLES 0x0020 /* mind. MS IE */
#define HTMLMODE_FULL_STYLES 0x0040 /* == SW */
-#define HTMLMODE_BLINK 0x0080 /* blinkende Zeichen*/
-#define HTMLMODE_PARA_BLOCK 0x0100 /* Blocksatz */
-#define HTMLMODE_DROPCAPS 0x0200 /* Initialen*/
-#define HTMLMODE_FIRSTLINE 0x0400 /* Erstzeileneinzug mit Spacer == NS 3.0 */
-#define HTMLMODE_GRAPH_POS 0x0800 /* Grafikpositionen Hintergrund */
-#define HTMLMODE_FULL_ABS_POS 0x1000 /* abs. Rahmenpositionierung */
-#define HTMLMODE_SOME_ABS_POS 0x2000 /* abs. Rahmenpositionierung vollst.*/
+#define HTMLMODE_BLINK 0x0080
+#define HTMLMODE_PARA_BLOCK 0x0100
+#define HTMLMODE_DROPCAPS 0x0200
+#define HTMLMODE_FIRSTLINE 0x0400 /* First-line intent with Spacer == NS 3.0 */
+#define HTMLMODE_GRAPH_POS 0x0800
+#define HTMLMODE_FULL_ABS_POS 0x1000
+#define HTMLMODE_SOME_ABS_POS 0x2000
#define HTMLMODE_RESERVED1 0x4000
#define HTMLMODE_RESERVED0 0x8000
@@ -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 fb5337f63b5a..0bbde7a0b47b 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.
@@ -33,4 +34,10 @@
#include <rtl/ustring.hxx>
#include <vcl/image.hxx>
-SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
+SFX2_DLLPUBLIC Image SAL_CALL GetImage(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& aURL,
+ bool bBig
+);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
index 1aa34a393b33..a729eb6cda84 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 555cd37939b3..de3c9b55ecfc 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, sal_Bool bHiContrast, sal_Bool bLarge );
- void SetImagesForceSize( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge );
+ void SetImages( ToolBox& rToolBox, bool bLarge );
+ void SetImagesForceSize( ToolBox& rToolBox, bool bLarge );
- Image GetImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const;
- Image GetImage( sal_uInt16 nId, sal_Bool bHiContrast ) const;
- Image SeekImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const;
- Image SeekImage( sal_uInt16 nId, sal_Bool bHiContrast ) const;
+ Image GetImage( sal_uInt16 nId, bool bLarge ) const;
+ Image GetImage( sal_uInt16 nId) const;
+ Image SeekImage( sal_uInt16 nId, bool bLarge ) const;
+ Image SeekImage( sal_uInt16 nId ) const;
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index d302bc53442e..a441acad6b2e 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.
@@ -98,11 +99,9 @@ public:
void ResetObject();
sal_Bool IsUIActive();
- // used in Writer
- // Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const;
- // Rectangle LogicObjAreaToPixel( const Rectangle & rRect ) const;
virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning)
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index 3d93bded533f..7808de9d32f8 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.
@@ -48,8 +49,6 @@ const ItemConnFlags ITEMCONN_NONE = 0x0000;
/** Connection is inactive - virtual functions will not be called. */
const ItemConnFlags ITEMCONN_INACTIVE = 0x0001;
-/** Clone item in FillItemSet() from old item set. */
-//const ItemConnFlags ITEMCONN_CLONE_ITEM = 0x0002;
/** Enable control(s), if the item is known. */
const ItemConnFlags ITEMCONN_ENABLE_KNOWN = 0x0010;
@@ -593,3 +592,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 939182eae12d..55d7c9b2a4d3 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 91ae78410500..e7eddef08f39 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 fdd4d418ebf9..db467fd06da7 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 a5099a3a6b75..2629b2c7c106 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 d92ed2ac4ac1..95bd42d39c88 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 5a1dd1b15bd7..39fcd6bd3918 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.
@@ -33,16 +34,24 @@
#include <tools/string.hxx>
#include <svl/svarray.hxx>
+#include <vector>
+
class SfxObjectShell;
class Graphic;
class Size;
+namespace com { namespace sun { namespace star {
+ namespace lang {
+ class XComponent;
+ }
+}}}
+
namespace sfx2
{
- // Damit der Link ueber den Status der zu ladenen Grafik informierten werden
- // verschickt das FileObject ein SvData, mit der FormatId
- // "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser
- // enthaelt den folgenden enum.
+ // For the link to receive information about the status of graphics that
+ // will be loaded the FileObject sends a SvData, which contains the
+ // FormatID "RegisterStatusInfoId" and a string as the data container.
+ // This contains the following enum.
class SvBaseLink;
class SvBaseLinkRef;
@@ -55,10 +64,14 @@ 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;
- SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden
+ SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell
protected:
sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
const String* pName = 0 );
@@ -74,6 +87,16 @@ public:
LinkManager( SfxObjectShell * pCacheCont );
~LinkManager();
+ /**
+ * Insert a component loaded during link update, which needs to be closed
+ * when the update is complete.
+ *
+ * @param xComp component loaded during link update.
+ */
+ void InsertCachedComp(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp);
+
+ void CloseCachedComps();
+
SfxObjectShell* GetPersist() const { return pPersist; }
void SetPersist( SfxObjectShell * p ) { pPersist = p; }
@@ -81,26 +104,37 @@ public:
void Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 );
sal_Bool Insert( SvBaseLink* pLink );
- // den Link mit einem SvLinkSource verbinden und in die Liste eintragen
+ // the links connect to a SvLinkSource and adds to the list
sal_Bool InsertDDELink( SvBaseLink*,
const String& rServer,
const String& rTopic,
const String& rItem );
- // falls am Link schon alles eingestellt ist !
+ // if everything is already set at the link!
sal_Bool InsertDDELink( SvBaseLink* );
- // den Link mit einem PseudoObject verbinden und in die Liste eintragen
+ // Connect the links to a pseudo-object and add to the list
sal_Bool InsertFileLink( sfx2::SvBaseLink&,
sal_uInt16 nFileType,
const String& rTxt,
const String* pFilterNm = 0,
const String* pRange = 0 );
- // falls am Link schon alles eingestellt ist !
+ // if everything is already set for the link!
sal_Bool InsertFileLink( sfx2::SvBaseLink& );
- // erfrage die Strings fuer den Dialog
+ void ReconnectDdeLink(SfxObjectShell& rServer);
+
+ /**
+ * Reconnect the server document shell to a DDE link object.
+ *
+ * @param rPath path to the server document
+ * @param rServer server document shell instance
+ * @param rLink link object of the client document
+ */
+ void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const;
+
+ // Obtain the string for the dialog
sal_Bool GetDisplayNames( const SvBaseLink *,
String* pType,
String* pFile = 0,
@@ -114,29 +148,29 @@ public:
sal_Bool bUpdateGrfLinks = sal_False,
Window* pParentWin = 0 );
- // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog)
+ // Call for list of links (eg for link-dialog)
const SvBaseLinks& GetLinks() const { return aLinkTbl; }
- // ----------------- Serverseitige Verwaltung --------------------
+ // ----------------- Server-side management --------------------
- // Liste der zu serviereden Links erfragen
+ // Call with list of links to server
const SvLinkSources& GetServers() const { return aServerTbl; }
- // einen zu servierenden Link eintragen/loeschen
+ // Link register/delete
sal_Bool InsertServer( SvLinkSource* rObj );
void RemoveServer( SvLinkSource* rObj );
void RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 )
{ aServerTbl.Remove( nPos, nCnt ); }
- // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
- // (ist zur Zeit nur fuer die FileLinks interressant!)
+ // A transfer is aborted, so cancel all download media
+ // (for the time beeing this is only of interest for the FileLinks!)
void CancelTransfers();
- // um Status Informationen aus dem FileObject an den BaseLink zu
- // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
- // dann die entsprechenden Informationen als String.
- // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
- // - das braucht Informationen ueber Load/Abort/Error
- static sal_uIntPtr RegisterStatusInfoId();
+ // To send status information from the FileObject to the Baselink,
+ // for this there exist a separate ClipBoardId. The SvData-object has
+ // got the appropriate information as a string.
+ // Is now required for FileObject in conjunction with JavaScript
+ // this needs information about Load/Abort/Error
+ static sal_uIntPtr RegisterStatusInfoId();
// if the mimetype says graphic/bitmap/gdimetafile then get the
// graphic from the Any. Return says no errors
@@ -149,15 +183,15 @@ private:
LinkManager& operator=( const LinkManager& );
};
-// Trenner im LinkName fuer die DDE-/File-/Grafik- Links
-// (nur wer es braucht, um einen SvLinkName zusammenzubasteln)
+// Separator in the link name for the DDE-/File-/Graphics- links
+// (only those who need to construct a SvLinkName)
const sal_Unicode cTokenSeperator = 0xFFFF;
-// erzeuge einen String fuer den SvLinkName. Fuer
-// - DDE die ersten 3 Strings, (Server, Topic, Item)
-// - File-/Grf-LinkNms die letzen 3 Strings (FileName, Bereich, Filter)
+// create a string for the SvLinkName. For:
+// - DDE the first 3 Strings, (Server, Topic, Item)
+// - File-/Graphics-LinkNames the last 3 Strings (FileName, Region, Filter)
SFX2_DLLPUBLIC void MakeLnkName( String& rName,
- const String* pType, // kann auch 0 sein !!
+ const String* pType, // Can also be null!!
const String& rFile,
const String& rLink,
const String* pFilter = 0 );
@@ -166,3 +200,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 16e9af685c8e..7b6f1fbb26d1 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,13 +43,12 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
class Window;
class String;
#ifndef ADVISEMODE_NODATA
-// Muessen die gleichen Werte wie Ole2 ADVF_* sein
+// Must be the same value as Ole2 ADVF_*
#define ADVISEMODE_NODATA 0x01
//#define ADVISEMODE_PRIMEFIRST 0x02
#define ADVISEMODE_ONLYONCE 0x04
@@ -74,7 +72,6 @@ public:
SvLinkSource();
virtual ~SvLinkSource();
-// SvBaseLink* GetDataBaseLink() const;
sal_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 ffd3020fa9d0..621e597c23bd 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
@@ -58,16 +54,16 @@ class FileDialogHelper;
#define OBJECT_DDE_EXTERN 0x02
#endif
-#define OBJECT_CLIENT_SO 0x80 // ein Link
+#define OBJECT_CLIENT_SO 0x80 // a Link
#define OBJECT_CLIENT_DDE 0x81
-//#define OBJECT_CLIENT_OLE 0x82 // ein Ole-Link
-//#define OBJECT_CLIENT_OLE_CACHE 0x83 // ein Ole-Link mit SvEmbeddedObject
+//#define OBJECT_CLIENT_OLE 0x82 // a Ole-Link
+//#define OBJECT_CLIENT_OLE_CACHE 0x83 // a Ole-Link with SvEmbeddedObject
#define OBJECT_CLIENT_FILE 0x90
#define OBJECT_CLIENT_GRF 0x91
#define OBJECT_CLIENT_OLE 0x92 // embedded link
enum sfxlink {
- // Ole2 compatibel und persistent
+ // Ole2 compatibel and persistent
LINKUPDATE_ALWAYS = 1,
LINKUPDATE_ONCALL = 3,
@@ -88,7 +84,7 @@ private:
sal_uInt16 nObjType;
sal_Bool bVisible : 1;
sal_Bool bSynchron : 1;
- sal_Bool bUseCache : 1; // fuer GrafikLinks!
+ sal_Bool bUseCache : 1; // for Graphics Links!
sal_Bool bWasLastEditOK : 1;
DECL_LINK( EndEditHdl, String* );
@@ -98,9 +94,9 @@ private:
protected:
void SetObjType( sal_uInt16 );
- // setzen des LinkSourceName ohne aktion
+ // Set LinkSourceName without action
void SetName( const String & rLn );
- // LinkSourceName der im SvLinkBase steht
+ // LinkSourceName which is in SvLinkBase
String GetName() const;
ImplBaseLinkData* pImplData;
@@ -124,7 +120,7 @@ protected:
public:
TYPEINFO();
- // ask JP
+
virtual void Closed();
SvBaseLink( const String& rNm, sal_uInt16 nObjectType,
SvLinkSource* );
@@ -137,8 +133,13 @@ public:
void SetLinkSourceName( const String & rName );
String GetLinkSourceName() const;
- virtual void DataChanged( const String & rMimeType,
- const ::com::sun::star::uno::Any & rValue );
+ enum UpdateResult {
+ SUCCESS = 0,
+ ERROR_GENERAL = 1
+ };
+
+ virtual UpdateResult DataChanged(
+ const String & rMimeType, const ::com::sun::star::uno::Any & rValue );
void SetUpdateMode( sal_uInt16 );
sal_uInt16 GetUpdateMode() const;
@@ -155,10 +156,10 @@ public:
// Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
virtual void Edit( Window*, const Link& rEndEditHdl );
- // soll der Link im Dialog angezeigt werden ? (Links im Link im ...)
+ // should the link appear in the dialog? (to the left in the link in the...)
sal_Bool IsVisible() const { return bVisible; }
void SetVisible( sal_Bool bFlag ) { bVisible = bFlag; }
- // soll der Link synchron oder asynchron geladen werden?
+ // should the Link be loaded synchronous or asynchronous?
sal_Bool IsSynchron() const { return bSynchron; }
void SetSynchron( sal_Bool bFlag ) { bSynchron = bFlag; }
@@ -170,9 +171,8 @@ public:
sal_Bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; }
- // --> OD 2008-06-18 #i88291#
+ // #i88291#
void clearStreamToLoadFrom();
- // <--
inline sal_Bool WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
@@ -183,3 +183,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
new file mode 100644
index 000000000000..60692b4c49a6
--- /dev/null
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -0,0 +1,141 @@
+/* -*- 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SFX_MACROCONF_HXX
+#define _SFX_MACROCONF_HXX
+
+#include "sal/config.h"
+#include "sfx2/dllapi.h"
+#include "sal/types.h"
+#include <tools/errcode.hxx>
+#define _SVSTDARR_USHORTS
+#include <svl/svstdarr.hxx> // SvUShorts
+#include <sfx2/evntconf.hxx>
+
+class SfxMacroInfo;
+class SfxSlot;
+class SfxMacroInfoItem;
+class SfxObjectShell;
+class BasicManager;
+struct SfxMacroConfig_Impl;
+class SbMethod;
+class SbxValue;
+class SbxObject;
+class SbxArray;
+class SvStream;
+class SvxMacro;
+
+typedef SfxMacroInfo* SfxMacroInfoPtr;
+SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5)
+
+class SFX2_DLLPUBLIC SfxMacroInfo
+{
+friend class SfxMacroConfig;
+friend class SfxEventConfiguration;
+
+ String* pHelpText;
+ sal_uInt16 nRefCnt;
+ sal_Bool bAppBasic;
+ String aLibName;
+ String aModuleName;
+ String aMethodName;
+ sal_uInt16 nSlotId;
+ SfxSlot* pSlot;
+
+public:
+ SfxMacroInfo( const String& rURL );
+ SfxMacroInfo( bool _bAppBasic = true );
+ SfxMacroInfo( bool _bAppBasic, const String& rQualifiedName );
+ SfxMacroInfo(SfxMacroInfo& rOther);
+ SfxMacroInfo(bool _bAppBasic, const String& rLibName,
+ const String& rModuleName, const String& rMethodName);
+ ~SfxMacroInfo();
+ sal_Bool operator==(const SfxMacroInfo& rOther) const;
+ String GetMacroName() const;
+ String GetQualifiedName() const;
+ String GetFullQualifiedName() const;
+ BasicManager* GetBasicManager() const;
+ String GetBasicName() const;
+ String GetHelpText() const;
+ sal_Bool IsAppMacro() const
+ { return bAppBasic; }
+ const String& GetModuleName() const
+ { return aModuleName; }
+ const String& GetLibName() const
+ { return aLibName; }
+ const String& GetMethodName() const
+ { return aMethodName; }
+ sal_uInt16 GetSlotId() const
+ { return nSlotId; }
+ SfxSlot* GetSlot() const
+ { return pSlot; }
+
+ sal_Bool Compare( const SvxMacro& ) const;
+ void SetHelpText( const String& rText );
+ String GetURL() const;
+};
+
+class SFX2_DLLPUBLIC SfxMacroConfig
+{
+friend class SfxEventConfiguration;
+
+ SAL_DLLPRIVATE static SfxMacroConfig* pMacroConfig;
+
+ SfxMacroConfig_Impl* pImp;
+ SvUShorts aIdArray;
+
+public:
+ SfxMacroConfig();
+ ~SfxMacroConfig();
+
+ static SfxMacroConfig* GetOrCreate();
+
+ static String RequestHelp( sal_uInt16 nId );
+ static sal_Bool IsMacroSlot( sal_uInt16 nId );
+ static sal_Bool IsBasic( SbxObject*, const String&, BasicManager* );
+ static ErrCode Call( SbxObject*, const String&, BasicManager*,
+ SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
+ static SbMethod* GetMethod_Impl( const String&, BasicManager* );
+
+ sal_uInt16 GetSlotId(SfxMacroInfoPtr);
+ void ReleaseSlotId(sal_uInt16 nId);
+ void RegisterSlotId(sal_uInt16 nId);
+ SfxMacroInfo* GetMacroInfo(sal_uInt16 nId) const;
+ sal_Bool ExecuteMacro(sal_uInt16 nId, const String& rArgs ) const;
+ sal_Bool ExecuteMacro( SfxObjectShell*, const SvxMacro*, const String& ) const;
+ sal_Bool CheckMacro(sal_uInt16 nId) const;
+ sal_Bool CheckMacro( SfxObjectShell*, const SvxMacro* ) const;
+
+ 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index d94583f44eb2..3411a7647451 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.
@@ -34,9 +35,11 @@
#include <tools/string.hxx>
#include "sfx2/dllapi.h"
-// class SfxMailModel_Impl -----------------------------------------------
+// class AddressList_Impl ------------------------------------------------
+typedef String* AddressItemPtr_Impl;
+typedef ::std::vector< AddressItemPtr_Impl > AddressList_Impl;
-class AddressList_Impl;
+// class SfxMailModel_Impl -----------------------------------------------
class SFX2_DLLPUBLIC SfxMailModel
{
@@ -139,3 +142,5 @@ public:
sal_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 a599163116e5..21af363ca94f 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,18 +32,16 @@
#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>
#include <svtools/svmedit2.hxx>
#include <svtools/svmedit.hxx>
-/* erwartet:
- SID_TEMPLATE_NAME : In: StringItem, Name der Vorlage
- SID_TEMPLATE_FAMILY : In: Familie der Vorlage
+/* expected:
+ SID_TEMPLATE_NAME : In: StringItem, Name of Template
+ SID_TEMPLATE_FAMILY : In: Family of Template
*/
class SfxStyleFamilies;
@@ -80,7 +79,7 @@ class SfxManageStyleSheetPage : public SfxTabPage
String aBuf;
sal_Bool bModified;
- // initiale Daten des Styles
+ // initial data for the style
String aName;
String aFollow;
String aParent;
@@ -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 7a00cabd307e..72f2e4e0487b 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 6ccd7e0081c4..9ed76ede6039 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 )
@@ -60,7 +60,6 @@ public:\
const T& GetObject( sal_uInt16 nPos ) const; \
T& GetObject( sal_uInt16 nPos ); \
\
- void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\
void Insert( sal_uInt16 nPos, const T& rElem );\
void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\
void Append( const T& rElem );\
@@ -77,11 +76,6 @@ public:\
void Clear() { Remove( 0, Count() ); }\
};\
\
-inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\
-{\
- Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\
-}\
-\
inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\
{\
Insert( nPos, rElem, 1 );\
@@ -282,7 +276,7 @@ void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \
if ( nUnused == 0 ) \
{ \
\
- /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \
+ /* increase (round up) to the next Grow-limit */ \
sal_uInt16 nNewSize; \
for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \
/* empty loop */; \
@@ -527,3 +521,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 bdeeaaaba6c8..3d2cd29aaa44 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 6b92205a7694..4c98ec5ef0f2 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.
@@ -27,7 +28,6 @@
#ifndef _SFXMINSTACK_HXX
#define _SFXMINSTACK_HXX
-//ASDBG #ifndef _SFXMINARRAY_HXX
#include <sfx2/minarray.hxx>
#define DECL_OBJSTACK( ARR, T, nI, nG ) \
@@ -97,3 +97,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 669f579a254c..a4b990c63b1f 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;
sal_Bool b_ShowStrings;
@@ -65,15 +62,10 @@ public:
using SfxControllerItem::Bind;
void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
- const String& rTitle, const String &rHelpText,
- SfxBindings & );
+ const String& rTitle, SfxBindings& rBindings );
void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 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,15 +73,12 @@ public:
void SetOwnMenu( SfxVirtualMenu* pMenu );
void RemovePopup();
- const String& GetHelpText() const { return aHelpText; }
- void SetHelpText(const String &rStr) { aHelpText = rStr; }
-
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
- static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* );
+ static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* );
static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
@@ -102,14 +91,12 @@ public:
SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
SfxBindings&, SfxVirtualMenu* );
SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
- const String&, const String&,
+ const String&,
SfxBindings&, SfxVirtualMenu* );
~SfxUnoMenuControl();
void Select();
};
-//--------------------------------------------------------------------
-
typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 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( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \
static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \
- SfxMenuControl* __EXPORT Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \
+ SfxMenuControl* Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \
{ return new Class(nId, rMenu, rBindings); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
-//#if 0 // _SOLAR__PRIVATE
class SfxAppMenuControl_Impl : public SfxMenuControl
{
PopupMenu* pMenu;
sal_uIntPtr m_nSymbolsStyle;
- sal_Bool m_bWasHiContrastMode;
sal_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 d54dafd6e0b2..49ff8fa47d84 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,9 +30,7 @@
#include <stdarg.h>
-#ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!!
#include <vcl/menu.hxx>
-#endif
#include <tools/wintypes.hxx>
#include <tools/link.hxx>
#include <com/sun/star/embed/VerbDescriptor.hpp>
@@ -58,9 +57,9 @@ class SfxMenuManager
{
friend class SfxPopupMenuManager;
- SfxVirtualMenu* pMenu; // das eigentliche Menu
+ SfxVirtualMenu* pMenu; // the actual Menu
SfxVirtualMenu* pOldMenu; // only while reconfiguring
- sal_Bool bMenuBar; // Popup oder MenuBar
+ sal_Bool bMenuBar; // Popup or MenuBar
SfxBindings* pBindings;
ResMgr* pResMgr;
sal_uInt32 nType;
@@ -89,9 +88,7 @@ public:
ResMgr* GetResMgr() const { return pResMgr; }
void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
-//#if 0 // _SOLAR__PRIVATE
void Construct_Impl( Menu* pMenu, sal_Bool bWithHelp );
-//#endif
};
//--------------------------------------------------------------------
@@ -119,7 +116,6 @@ public:
// @deprecated!!
// Don't use this method any longer. The whole class will be removed in the future.
// Changing code which relies on Popup would need much more effort.
- // Please contact cd@openoffice.org if you have questions or need help
static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow );
sal_uInt16 Execute( const Point& rPos, Window *pWindow );
@@ -129,7 +125,6 @@ public:
// @deprecated (start)!!
// Don't use these methods any longer. The whole class will be removed in the future.
// Changing code which relies on these methods would need much more effort!
- // Please contact cd@openoffice.org if you have questions or need help
void StartInsert();
void EndInsert();
void CheckItem( sal_uInt16, sal_Bool );
@@ -146,3 +141,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 5551df850ff2..4dcd035fd49f 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.
@@ -25,8 +26,8 @@
*
************************************************************************/
#ifndef _SFXMODULE_HXX
-#define _SFXMODULE_HXX // intern
-#define _SFXMOD_HXX // extern
+#define _SFXMODULE_HXX // internal
+#define _SFXMOD_HXX // external
#include "sal/config.h"
#include "sfx2/dllapi.h"
@@ -69,9 +70,7 @@ private:
sal_Bool bDummy : 1;
SfxModule_Impl* pImpl;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Construct_Impl();
-//#endif
public:
TYPEINFO();
@@ -111,7 +110,6 @@ public:
static FieldUnit GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > const & i_frame );
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;
@@ -119,9 +117,8 @@ public:
SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig );
- SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig, sal_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 a69fd108ccea..c4d914b93453 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.
@@ -35,42 +36,51 @@
//--------------------------------------------------------------------
-#define SFX_SLOT_CACHABLE 0x0001L // exklusiv zu VOLATILE, default
-#define SFX_SLOT_VOLATILE 0x0002L // per Timer alle 2s neu geholt, exklusiv zu CACHABLE
-#define SFX_SLOT_TOGGLE 0x0004L // invertiert bei Execute alten Wert
-#define SFX_SLOT_AUTOUPDATE 0x0008L // invalidiert den Status nach Execute automatisch
+#define SFX_SLOT_CACHABLE 0x0001L // exclusiv to VOLATILE, default
+#define SFX_SLOT_VOLATILE 0x0002L // per Timer every 2s get new,
+ // exclusiv to CACHABLE
+#define SFX_SLOT_TOGGLE 0x0004L // inverted for Execute old value
+#define SFX_SLOT_AUTOUPDATE 0x0008L // invalidated the status automatically
+ // after execute
-#define SFX_SLOT_SYNCHRON 0x0010L // exklusiv zu ASYNCHRON, default
-#define SFX_SLOT_ASYNCHRON 0x0020L // via Post-Message, exklusiv zu SYNCHRON
+#define SFX_SLOT_SYNCHRON 0x0010L // exclusiv to ASYNCHRON, default
+#define SFX_SLOT_ASYNCHRON 0x0020L // via Post-Message, exclusiv
+ // to SYNCHRON
-#define SFX_SLOT_HASCOREID 0x0040L // Slot-ID/Which-ID Mappting durchf"uhren
-#define SFX_SLOT_HASDIALOG 0x0080L // Punkte fuer Dialog nach recofig
+#define SFX_SLOT_HASCOREID 0x0040L // Slot-ID/Which-ID execute mapping
+#define SFX_SLOT_HASDIALOG 0x0080L // Coordinates for dialogue after recofig
-#define SFX_SLOT_NORECORD 0x0100L // kein Recording
-#define SFX_SLOT_RECORDPERITEM 0x0200L // je Item ein Statement
-#define SFX_SLOT_RECORDPERSET 0x0400L // das ganze Set ist ein Statement, def.
-#define SFX_SLOT_RECORDMANUAL 0x0800L // Recording vom Applikationsentwickler iss-default
+#define SFX_SLOT_NORECORD 0x0100L // no recording
+#define SFX_SLOT_RECORDPERITEM 0x0200L // each item, one statement
+#define SFX_SLOT_RECORDPERSET 0x0400L // The whole Set is a Statement, default
+#define SFX_SLOT_RECORDMANUAL 0x0800L // Recording by the application
+ // developer is default
-#define SFX_SLOT_RECORDABSOLUTE 0x1000000L // Recording mit absolutem Target
+#define SFX_SLOT_RECORDABSOLUTE 0x1000000L // Recording with absolute Target
#define SFX_SLOT_STANDARD ( SFX_SLOT_CACHABLE | \
SFX_SLOT_SYNCHRON | \
SFX_SLOT_RECORDPERSET )
-#define SFX_SLOT_PROPGET 0x1000L // abfragbares Property
-#define SFX_SLOT_PROPSET 0x2000L // setzbares Property, exklusiv zu SFX_SLOT_METHOD
-#define SFX_SLOT_METHOD 0x4000L // Methode, exklusiv zu SFX_SLOT_PROPSET
+#define SFX_SLOT_PROPGET 0x1000L // get property
+#define SFX_SLOT_PROPSET 0x2000L // set property, exclusiv to
+ // SFX_SLOT_METHOD
+#define SFX_SLOT_METHOD 0x4000L // Method, exclusiv to SFX_SLOT_PROPSET
-#define SFX_SLOT_FASTCALL 0x8000L // vor Execute keine Pr"ufung, ob disabled
+#define SFX_SLOT_FASTCALL 0x8000L // No test if disabled before Execute
-#define SFX_SLOT_STATUSBARCONFIG 0x10000L // konfigurierbar in Statuszeile
-#define SFX_SLOT_MENUCONFIG 0x20000L // konfigurierbar im Men"u
-#define SFX_SLOT_TOOLBOXCONFIG 0x40000L // konfigurierbar in Toolboxen
-#define SFX_SLOT_ACCELCONFIG 0x80000L // konfigurierbar auf Tasten
+#define SFX_SLOT_STATUSBARCONFIG 0x10000L // configurable status row
+#define SFX_SLOT_MENUCONFIG 0x20000L // configurable Menu
+#define SFX_SLOT_TOOLBOXCONFIG 0x40000L // configurable Toolboxen
+#define SFX_SLOT_ACCELCONFIG 0x80000L // configurable keys
-#define SFX_SLOT_CONTAINER 0x100000L // beim InPlace vom Container bedient
-#define SFX_SLOT_READONLYDOC 0x200000L // auch bei readonly-Docs verf"ugbar
-#define SFX_SLOT_IMAGEROTATION 0x400000L // bei Vertical/Bidi writing Image drehen
-#define SFX_SLOT_IMAGEREFLECTION 0x800000L // bei Vertical/Bidi writing Image spiegeln
+#define SFX_SLOT_CONTAINER 0x100000L // Operated by the container at
+ // InPlace
+#define SFX_SLOT_READONLYDOC 0x200000L // also available for
+ // read-only Documents
+#define SFX_SLOT_IMAGEROTATION 0x400000L // Rotate image on Vertical/
+ // Bi-directional writing
+#define SFX_SLOT_IMAGEREFLECTION 0x800000L // Mirror image on Vertical/
+ // Bi-directional writing
//--------------------------------------------------------------------
@@ -78,14 +88,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 +122,7 @@ enum SfxSlotKind
struct SfxTypeAttrib
{
sal_uInt16 nAID;
- const char __FAR_DATA* pName;
+ const char* pName;
};
struct SfxType
@@ -225,8 +235,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 ) \
@@ -238,9 +248,9 @@ class SfxPoolItem;
struct SfxFormalArgument
{
- const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse)
- const char __FAR_DATA* pName; // Name des Parameters
- sal_uInt16 nSlotId;// Slot-Id zur Identifikation des Parameters
+ const SfxType* pType; // Type of the parameter (SfxPoolItem subclass)
+ const char* pName; // Name of the sParameters
+ sal_uInt16 nSlotId; // Slot-Id for identification of the Parameters
const TypeId& Type() const
{ return pType->aTypeId; }
@@ -253,29 +263,30 @@ struct SfxFormalArgument
class SfxSlot
{
public:
- sal_uInt16 nSlotId; // in Shell eindeutige Slot-Id
- sal_uInt16 nGroupId; // f"ur Konfigurations-Bereich
- sal_uIntPtr nHelpId; // i.d.R. == nSlotId
- sal_uIntPtr nFlags; // artihm. veroderte Flags
+ sal_uInt16 nSlotId; // Unique slot-ID in Shell
+ sal_uInt16 nGroupId; // for configuration region
+ sal_uIntPtr nHelpId; // Usually == nSlotId
+ sal_uIntPtr nFlags; // artihmetic ordered Flags
- sal_uInt16 nMasterSlotId; // Enum-Slot bzw. Which-Id
- sal_uInt16 nValue; // Wert, falls Enum-Slot
+ sal_uInt16 nMasterSlotId; // Enum-Slot for example Which-Id
+ sal_uInt16 nValue; // Value, in case of Enum-Slot
- SfxExecFunc fnExec; // Funktion zum Ausf"uhren
- SfxStateFunc fnState; // Funktion f"ur Status
+ SfxExecFunc fnExec; // Function to be excecuted
+ SfxStateFunc fnState; // Function for 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 SfxType* pType; // SfxPoolItem-Type (Status)
+ const char* pName; // Name of the Slots
+ const char* pMethodName; // Name of the Method if different
- const SfxSlot* pLinkedSlot; // Master-Slot f"ur Enum-Werte
- const SfxSlot* pNextSlot; // mit derselben Status-Methode
+ const SfxSlot* pLinkedSlot; // Master-Slot for Enum value
+ const SfxSlot* pNextSlot; // with the same Status-Method
- const SfxFormalArgument* pFirstArgDef; // erste formale Argument-Definition
- sal_uInt16 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 SfxFormalArgument* pFirstArgDef; // first formal Argument-Definition
+ sal_uInt16 nArgDefCount; // Number of formal Argumentents
+ long nDisableFlags; // DisableFlags that need to be
+ // present, so that the Slot
+ // can be enabled
+ const char* pUnoName; // UnoName for the Slots
public:
@@ -347,3 +358,5 @@ inline sal_uInt16 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 2bda4f36a59d..05854edbb010 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 2958f92ca0d3..2412fca06a09 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 e6bfe590431e..23d2444f6722 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,
@@ -96,9 +82,8 @@ public:
SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0);
~SfxNewFileDialog();
- // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist
- // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen
- // erfragt werden
+ // Returns sal_False, when '- No -' is set as Template
+ // Template names can only be obtained when IsTemplate() returns sal_True.
sal_Bool IsTemplate() const;
String GetTemplateRegion() const;
String GetTemplateName() const;
@@ -110,3 +95,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 ce596bacaa81..22f47eec8974 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 4294a93a454c..d867bd065f2b 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[]( sal_uInt16 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( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
sal_uInt16 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 f7024ccc76f9..cc14c6881791 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 05ae3365d6b1..31890aa1d5e4 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.
@@ -42,19 +43,14 @@
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <boost/shared_ptr.hpp>
-
//________________________________________________________________________________________________________________
// include something else
//________________________________________________________________________________________________________________
-//#if 0 // _SOLAR__PRIVATE
#include <vcl/timer.hxx>
-//#endif
#include <svl/poolitem.hxx>
#include <vcl/timer.hxx>
#include <vcl/bitmap.hxx>
@@ -97,7 +93,7 @@ class Point;
// From embobj.hxx
#define ASPECT_CONTENT 1
-#define ASPECT_THUMBNAIL 2 /* 120 * 120, 6 Farben DIB in MetaFile */
+#define ASPECT_THUMBNAIL 2 /* 120 * 120, 6 Colors DIB in MetaFile */
#define ASPECT_ICON 4
#define ASPECT_DOCPRINT 8
#define ASPECT_ALL (ASPECT_CONTENT | ASPECT_THUMBNAIL | ASPECT_ICON | ASPECT_DOCPRINT)
@@ -126,6 +122,9 @@ namespace com { namespace sun { namespace star {
namespace document {
class XDocumentProperties;
}
+ namespace lang {
+ class XComponent;
+ }
} } }
typedef sal_uInt32 SfxObjectShellFlags;
@@ -149,7 +148,7 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFX_TITLE_CAPTION 5
#define SFX_TITLE_PICKLIST 6
#define SFX_TITLE_HISTORY 7
-#define SFX_TITLE_MAXLEN 10 // ab hier sind das L"angenbegrenzungen
+#define SFX_TITLE_MAXLEN 10 // this gives the limits on length
#define SFX_LOADED_MAINDOCUMENT 1
#define SFX_LOADED_IMAGES 2
@@ -183,9 +182,9 @@ enum SfxObjectCreateMode
/*====================================================================
-Die Klasse SfxObjectShell ist die Basisklasse f"ur SFx-Objekte, also
-f"ur Dokumente und Teile von Dokumenten, die als selbst"andige Objekte
-in fremde Objekte integriert werden k"onnen.
+The class SfxObjectShell is the base class for SFx-objects, ie documents
+and parts of documents that can be integrated as separate objects
+into foreign objects.
----------------------------------------------------------------------*/
@@ -200,25 +199,22 @@ friend struct ModifyBlocker_Impl;
friend class SfxObjectShellLock;
private:
- struct SfxObjectShell_Impl* pImp; // interne Daten
+ struct SfxObjectShell_Impl* pImp; // internal data
- SfxMedium * pMedium; // Beschreibung der Datei bzw. des Storage, in dem sich das Objekt befindet
+ SfxMedium * pMedium; // Description of the file for example
+ // storage that contains the object
SfxStyleSheetBasePool* pStyleSheetPool; // StyleSheets
- SfxObjectCreateMode eCreateMode; // Zweck des Objekts
- sal_Bool bHasName :1, // sal_True := bestehendes Objekt, sal_False := es ist ein neues Objekt
- bIsTmp :1; // temp. Storage
+ SfxObjectCreateMode eCreateMode; // Purpose of the object
+ sal_Bool bHasName :1, // sal_True := existing object,
+ // sal_False := new object
+ bIsTmp :1; // temporary Storage
private:
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps);
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
@@ -234,6 +230,9 @@ protected:
/// template method, called by FlushDocInfo; this implementation is empty
virtual void DoFlushDocInfo();
+ // helper method
+ void AddToRecentlyUsedList();
+
public:
TYPEINFO();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
@@ -274,7 +273,6 @@ public:
void FlushDocInfo();
sal_Bool HasName() const { return bHasName; }
virtual String GetAPIName() const;
- void SetHasName( sal_Bool bSet = sal_True ) { bHasName = bSet; }
void SetReadOnly();
sal_Bool IsReadOnly() const;
sal_Bool IsReadOnlyMedium() const;
@@ -283,9 +281,7 @@ public:
void SetNoName();
sal_Bool IsInModalMode() const;
sal_Bool IsInPrepareClose() const;
- //<!--Added by PengYunQuan for Validity Cell Range Picker
virtual sal_Bool AcceptStateUpdate() const;
- //-->Added by PengYunQuan for Validity Cell Range Picker
sal_Bool HasModalViews() const;
sal_Bool IsHelpDocument() const;
@@ -300,10 +296,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;
@@ -335,6 +329,13 @@ 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( sal_uInt16 nSlotId );
@@ -346,8 +347,7 @@ public:
sal_Bool bForceNonModified = sal_False );
sal_Bool SaveCompletedChildren( sal_Bool bSuccess );
- sal_Bool InsertFrom( SfxMedium &rMedium );
- sal_Bool ImportFrom( SfxMedium &rMedium );
+ virtual sal_Bool ImportFrom( SfxMedium &rMedium, bool bInsert );
sal_Bool ExportTo( SfxMedium &rMedium );
// xmlsec05, check with SFX team
@@ -368,8 +368,8 @@ public:
::com::sun::star::uno::Any& aRet,
::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
- bool bRaiseError = true
- );
+ bool bRaiseError = true,
+ const ::com::sun::star::uno::Any* aCaller = 0 );
static ErrCode CallXScript(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxScriptContext,
@@ -378,7 +378,8 @@ public:
::com::sun::star::uno::Any& aRet,
::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
- bool bRaiseError = true
+ bool bRaiseError = true,
+ const ::com::sun::star::uno::Any* aCaller = 0
);
/** adjusts the internal macro mode, according to the current security settings
@@ -465,12 +466,10 @@ public:
SfxProgress* GetProgress() const;
void SetWaitCursor( sal_Bool bSet ) const;
-//(mba) virtual SotObjectRef CreateAggObj( const SotFactory* pFact );
-
// Naming Interface
void SetTitle( const String& rTitle );
String GetTitle( sal_uInt16 nMaxLen = 0 ) const;
- void InvalidateName(); // Zuruecksetzen auf unbenannt
+ void InvalidateName(); // Re-set to unnamed
// DDE-Interface
virtual long DdeExecute( const String& rCmd );
@@ -481,13 +480,16 @@ 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();
- void SetStyleSheetPool( SfxStyleSheetBasePool *pBasePool ) {
+ void SetStyleSheetPool(SfxStyleSheetBasePool *pBasePool ) {
pStyleSheetPool = pBasePool; }
- //determine the position of the "Automatic" filter in the stylist
+ // Determine the position of the "Automatic" filter in the stylist
void SetAutoStyleFilterIndex(sal_uInt16 nSet);
sal_uInt16 GetAutoStyleFilterIndex();
virtual sal_Bool HasBasic() const;
@@ -498,7 +500,7 @@ public:
GetDialogContainer();
StarBASIC* GetBasic() const;
- // Interface Dok-Inhalte, Organizer
+ // Interface Document content, Organizer
#define INDEX_IGNORE USHRT_MAX
#define CONTENT_STYLE 0
@@ -510,36 +512,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 );
+ sal_uInt16 nIdx1
+ );
- virtual void TriggerHelpPI(
- sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16 nIdx3);
+ virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
- virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily );
-
- virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode );
+ virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily);
virtual sal_Bool Insert( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1,
@@ -564,22 +554,18 @@ public:
void ReadNote( INote * );
void UpdateNote( INote * );
- // F"ur Docs, die zum Formatieren die Viewgr"o\se
- // ben"otigen
+ // Documents, for which to format the view size
+
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 );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
GetModel() const;
- // Nur uebergangsweise fuer die Applikationen !!!
+ // Only temporarily for the applications!
void SetBaseModel( SfxBaseModel* pModel );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const;
- // Nur uebergangsweise fuer die Applikationen !!!
+ // Only temporarily for the applications!
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
@@ -588,6 +574,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 );
sal_Bool IsInPlaceActive();
sal_Bool IsUIActive();
@@ -611,7 +600,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
-//REMOVE void SetFileName( const ::rtl::OUString& );
SvGlobalName GetClassName() const;
// comphelper::IEmbeddedHelper
@@ -672,9 +660,7 @@ 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;
@@ -728,7 +714,7 @@ public:
SAL_DLLPRIVATE void ExecView_Impl(SfxRequest &);
SAL_DLLPRIVATE void StateView_Impl(SfxItemSet &);
- // Laden-speichern public internals
+ // Load/Save public internals
SAL_DLLPRIVATE sal_Bool ImportFromGeneratedStream_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
@@ -766,15 +752,12 @@ public:
SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False );
SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
-//#endif
};
#define SFX_GLOBAL_CLASSID \
0x9eaba5c3, 0xb232, 0x4309, \
0x84, 0x5f, 0x5f, 0x15, 0xea, 0x50, 0xd0, 0x74
-//#if 0 // _SOLAR__PRIVATE
-
struct ModifyBlocker_Impl
{
SfxObjectShell* pPersist;
@@ -791,7 +774,7 @@ public:
pPersist->EnableSetModified( bWasEnabled );
}
};
-//#endif
+
//--------------------------------------------------------------------
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
@@ -802,7 +785,6 @@ SV_DECL_LOCK(SfxObjectShell)
SV_IMPL_LOCK(SfxObjectShell)
SV_IMPL_REF(SfxObjectShell)
-//#if 0 // _SOLAR__PRIVATE
//--------------------------------------------------------------------
class AutoReloadTimer_Impl : public Timer
{
@@ -815,7 +797,6 @@ public:
SfxObjectShell* pSh );
virtual void Timeout();
};
-//#endif
//-------------------------------------------------------------------------
@@ -842,8 +823,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, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SfxObjectShell* GetObjectShell() const
{ return pObjSh; }
@@ -851,3 +832,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 0a0dea610ac5..1c7a63998c03 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 7887b12a761e..3c9f20a18632 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 26458b16f844..567320cfa58e 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.
@@ -56,6 +57,7 @@ private:
Edit maPasswordED;
FixedText maConfirmFT;
Edit maConfirmED;
+ FixedText maMinLengthFT;
FixedLine maPassword2Box;
FixedText maPassword2FT;
Edit maPassword2ED;
@@ -66,13 +68,19 @@ private:
CancelButton maCancelBtn;
HelpButton maHelpBtn;
- sal_uInt16 mnMinLen;
- sal_uInt16 mnExtras;
+ String maConfirmStr;
+ String maMinLenPwdStr;
+ String maEmptyPwdStr;
+ String maMainPwdStr;
+ sal_uInt16 mnMinLen;
+ sal_uInt16 mnExtras;
bool mbAsciiOnly;
DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
DECL_DLLPRIVATE_LINK( OKHdl, OKButton* );
+ void SetPasswdText();
+
public:
SfxPasswordDialog( Window* pParent, const String* pGroupText = NULL );
@@ -95,3 +103,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 53b2e87d5fa8..68315b772736 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 723fbcc02f9e..0b25dec5dc38 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 0b00fbb47ab9..48273cdea55c 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.
@@ -33,45 +34,15 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <sfx2/printer.hxx>
-//#include <sfx2/progress.hxx>
+
class SfxViewShell;
-//class SfxProgress;
struct SfxPrintProgress_Impl;
// ------------------------------------------------------------------------
-#define PAGE_MAX 9999 //max. Anzahl der Seiten die gedruckt werden
-
-//--------------------------------------------------------------------
-/*
-class SFX2_DLLPUBLIC SfxPrintProgress: public SfxProgress
-{
- SfxPrintProgress_Impl* pImp;
+#define PAGE_MAX 9999 // max. Number of pages to be printed
-private:
-//#if 0 // _SOLAR__PRIVATE
- DECL_DLLPRIVATE_LINK( PrintErrorNotify, void * );
- DECL_DLLPRIVATE_LINK( StartPrintNotify, void * );
- DECL_DLLPRIVATE_LINK( EndPrintNotify, void * );
-//#endif
-public:
- SfxPrintProgress( SfxViewShell* pViewSh,
- FASTBOOL bShow = sal_True );
- virtual ~SfxPrintProgress();
-
- virtual void SetText( const String &rText );
- sal_Bool SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 );
- virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
-
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter );
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter,
- sal_Bool bOldEnablePrintFile );
- void DeleteOnEndPrint();
- void SetCancelHdl( const Link& aCancelHdl );
- sal_Bool IsAborted() const;
-};
-*/
// ------------------------------------------------------------------------
struct SfxPrintOptDlg_Impl;
@@ -102,3 +73,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 6f21f6ed92f8..f8bd9e7ffb9d 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/qswin32.h b/sfx2/inc/sfx2/qswin32.h
index a7d82975b0b2..30045ddadcb0 100644
--- a/sfx2/inc/sfx2/qswin32.h
+++ b/sfx2/inc/sfx2/qswin32.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.
@@ -44,6 +45,7 @@
# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA
# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA
# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA
-#endif
#endif /* _QSWIN32_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index 97764317522e..28a0460a4b5b 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 26a87fa31c3d..d7c993b94148 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:
@@ -105,7 +104,7 @@ public:
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
sal_uInt16 GetCallMode() const;
- bool IsRecording() const;
+ bool IsRecording() const;
void AllowRecording( sal_Bool );
sal_Bool AllowsRecording() const;
sal_Bool IsAPI() const;
@@ -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 4c47533f4e4a..255e4298fd17 100644
--- 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.
@@ -33,7 +34,6 @@
#include <memory>
-//////////////////////////////////////////////////////////////////////
struct SfxSecurityPage_Impl;
@@ -52,7 +52,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
};
-//////////////////////////////////////////////////////////////////////
#endif // #ifndef _SECURITYPAGE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index dfa3cc8593ec..e09af8141332 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -69,7 +69,7 @@
#define EVENT_SGA_START EVENT_OBJ3_START
#define EVENT_SVX_START EVENT_OBJ4_START
-// Achtung: die folgenden sind gleichzeitig SID_ON_...
+// Warning: the following are simultaneously SID_ON_ ...
#define SFX_EVENT_STARTAPP (EVENT_SFX_START)
#define SFX_EVENT_CLOSEAPP (EVENT_SFX_START + 1)
#define SFX_EVENT_CREATEDOC (EVENT_SFX_START + 2)
@@ -111,7 +111,7 @@
#define SFX_EVENT_TITLECHANGED (EVENT_SFX_START + 30)
#define SFX_EVENT_MODECHANGED (EVENT_SFX_START + 31)
-// Events f"ur Controls etc.
+// Events for Controls etc.
#define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 )
#define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 )
#define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 )
@@ -165,7 +165,7 @@
#define SFX_OBJECTBAR_NAVIGATION 12
#define SFX_OBJECTBAR_MAX 13
-// temp. wg. Kompatibilitaet
+// temporary due to compatibility
#define SFX_OBJECTBAR_IDE 2
#define SFX_OBJECTBAR_FRAME 3
@@ -183,9 +183,7 @@
#define RID_DEFAULTIMAGELIST_LC (RID_SFX_START+17)
#define RID_DEFAULTIMAGELIST_LM (RID_SFX_START+18)
#define RID_STYLEDLG (RID_SFX_START+28)
-#define RID_DEFAULTIMAGELIST_SCH (RID_SFX_START+35)
#define RID_DEFAULTIMAGELIST_SMH (RID_SFX_START+36)
-#define RID_DEFAULTIMAGELIST_LCH (RID_SFX_START+37)
#define RID_DEFAULTIMAGELIST_LMH (RID_SFX_START+38)
#define RID_IMAGELIST_SCH (RID_SFX_START+39)
#define RID_IMAGELIST_SMH (RID_SFX_START+40)
@@ -202,7 +200,6 @@
#define RID_DEFAULTINTRO (RID_SFX_START+0)
#define RID_DEFAULTINTRO_ADABAS (RID_SFX_START+1)
#define RID_DEFAULTINTRO_PORTAL (RID_SFX_START+2)
-#define RID_DEFAULT_ABOUT_BMP_LOGO (RID_SFX_START+3)
#define RID_STYLECATALOG (RID_SFX_START+1201)
@@ -222,16 +219,15 @@
#define TP_MANAGE_STYLES (RID_SFX_START+7)
#define DLG_STYLE_DESIGNER (RID_SFX_START+8)
-#define RID_SFX_PROTECT_RECORDS (RID_SFX_START+216)
-#define RID_SFX_UNPROTECT_RECORDS (RID_SFX_START+217)
-#define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+218)
+#define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216)
#define STR_STYLE_FILTER_AUTO (RID_SFX_START+9)
#define STR_STYLE_FILTER_USED (RID_SFX_START+10)
#define STR_STYLE_FILTER_USERDEF (RID_SFX_START+11)
#define STR_STYLE_FILTER_ALL (RID_SFX_START+12)
-// +13 schon benutzt!
+// +13 already used!
#define STR_STYLE_FILTER_HIERARCHICAL (RID_SFX_START+1200)
+#define STR_STYLE_ELEMTLIST (RID_SFX_START+1202)
#define STR_NONAME (RID_SFX_START+100)
#define STR_NONE (RID_SFX_START+101)
@@ -291,6 +287,7 @@
#define GID_MODIFY (RID_GROUPS_SFXOFFSET+23)
#define GID_DRAWING (RID_GROUPS_SFXOFFSET+24)
#define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25)
+#define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26)
// compatibility-#defines
#define GID_FORMEL GID_MATH
@@ -355,8 +352,10 @@
#define MID_DOCINFO_ENCRYPTED 0x2c
#define MID_DOCINFO_STATISTIC 0x33
#define MID_DOCINFO_CHARLOCALE 0x34
-
-#define MID_LAST_USED_PROPID MID_DOCINFO_CHARLOCALE
+#define MID_CATEGORY 0x35
+#define MID_COMPANY 0x36
+#define MID_MANAGER 0x37
+#define MID_LAST_USED_PROPID MID_MANAGER
// Config-Ids -----------------------------------------------------------
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 4cc7d0321da3..cd0f1e8ce50d 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.
@@ -384,7 +385,6 @@ public:
virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-//#if 0 // _SOLAR__PRIVATE
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
SfxViewShell* GetViewShell_Impl() const;
@@ -393,7 +393,6 @@ public:
SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
-//#endif
private:
enum ConnectSfxFrame
{
@@ -415,3 +414,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 017486d251de..167618a792c3 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.
@@ -87,7 +88,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/script/XStarBasicAccess.hpp>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/link.hxx>
@@ -1513,6 +1514,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
//________________________________________________________________________________________________________
@@ -1619,12 +1621,12 @@ public:
};
SfxModelGuard( SfxBaseModel& i_rModel, const AllowedModelState i_eState = E_FULLY_ALIVE )
- :m_aGuard( Application::GetSolarMutex() )
+ : m_aGuard()
{
i_rModel.MethodEntryCheck( i_eState != E_INITIALIZING );
}
SfxModelGuard( SfxModelSubComponent& i_rSubComponent )
- :m_aGuard( Application::GetSolarMutex() )
+ :m_aGuard()
{
i_rSubComponent.MethodEntryCheck();
}
@@ -1643,9 +1645,11 @@ public:
}
private:
- ::osl::ResettableGuard< ::vos::IMutex > m_aGuard;
+ SolarMutexResettableGuard m_aGuard;
};
#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 55a521e3951c..30536360c3f0 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.
@@ -28,12 +29,13 @@
#ifndef _SFXDEFS_HXX
#define _SFXDEFS_HXX
-#define MESSAGEFILE_SDM_EXT "sdm" // Extension des neuen Formats
-#define MESSAGEFILE_EXT "smd" // Extension der Single-Mail/News-Files
-#define MESSAGETEMPFILE_EXT "sd~" // Extension f"ur Mail/News-TempFiles
+#define MESSAGEFILE_SDM_EXT "sdm" // Extension for the new Formats
+#define MESSAGEFILE_EXT "smd" // Extension for Single-Mail/News-Files
+#define MESSAGETEMPFILE_EXT "sd~" // Extension for Mail/News-TempFiles
#define SfxFilterFlags sal_uLong
#define PRODUCT_VERSION "5.0"
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index eefa614d9630..5bc6812082bd 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.
@@ -53,8 +54,6 @@ class TransferableDataHelper;
struct TransferableObjectDescriptor;
#include <sfx2/tabdlg.hxx>
-//typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-//typedef sal_uInt16* (*GetTabPageRanges)();
namespace sfx2
{
@@ -158,3 +157,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 98b31872ce68..8c11031ff8e9 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 a2d0e4162ba6..9a03eb3afacb 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.
@@ -47,9 +48,9 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
String aScriptType;
SfxMedium* pMedium;
- SfxMedium *pDLMedium; // Medium fuer Download von Files
+ SfxMedium *pDLMedium; // Medium for Download Files
- sal_uInt16 nMetaTags; // Anzahl der bisher gelesenen Meta-Tags
+ sal_uInt16 nMetaTags; // Number of previously read Meta-Tags
ScriptType eScriptType;
SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* );
@@ -61,9 +62,9 @@ protected:
virtual ~SfxHTMLParser();
public:
- // Lesen der Optionen einer Image-Map
- // <MAP>: sal_True = Image-Map hat einen Namen
- // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr
+ // Read the options of an image map
+ // <MAP>: sal_True = Image-Map has a name
+ // <AREA>: sal_True = Image-Map has now one Region more
static sal_Bool ParseMapOptions(ImageMap * pImageMap,
const HTMLOptions * pOptions );
sal_Bool ParseMapOptions(ImageMap * pImageMap)
@@ -82,41 +83,31 @@ public:
const String& aNumStr, SvNumberFormatter& rFormatter );
protected:
-
- // Start eines File-Downloads. Dieser erfolgt synchron oder asynchron.
- // Im synchronen Fall befindet sich der Parser nach dem Aufruf im
- // Working-Zustand. Die gelesene Datei kann dann direkt mit
- // FinishFileDownload abgeholt werden.
- // Im asynchronen Fall befindet sich der Parser nach dem Aufruf im
- // Pending-Zustand. Der Parser muss dann ueber das Continue verlassen
- // werden (ohne Reschedule!). Wenn die Datei geladen ist, wird
- // ein Continue mit dem uebergebenen Token aufgerufen. Die Datei kann
- // dann wiederum mit FinishFileDownload abgeholt werden.
- // Zum Abbrechen des Dwonloads sollte eine Shell uebergeben werden.
- // Es kann nur ein einziger Download gleichzeitig existieren. Fuer jeden
- // gestarteten Download muss FinshFileDownload aufgerufen werden.
+ // Start a file download. This is done asynchronously or synchronously.
+ // In the synchronous case, the parser is in the the working state after
+ // it has been called. The read file can then be picked up directly with
+ // FinishFileDownload. In the asynchronous case, the parser is in the
+ // pending state after it hs been called. The parser then has to leave
+ // over the Continue (without Reschedule!). If the file is loaded,
+ // a Continue is called with passed on token. The file can then be picked
+ // up by FinishFileDownload. To cancel the download should a shell be
+ // left. It can only exist a single download at the same time, For every
+ // started download FinshFileDownload must be called.
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.
-
- sal_Bool GetFileDownloadMIME( String& rMime );
-
- // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn
- // der Download geklappt hat. Das gelesene File befindet sich dann in
- // dem uebergeben String.
+ // End of an asynchronous file download. Returns TRUE if the download
+ // was successful. The read file is then passed into String.
sal_Bool FinishFileDownload( String& rStr );
- // Gibt sal_True zurueck, wenn ein File downloaded wurde und
- // FileDownloadFinished noch nicht gerufen wurde.
+ // Returns TRUE if a file was downloaded and if FileDownloadFinished
+ // has not yet been called
sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; }
SfxMedium *GetMedium() { return pMedium; }
const SfxMedium *GetMedium() const { return pMedium; }
- // Default (auch ohne Iterator) ist JavaScript
+ // Default (without iterator) is JavaScript
ScriptType GetScriptType( SvKeyValueIterator* ) const;
const String& GetScriptTypeString( SvKeyValueIterator* ) const;
};
@@ -131,3 +122,5 @@ inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const Stri
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index 416358cb60e2..37e6582b697d 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 6c67fbbf7dcc..320d18bf0f03 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 17d47097fb46..594c2691d894 100644..100755
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -65,7 +65,7 @@
#define SID_SETUPPRINTER (SID_SFX_START + 302)
#define SID_EXITANDRETURN (SID_SFX_START + 303)
-// SID_TITLE steht unter diesem Wert in chaos/cntids.hrc!!
+// SID_TITLE, this value below is given in chaos/cntids.hrc!!
//#define SID_TITLE (SID_SFX_START + 307)
#define SID_CONTEXT (SID_SFX_START + 310)
@@ -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)
@@ -107,7 +108,7 @@
#define SID_PROGFILENAME (SID_SFX_START + 342)
#define SID_SELECTION (SID_SFX_START + 346)
-// 360-400 siehe SID_MAIL_...
+// 360-400 see SID_MAIL_...
// default-ids for help
#define SID_HELPONHELP (SID_SFX_START + 400)
@@ -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
@@ -184,7 +186,7 @@
#define SID_BROWSER (SID_SFX_START + 1318)
#define SID_MACROEXECMODE (SID_SFX_START + 1319)
-// die Id steht mit diesem Wert in chaos/cntids.hrc!!
+// The Id value is given in chaos/cntids.hrc!!
//#define SID_INTERNET_ONLINE (SID_SFX_START + 1370)
#define SID_FILTER_DATA (SID_SFX_START + 1375)
@@ -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)
@@ -377,7 +380,7 @@
#define SID_JSCALL (SID_SFX_START + 1382)
#define SID_AUTOPILOTMENU (SID_SFX_START + 1381)
-// Floating Window Vorlagen
+// Floating Window Template
#define SID_STYLE_DESIGNER (SID_SFX_START + 539)
// Organizer
@@ -497,7 +500,7 @@
#define SID_COPY (SID_SFX_START + 711)
#define SID_PASTE (SID_SFX_START + 712)
-// steht unter diesem Wert in chaos/cntids.hrc!!!
+// Value below given in chaos/cntids.hrc!!!
//#define SID_DELETE (SID_SFX_START + 713)
#define SID_BACKSPACE (SID_SFX_START + 714)
@@ -580,7 +583,7 @@
#define SID_AUTOHIDE (SID_SFX_START + 932)
#define SID_TOGGLENAVBAR (SID_SFX_START + 1603)
-// Item-Id f"ur die Ereigniszuweisen-Tabpage
+// Item-Id for the assinged event Tabpage
#define SID_ATTR_MACROITEM (SID_SFX_START + 934)
#define SID_SAVECONFIG (SID_SFX_START + 930)
@@ -748,6 +751,7 @@
#define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74)
#define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87)
#define SID_ATTR_ALLOWFOLDERWEBVIEW (SID_OPTIONS_START + 92)
+#define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88)
// PathTabPage
@@ -826,7 +830,7 @@
#define SID_SAVEREL_INET (SID_OPTIONS_START + 30)
#define SID_SAVEREL_FSYS (SID_OPTIONS_START + 31)
-// Automatisches update von Styles - Verwalten-TabPage
+// Automatic update of Styles - manage TabPage
#define SID_ATTR_AUTO_STYLE_UPDATE (SID_OPTIONS_START + 65)
#define SID_SECURE_URL (SID_OPTIONS_START + 66)
@@ -860,7 +864,6 @@
#define SID_ZOOM (SID_SVX_START + 289)
#define SID_SEARCH_ITEM (SID_SVX_START + 291)
#define SID_ATTR_CHAR_FONTWIDTH (SID_SVX_START + 303)
-#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
#define SID_NAVIGATOR (SID_SVX_START + 366)
@@ -884,7 +887,7 @@
#define FID_SVX_START (SID_LIB_START + 500)
#define FID_SEARCH_NOW (FID_SVX_START + 2)
-// SlotIds f"ur Basic -------------------------------------------------------
+// SlotIds for Basic -------------------------------------------------------
#define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 )
#define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 )
#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
@@ -935,7 +938,7 @@
#define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 )
#define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 )
-// SlotIds f"ur Apps --------------------------------------------------------
+// SlotIds for Apps --------------------------------------------------------
#define FN_PARAM (SID_SW_START + 1100)
#define FN_PARAM_1 (FN_PARAM+60)
#define FN_PARAM_2 (FN_PARAM+61)
@@ -945,7 +948,7 @@
#define FN_PARAM_6 (FN_PARAM+65)
#define FN_PARAM_7 (FN_PARAM+66)
#define FN_PARAM_8 (FN_PARAM+67)
-#define FN_FAX (SID_SW_START + 28) /* Faxen */
+#define FN_FAX (SID_SW_START + 28) /* Fax */
#define SID_KEYFUNC_START (SID_SC_START + 521)
#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0)
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 02fa61b17f45..c8b709e2aeb5 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 691716b70571..d0fc3601b593 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 40c2a7fc42fc..1b933a90778f 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.
@@ -35,7 +36,6 @@
#include <tools/rtti.hxx>
#include <svl/brdcst.hxx>
-#include <tools/ownlist.hxx>
#include <tools/unqid.hxx>
#include <tools/string.hxx>
@@ -79,11 +79,10 @@ namespace svl
enum SfxInterfaceId
-/* [Beschreibung]
+/* [Description]
- Id f"ur die <SfxInterface>s, damit wird "uber ein Array an der
- <SfxApplication> ein quasi-statischer Zugriff auf die Interfaces
- erlaubt.
+ Id for <SfxInterface>s, gives a quasi-static access to the interface
+ through an array to <SfxApplication>.
*/
{
@@ -130,7 +129,7 @@ enum SfxInterfaceId
SFX_INTERFACE_SBA_END = 399,
SFX_INTERFACE_IDE_START = 400,
SFX_INTERFACE_IDE_END = 409,
- //-falls die noch einer braucht
+ //-if one is still needed
SFX_INTERFACE_APP = SFX_INTERFACE_SW_START,
SFX_INTERFACE_LIB = 450
};
@@ -145,20 +144,19 @@ typedef void (*SfxStateFunc)(SfxShell *, SfxItemSet &rSet);
class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
-/* [Beschreibung]
+/* [Description]
- Die Klasse SfxShell ist Basisklasse f"ur alle Schichten, die
- Funktionalit"at Form von <Slot>s bereitstellen wollen.
-
- Jede Instanz hat einen Verweis auf eine Interface-Beschreibung, der
- mit <SfxShell::GetInterface()const> erh"altlich ist. Dieses Interface
- stellt die Verbindung zu konkreten Methoden her und enth"alt einige
- weitere beschreibende Daten f"ur Controller wie Menus und Toolboxen, aber
- auch f"ur die diversen APIs. Der Hautpteil der Interface-Beschreibung
- liegt in Form einer <Type-Library> vor, die mit dem <SVIDL-Compiler>
- aus einem IDL-File generiert wird. F"ur jede SfxShell-Subclass ist ein
- solches IDL-File zu schreiben.
+ The class SfxShell is the base class for all classes, which provide
+ the functionality of the form <Slot>s.
+ Each instance has a reference to an interface description, which is
+ obtainable through <SfxShell::GetInterface()const>. This interface
+ provides the connection to specific methods and contains some other
+ descriptive data for controllers like menus and toolboxes, but also
+ for the various APIs. The main part of the interface description is in
+ the form of a <Type-Library>, which is generated from an IDL-file by
+ the <SVIDL-Compiler>. For each SfxShell Subclass-File there is one
+ such IDL-file to write.
*/
{
@@ -169,8 +167,8 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
::svl::IUndoManager* pUndoMgr;
private:
- SfxShell( const SfxShell & ); // n.i.
- SfxShell& operator = ( const SfxShell & ); // n.i.
+ SfxShell( const SfxShell & ); // internal
+ SfxShell& operator = ( const SfxShell & ); // internal
protected:
SfxShell();
@@ -259,7 +257,7 @@ public:
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
#ifndef _SFXSH_HXX
- SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
+ SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
#endif
@@ -268,15 +266,15 @@ public:
//--------------------------------------------------------------------
SfxItemPool& SfxShell::GetPool() const
/*
- [Beschreibung]
+ [Description]
- Jede Subclass von SfxShell mu"s einen Pool referenzieren. Dieser
- wird teilweise von SFx-eigenen Subklassen gesetzt (z.B. <SfxViewShell>),
- mu"s aber insbesondere bei direkt von SfxShell abgeleiteten Klassen
- und bei Ableitungen von SfxObjectShell selbst gesetzt werden.
+ Each Subclass of SfxShell must reference a pool. This is partly set by
+ SFx's own set of subclasses (eg <SfxViewShell>). In particular however
+ this must be set directly from one derived SfxShell class and ny
+ derivatives of SfxObjectShell.
- Die Klasse SfxShell selbst hat noch keinen SfxItemPool, es wird
- daher ein 0-Pointer zur"uckgeliefert.
+ The SfxShell class itself does not have any SfxItemPool, therfore a
+ null-pointer is returned.
*/
{
@@ -286,17 +284,16 @@ SfxItemPool& SfxShell::GetPool() const
//-------------------------------------------------------------------
inline void SfxShell::SetPool
(
- SfxItemPool* pNewPool // Pointer auf den neuen Pool oder 0
+ SfxItemPool* pNewPool // Pointer to the new Pool or null
)
-/* [Beschreibung]
+/* [Description]
- Mit dieser Methode melden die Subklassen ihren speziellen <SfxItemPool>
- an der SfxShell an. Jede SfxShell Instanz mu\s Zugriff auf einen
- SfxItemPool haben. In der Regel ist dies der SfxItemPool der
- SfxDocumentShell. Die SfxShell Subklasse "ubernimmt nicht die
- Eigent"umerschaft "uber den "ubergebenen Pool. Bevor er gel"oscht
- wirde, mu\s er mit SetPool(0) abgemeldet werden.
+ With this method, the subclasses register their special <SfxItemPool>
+ in the SfxShell. Each SfxShell instance must have access to a SfxItemPool.
+ Usually this is the SfxItemPool of the SfxDocumentShell. The SfxShell
+ subclass does not take ownership of the orphaned pool. Before it is
+ deleted it has to be deregisted with SetPool(0).
*/
{
@@ -305,12 +302,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; \
@@ -327,7 +324,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 ) \
{ \
@@ -356,11 +353,11 @@ inline void SfxShell::SetPool
#define SFX_POSITION_MASK 0x000F
#define SFX_VISIBILITY_MASK 0xFFF0
-#define SFX_VISIBILITY_UNVISIBLE 0x0000 // nie sichtbar
+#define SFX_VISIBILITY_UNVISIBLE 0x0000 // Never visible
#define SFX_VISIBILITY_PLUGSERVER 0x0010
#define SFX_VISIBILITY_PLUGCLIENT 0x0020
#define SFX_VISIBILITY_VIEWER 0x0040
- // noch 1 sind frei!
+ // One is still free!
#define SFX_VISIBILITY_RECORDING 0x0200
#define SFX_VISIBILITY_READONLYDOC 0x0400
#define SFX_VISIBILITY_DESKTOP 0x0800
@@ -368,7 +365,7 @@ inline void SfxShell::SetPool
#define SFX_VISIBILITY_FULLSCREEN 0x2000
#define SFX_VISIBILITY_CLIENT 0x4000
#define SFX_VISIBILITY_SERVER 0x8000
-#define SFX_VISIBILITY_NOCONTEXT 0xFFFF // immer sichtbar
+#define SFX_VISIBILITY_NOCONTEXT 0xFFFF // Always visable
#define SFX_OBJECTBAR_REGISTRATION(nPos,rResId) \
GetStaticInterface()->RegisterObjectBar( nPos, rResId )
@@ -396,3 +393,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 bea01c6e283a..a7e68013d499 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 f3bb30eaea5f..8be28db84d92 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(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
#define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \
- SfxStatusBarControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \
+ SfxStatusBarControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \
{ return new Class( nSlotId, nId, rStb ); } \
void Class::RegisterControl(sal_uInt16 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 5bb473906dbd..dd79ff6556f8 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -1,3 +1,4 @@
+/* -*- 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,28 +31,17 @@
#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;
sal_uInt16 nFlags;
};
-
-DECLARE_LIST(SfxStyleFilter, SfxFilterTupel*)
-#else
-typedef List SfxStyleFilter;
-#endif
+typedef ::std::vector< SfxFilterTupel* > SfxStyleFilter;
// CLASS -----------------------------------------------------------------
@@ -80,11 +70,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 +84,11 @@ public:
SfxStyleFamilies( ) {};
~SfxStyleFamilies();
- sal_uInt16 Count() const
- { return (sal_uInt16)aEntryList.Count(); }
+ size_t size() const
+ { return aEntryList.size(); }
- const SfxStyleFamilyItem* GetObject(sal_uIntPtr 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 +100,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 10c4b28381a6..4d121edf0e24 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 6ea55ed96067..fc240fc2f2eb 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.
@@ -57,7 +58,7 @@ class SfxBindings;
#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/
typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
class SfxUs_Impl;
@@ -110,7 +111,6 @@ friend class SfxTabDialogController;
sal_Bool bItemsReset;
sal_Bool bFmt;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( OkHdl, Button * );
@@ -119,13 +119,12 @@ friend class SfxTabDialogController;
DECL_DLLPRIVATE_LINK( UserHdl, Button * );
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
-//#endif
protected:
virtual short Ok();
- // wird im Sfx gel"oscht!
+ // Is deleted in Sfx!
virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
- // wird *nicht* im Sfx gel"oscht!
+ // Is not deleted in Sfx!
virtual const SfxItemSet* GetRefreshedSet();
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
virtual long Notify( NotifyEvent& rNEvt );
@@ -153,18 +152,18 @@ public:
void AddTabPage( sal_uInt16 nId,
CreateTabPage pCreateFunc, // != 0
- GetTabPageRanges pRangesFunc, // darf 0 sein
+ GetTabPageRanges pRangesFunc, // can be 0
sal_Bool bItemsOnDemand = sal_False);
void AddTabPage( sal_uInt16 nId,
const String &rRiderText,
CreateTabPage pCreateFunc, // != 0
- GetTabPageRanges pRangesFunc, // darf 0 sein
+ GetTabPageRanges pRangesFunc, // can be 0
sal_Bool bItemsOnDemand = sal_False,
sal_uInt16 nPos = TAB_APPEND);
void AddTabPage( sal_uInt16 nId,
const Bitmap &rRiderBitmap,
CreateTabPage pCreateFunc, // != 0
- GetTabPageRanges pRangesFunc, // darf 0 sein
+ GetTabPageRanges pRangesFunc, // can be 0
sal_Bool bItemsOnDemand = sal_False,
sal_uInt16 nPos = TAB_APPEND);
@@ -186,7 +185,7 @@ public:
{ return aTabCtrl.GetCurPageId(); }
void ShowPage( sal_uInt16 nId );
- // liefert ggf. per Map konvertierte lokale Slots
+ // may provide local slots converted by Map
const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
@@ -226,10 +225,8 @@ public:
void SetApplyHandler(const Link& _rHdl);
Link GetApplyHandler() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Start_Impl();
SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
-//#endif
};
END_NAMESPACE_LAYOUT_SFX_TABDIALOG
@@ -287,12 +284,11 @@ public:
{ bHasExchangeSupport = bNew; }
enum sfxpg {
- KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln
- // 2. F"ullen eines ItemSets f"ur die Aktualilsierung
- // "ubergeordneter Beispiele; dieser Pointer kann immer
- // NULL sein!!
+ KEEP_PAGE = 0x0000, // Error handling; page does not change
+ // 2. Fill an itemset for update
+ // parent examples, this pointer can be NULL all the time!
LEAVE_PAGE = 0x0001,
- // Set aktualisieren und andere Page aktualisieren
+ // Set, refresh and update other Page
REFRESH_SET = 0x0002
};
@@ -305,7 +301,7 @@ public:
String GetUserData() { return aUserString; }
virtual void FillUserData();
virtual sal_Bool IsReadOnly() const;
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -316,3 +312,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx
index 54783b6df455..f80b66c4d0ee 100644
--- a/sfx2/inc/sfx2/taskpane.hxx
+++ b/sfx2/inc/sfx2/taskpane.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -243,3 +244,5 @@ namespace sfx2
//......................................................................................................................
#endif // SFX_TASKPANE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index f8bfa0f00b37..cef2730687d5 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)( sal_uInt16 nId, ToolBox &rTbx, SfxBindings & );
typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
struct SfxTbxCtrlFactory
@@ -110,9 +104,9 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
//------------------------------------------------------------------
-/* FloatingWindows, die aus ToolBoxen abgerissen werden k"onnen, sollten
- dieser Klasse abgeleitet werden. Da sie ebenfalls von SfxControllerItem
- abgeleitet ist, erhalten ihre Instanzen auch die StateChanged Aufrufe.
+/* Floating windows that can be torn from tool boxes should be derived from
+ this class. Since it is also derived from SfxControllerItem, its instances
+ will also receive the StateChanged calls.
*/
class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface
@@ -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();
@@ -187,20 +178,18 @@ public:
};
//------------------------------------------------------------------
-//------------------------------------------------------------------
#define SFX_DECL_TOOLBOX_CONTROL() \
static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \
static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
-/* F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder
- aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass
- eine Subclass von SfxTooBoxControl implementiert werden.
+/* For special ToolBox controls, such as a font selection box or toolbox
+ tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
+ has to be implemented.
- Diese Klasse mu"s in SfxApplication::Init() mit der statischen Methode
- RegisterControl() registriert werden. Der SFx erzeugt dann automatisch
- diese Controls in ToolBoxen, wenn die dazugeh"origen Slots von dem
- angegebenen Typ sind.
+ This class has to be registered in SfxApplication:Init() with the static
+ control method RegisterControl(). The SFx then automatically creates these
+ controls in the toolbox, if the associated slots are of the specific type.
*/
struct SfxToolBoxControl_Impl;
@@ -307,14 +296,14 @@ public:
};
#define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx ); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
#define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
- SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
+ SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
{ return new Class( nSlotId, nId, rTbx, Arg); } \
void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
{ SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
@@ -322,7 +311,6 @@ public:
//=========================================================================
-//#if 0 // _SOLAR__PRIVATE
class SfxDragButton_Impl : public FixedImage
{
@@ -335,10 +323,6 @@ public:
};
class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
-/* [Beschreibung]
-
-*/
-
{
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -352,10 +336,10 @@ public:
class SfxAppToolBoxControl_Impl : public SfxToolBoxControl
-/* [Beschreibung]
+/* [Description]
- Interne Hilfsklasse f"ur um das Popup-Menu <AppMenu_Impl> unter Neu
- im SDT zu starten.
+ Internal helper class for the pop-up menu <AppMenu_Impl> under new
+ start in the SDT.
*/
{
@@ -380,13 +364,12 @@ protected:
virtual void Select( sal_Bool );
virtual void StateChanged( sal_uInt16 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;
sal_Bool bBigImages;
PopupMenu* pMenu;
sal_uIntPtr m_nSymbolsStyle;
- sal_Bool m_bWasHiContrastMode;
sal_Bool m_bShowMenuImages;
};
@@ -430,7 +413,6 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
{
sal_Bool bBigImages;
PopupMenu* pMenu;
- sal_Bool m_bWasHiContrastMode;
sal_Bool m_bShowMenuImages;
protected:
@@ -438,7 +420,7 @@ protected:
using SfxToolBoxControl::Select;
virtual void Select( sal_Bool );
virtual void StateChanged( sal_uInt16 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( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
@@ -447,6 +429,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 b663a277065f..e235e760698c 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/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
index cee9709841a5..8b03be062387 100644
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -170,3 +171,5 @@ namespace sfx2
//......................................................................................................................
#endif // SFX_TITLEDOCKWIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx
index 5b2cbd1dfaf9..c8c9765be13c 100644
--- a/sfx2/inc/sfx2/tplpitem.hxx
+++ b/sfx2/inc/sfx2/tplpitem.hxx
@@ -1,3 +1,4 @@
+/* -*- 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,8 +50,10 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
virtual sal_uInt8 GetFlagCount() const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index f30a544922b5..d1fcf169046b 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 16504af6331e..4f7311125bd3 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/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index f3376e733702..da4d7902c30a 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -1,3 +1,4 @@
+/* -*- 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 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index ef5d4a358e22..3c3f1472be8d 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.
@@ -195,7 +196,6 @@ public:
sal_Bool IsInModalMode() const;
void Resize(sal_Bool bForce=sal_False);
- //void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible );
void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
void ToggleChildWindow(sal_uInt16);
sal_Bool HasChildWindow(sal_uInt16);
@@ -205,7 +205,6 @@ public:
void ChildWindowExecute(SfxRequest&);
void ChildWindowState(SfxItemSet&);
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetDowning_Impl();
SAL_DLLPRIVATE void GetDocNumber_Impl();
SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const;
@@ -249,7 +248,6 @@ public:
SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID );
SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
-//#endif
private:
SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False );
SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
@@ -343,8 +341,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, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 6e613cce0176..c904e8d1d28e 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.
@@ -43,6 +44,8 @@
#include <tools/gen.hxx>
#include <tools/errcode.hxx>
#include <vcl/jobset.hxx>
+#include <vector>
+
class SfxBaseController;
class Size;
class Fraction;
@@ -68,7 +71,7 @@ class Dialog;
class Menu;
class NotifyEvent;
-#define SFX_PRINTER_PRINTER 1 // ohne JOBSETUP => temporaer
+#define SFX_PRINTER_PRINTER 1 // without JOB SETUP => Temporary
#define SFX_PRINTER_JOBSETUP 2
#define SFX_PRINTER_OPTIONS 4
#define SFX_PRINTER_CHG_ORIENTATION 8
@@ -89,7 +92,7 @@ enum SfxScrollingMode
SCROLLING_DEFAULT
};
-// "Geeicht" mit www.apple.com und Netscape 3.01
+// "Verified" using www.apple.com and Netscape 3.01
#define DEFAULT_MARGIN_WIDTH 8
#define DEFAULT_MARGIN_HEIGHT 12
@@ -97,19 +100,19 @@ enum SfxScrollingMode
// @[SfxViewShell-Flags]
-#define SFX_VIEW_HAS_PRINTOPTIONS 0x0010 /* Options-Button und Options-
- Dialog im PrintDialog */
-#define SFX_VIEW_CAN_PRINT 0x0020 /* enabled Printing ohne Printer
- erzeugen zu m"ussen */
-#define SFX_VIEW_NO_SHOW 0x0040 /* Window der ViewShell darf nicht
- automatisch geshowed werden */
-#define SFX_VIEW_NO_NEWWINDOW 0x0100 /* keine weitere View erlauben */
+#define SFX_VIEW_HAS_PRINTOPTIONS 0x0010 /* Options-Button and Options-
+ Dialog in PrintDialog */
+#define SFX_VIEW_CAN_PRINT 0x0020 /* Printing enabled without having
+ to create a Printer */
+#define SFX_VIEW_NO_SHOW 0x0040 /* Window of the ViewShell shall
+ not be showed automatically */
+#define SFX_VIEW_NO_NEWWINDOW 0x0100 /* Allow N View */
-/* [Beschreibung]
+/* [Description]
- Die SfxViewShell-Flags steuern das Verhalten der SfxViewShell f"ur die
- Dauer ihrer Lebenszeit. Sie werden im Konstruktor der <SfxViewShell>
- angegeben.
+ The SfxViewShell flags control the behavior of SfxViewShell for the
+ duration of its lifetime. They are defined in the constructor of
+ <SfxViewShell>.
*/
//=========================================================================
@@ -125,7 +128,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( sal_uInt16 nPrio ) \
{ \
@@ -141,7 +144,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
@@ -183,7 +186,7 @@ public:
static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
- // Ctoren/Dtoren Initialisierung
+ // Initialize Constructors/Destructors
TYPEINFO();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
@@ -205,7 +208,7 @@ public:
virtual void JumpToMark( const String& rMark );
void VisAreaChanged(const Rectangle& rRect);
- // Verhaltens-Flags
+ // Behavior Flags
SfxScrollingMode GetScrollingMode() const;
void SetScrollingMode( SfxScrollingMode eMode );
@@ -224,8 +227,8 @@ public:
// Focus, KeyInput, Cursor
void GotFocus() const;
inline void LostFocus() const;
- virtual void ShowCursor( FASTBOOL bOn = sal_True );
- virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent );
+ virtual void ShowCursor( bool bOn = true );
+ virtual bool KeyInput( const KeyEvent &rKeyEvent );
sal_Bool Escape();
// Viewing Interface
@@ -247,7 +250,7 @@ public:
virtual JobSetup GetJobSetup() const;
Printer* GetActivePrinter() const;
- // Workingset
+ // Working set
virtual void WriteUserData( String&, sal_Bool bBrowse = sal_False );
virtual void ReadUserData( const String&, sal_Bool bBrowse = sal_False );
virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
@@ -299,9 +302,8 @@ public:
SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
- { GetIPClientList_Impl(sal_True)->Insert(pIPClient); }
- SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient )
- { GetIPClientList_Impl(sal_True)->Remove(pIPClient); }
+ { GetIPClientList_Impl(sal_True)->push_back(pIPClient); }
+ SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient );
SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const;
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
SAL_DLLPRIVATE void DiscardClients_Impl();
@@ -336,19 +338,18 @@ public:
inline void SfxViewShell::LostFocus() const
-/* [Beschreibung]
-
- Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn
- das Edit-Window den Focus verloren hat. Der SFx hat so z.B. die
- M"oglichkeit, den Accelerator auszuschalten, damit in bestimmten
- Floating-Windows die Cursor-Tasten, die Delete-Taste etc. funktionieren,
- obwohl sie "uber den Accelerator umdefiniert sind.
+/* [Description]
+ This method has to be called by the application developer, if the edit
+ window has lost the focus. The SFx has for example the ability to turn off
+ the accelerator, so that the cursor keys, the Delete button, etc. work in
+ certain Floating-Windows, even though they are redefined by the
+ Accelerator.
- [Anmerkung]
+ [Note]
- <StarView> liefert leider keine M"oglichkeit, solche Events
- 'von der Seite' einzuh"angen.
+ <StarView> unfortunatly does not provide the possibility to define
+ such events 'from the side'.
*/
{
@@ -358,16 +359,14 @@ inline void SfxViewShell::LostFocus() const
inline SfxViewFrame* SfxViewShell::GetViewFrame() const
-/* [Bechreibung]
+/* [Description]
- Diese Methode liefert einen Pointer auf die <SfxViewFrame>-Instanz,
- in der diese SfxViewShell dargestellt wird. Dieses ist die Instanz,
- die imKonstruktor durchgereicht wurde. Es ist gew"ahrleistet, da\s
- der zur"uckgegebene Pointer auf eine g"ultige SfxViewFrame-Instanz
- zeigt.
+ This method returns a pointer to the <SfxViewFrame> Instance in which
+ this SfxViewShell is displayed. This is the instance that was passed
+ on in the constructor. It is guaranteed that the returned pointer
+ points on the valid SfxViewFrame instance.
-
- [Querverweise]
+ [Cross-reference]
<SfxShell::GetFrame()const>
*/
@@ -378,3 +377,5 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const
#endif // #ifndef _SFXVIEWSH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx
new file mode 100644
index 000000000000..14a8bd7f9904
--- /dev/null
+++ b/sfx2/inc/sfxbasic.hxx
@@ -0,0 +1,44 @@
+/* -*- 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SFXBASIC_HXX
+#define _SFXBASIC_HXX
+
+class BasicManager;
+class SbMethod;
+
+//------------------------------------------------------------------
+
+SbMethod* SfxQueryMacro( BasicManager* pMgr, const String& rMacro );
+
+ErrCode SfxCallMacro( BasicManager* pMgr, const String& rMacro,
+ SbxArray *pArgs = 0, SbxValue *pRet = 0 );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 52dbe7b71294..aedb2ab16ac8 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, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
String getLanguage() { return aLanguage; };
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 4816bfc58f8e..2e6d1effb4c7 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/prj/build.lst b/sfx2/prj/build.lst
index dbc233ce44e7..1cf56d7517cd 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,2 +1,2 @@
-sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf sfx2 : TRANSLATIONS:translations idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk
index e312a7ccab65..e312a7ccab65 100644..100755
--- a/sfx2/prj/makefile.mk
+++ b/sfx2/prj/makefile.mk
diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java b/sfx2/qa/complex/sfx2/DocumentInfo.java
index ca7ae8b1dda0..ca7ae8b1dda0 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentInfo.java
+++ b/sfx2/qa/complex/sfx2/DocumentInfo.java
diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index d145b9028473..8f7071048fc3 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -127,10 +127,6 @@ public class DocumentMetadataAccess
XRepositorySupplier xRS;
XDocumentMetadataAccess xDMA;
-// public String[] getTestMethodNames ()
-// {
-// return new String[] { "check", "checkRDFa" };
-// }
/**
* The test parameters
*/
@@ -522,11 +518,6 @@ public class DocumentMetadataAccess
PropertyValue file = new PropertyValue();
file.Name = "URL";
file.Value = tempDir + "TESTDMA.odt";
- /*
- PropertyValue baseURL = new PropertyValue();
- baseURL.Name = "DocumentBaseURL";
- baseURL.Value = tempDir + "TMP.odt";
- */
PropertyValue mimetype = new PropertyValue();
mimetype.Name = "MediaType";
mimetype.Value = "application/vnd.oasis.opendocument.text";
@@ -960,39 +951,14 @@ public class DocumentMetadataAccess
return blank != null;
}
-/*
- static class Statement implements XStatement
- {
- XResource m_Subject;
- XResource m_Predicate;
- XNode m_Object;
- XURI m_Graph;
-
- Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object,
- XURI i_Graph)
- {
- m_Subject = i_Subject;
- m_Predicate = i_Predicate;
- m_Object = i_Object;
- m_Graph = i_Graph;
- }
-
- public XResource getSubject() { return m_Subject; }
- public XResource getPredicate() { return m_Predicate; }
- public XNode getObject() { return m_Object; }
- public XURI getGraph() { return m_Graph; }
- }
-*/
static Statement[] toSeq(XEnumeration i_Enum) throws Exception
{
java.util.Collection c = new java.util.Vector();
while (i_Enum.hasMoreElements()) {
Statement s = (Statement) i_Enum.nextElement();
-//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
c.add(s);
}
-// return (Statement[]) c.toArray();
// java sucks
Object[] arr = c.toArray();
Statement[] ret = new Statement[arr.length];
@@ -1009,7 +975,6 @@ public class DocumentMetadataAccess
XNode[] s = (XNode[]) i_Enum.nextElement();
c.add(s);
}
-// return (XNode[][]) c.toArray();
Object[] arr = c.toArray();
XNode[][] ret = new XNode[arr.length][];
for (int i = 0; i < arr.length; ++i) {
diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java
index 01ccaa21619b..01ccaa21619b 100644..100755
--- a/sfx2/qa/complex/sfx2/DocumentProperties.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
index 41bd66ccb5b9..41bd66ccb5b9 100644..100755
--- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
+++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
diff --git a/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
index 1e9cbb1f4738..1e9cbb1f4738 100644..100755
--- a/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
+++ b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index f37530aba726..c64cd7022e25 100755
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -781,6 +781,7 @@ public class UndoManager
m_currentTestCase.doSingleModification();
assertEquals( "when the Undo manager is locked, no implicit additions should happen",
0, m_undoListener.getUndoActionsAdded() );
+ assertTrue( "Undo manager gets unlocked as a side effect of performing a simple operation", i_undoManager.isLocked() );
i_undoManager.unlock();
assertEquals( "unlock is not expected to add collected actions - they should be discarded",
0, m_undoListener.getUndoActionsAdded() );
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
index d255f3d16822..d255f3d16822 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
index bf54bb4ca90b..bf54bb4ca90b 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
index a650ce9bb2e4..a650ce9bb2e4 100644..100755
--- a/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
diff --git a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
index af62bab39dfa..af62bab39dfa 100644..100755
--- a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
+++ b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
diff --git a/sfx2/qa/complex/sfx2/tools/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java
index e67e65f218db..e67e65f218db 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/DialogThread.java
+++ b/sfx2/qa/complex/sfx2/tools/DialogThread.java
diff --git a/sfx2/qa/complex/sfx2/tools/TestDocument.java b/sfx2/qa/complex/sfx2/tools/TestDocument.java
index 8f2108df358e..8f2108df358e 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/TestDocument.java
+++ b/sfx2/qa/complex/sfx2/tools/TestDocument.java
diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
index 4767028572bb..b604bd010d65 100644..100755
--- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java
+++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
@@ -194,8 +194,6 @@ public class WriterHelper {
xRoot = AccessibilityTools.getAccessibleObject(xWindow);
- //at.printAccessibleTree(new PrintWriter(System.out),xRoot);
-
XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName));
try {
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 9930d61acf20..4a94890f21df 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.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.
@@ -107,12 +108,12 @@ void MetadatableTest::test()
MockMetadatable m4(*pReg);
MockMetadatable m5(*pReg);
::rtl::OUString empty;
- ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
- ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
- ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
- ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
- ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
- ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
+ ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
+ ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
+ ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
+ ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
+ ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
+ ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
beans::StringPair id1(content, sid1);
beans::StringPair id2(content, sid2);
beans::StringPair id3(content, sid3);
@@ -272,3 +273,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(MetadatableTest);
CPPUNIT_PLUGIN_IMPLEMENT();
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/qa/cppunit/version.map b/sfx2/qa/cppunit/version.map
index 3308588ef6f8..3308588ef6f8 100644..100755
--- a/sfx2/qa/cppunit/version.map
+++ b/sfx2/qa/cppunit/version.map
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java
index c1231c975a2b..c1231c975a2b 100644..100755
--- a/sfx2/qa/unoapi/Test.java
+++ b/sfx2/qa/unoapi/Test.java
diff --git a/sfx2/qa/unoapi/knownissues.xcl b/sfx2/qa/unoapi/knownissues.xcl
index 1d87f84c96d2..1d87f84c96d2 100644..100755
--- a/sfx2/qa/unoapi/knownissues.xcl
+++ b/sfx2/qa/unoapi/knownissues.xcl
diff --git a/sfx2/qa/unoapi/sfx.sce b/sfx2/qa/unoapi/sfx.sce
index ce72c463ee55..ce72c463ee55 100644..100755
--- a/sfx2/qa/unoapi/sfx.sce
+++ b/sfx2/qa/unoapi/sfx.sce
diff --git a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
index c4b5672f9624..c4b5672f9624 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
+++ b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
Binary files differ
diff --git a/sfx2/qa/unoapi/testdocuments/report.stw b/sfx2/qa/unoapi/testdocuments/report.stw
index 5b8efafa159b..5b8efafa159b 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report.stw
+++ b/sfx2/qa/unoapi/testdocuments/report.stw
Binary files differ
diff --git a/sfx2/qa/unoapi/testdocuments/report2.stw b/sfx2/qa/unoapi/testdocuments/report2.stw
index 9ee0a7ee0ee0..9ee0a7ee0ee0 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report2.stw
+++ b/sfx2/qa/unoapi/testdocuments/report2.stw
Binary files differ
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index f20cdbd7c385..3bd2bc8b1e02 100644..100755
--- 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/docslots.sdi b/sfx2/sdi/docslots.sdi
index 0e4a302d9d13..0e4a302d9d13 100644..100755
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index dbf9267448e1..c17b2b190c08 100644..100755
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -30,11 +30,6 @@ interface Window
Automation = FALSE ;
]
{
- SID_HYPERLINK_INSERT
- [
- ExecMethod = ChildWindowExecute ;
- StateMethod = ChildWindowState ;
- ]
SID_HYPERLINK_DIALOG
[
ExecMethod = ChildWindowExecute ;
@@ -281,12 +276,12 @@ interface Window
ExecMethod = ExecView_Impl;
]
- // Nur f"ur Gestalter: Slot mu\s vorhanden sein
+ // Only for Designers: Slot must be present
SID_STYLE_NEW
[
]
- // Nur f"ur Gestalter: Slot mu\s vorhanden sein
+ // Only for Designers: Slot must be present
SID_STYLE_DRAGHIERARCHIE
[
]
@@ -333,7 +328,7 @@ interface BrowseWindow : Window
{
SID_ACTIVATE // ole(no) api(final/play/rec)
[
- // Implementierung in Subklassen
+ // Implementations in Subclasses
]
SID_NEWWINDOW // ole(no) api(play/rec)
[
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index a9c5ca6e7330..e69bf590a322 100644..100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2953,33 +2953,6 @@ SfxBoolItem InsertDoc SID_INSERTDOC
]
//--------------------------------------------------------------------------
-SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME
(
SfxStringItem Name FN_PARAM_1,
@@ -3830,6 +3803,33 @@ SfxUInt16Item MetricUnit SID_ATTR_METRIC
]
//--------------------------------------------------------------------------
+SfxBoolItem ApplyCharUnit SID_ATTR_APPLYCHARUNIT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+//--------------------------------------------------------------------------
SfxBoolItem Modified SID_MODIFIED
[
@@ -3857,7 +3857,7 @@ SfxBoolItem Modified SID_MODIFIED
]
//--------------------------------------------------------------------------
-SfxStringItem ModifiedStatus SID_DOC_MODIFIED
+SfxBoolItem ModifiedStatus SID_DOC_MODIFIED
[
/* flags: */
@@ -7264,7 +7264,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/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index 421c1cb29529..421c1cb29529 100644..100755
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index 1479c4716efc..1479c4716efc 100644..100755
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 4d14d927adf6..4d14d927adf6 100644..100755
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d8442bb215f6..c69b3939ee99 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>
@@ -121,7 +121,7 @@
#include <sfx2/mnuitem.hxx>
#endif
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
#define DDE_AVAILABLE
#endif
@@ -147,137 +147,119 @@
#include <framework/addonsoptions.hxx>
#include <svtools/ttprops.hxx>
#include <unotools/extendedsecurityoptions.hxx>
+#include <rtl/instance.hxx>
using namespace ::com::sun::star;
// Static member
SfxApplication* SfxApplication::pApp = NULL;
static BasicDLL* pBasic = NULL;
+static SfxHelp* pSfxHelp = NULL;
-class SfxPropertyHandler : public PropertyHandler
+namespace
{
- virtual void Property( ApplicationProperty& );
-};
-
-static SfxPropertyHandler* pPropertyHandler = 0;
-
-SfxPropertyHandler* GetOrCreatePropertyHandler()
-{
- if ( !pPropertyHandler )
+ class SfxPropertyHandler : public PropertyHandler
{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pPropertyHandler )
- pPropertyHandler = new SfxPropertyHandler;
- }
-
- return pPropertyHandler;
-}
+ virtual void Property( ApplicationProperty& );
+ };
-void SfxPropertyHandler::Property( ApplicationProperty& rProp )
-{
- TTProperties* pTTProperties = PTR_CAST( TTProperties, &rProp );
- if ( pTTProperties )
+ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
{
- pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION;
- switch ( pTTProperties->nActualPR )
+ TTProperties* pTTProperties = PTR_CAST( TTProperties, &rProp );
+ if ( pTTProperties )
{
- case TT_PR_SLOTS:
- {
- pTTProperties->nSidOpenUrl = SID_OPENURL;
- pTTProperties->nSidFileName = SID_FILE_NAME;
- pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT;
- pTTProperties->nSidCopy = SID_COPY;
- pTTProperties->nSidPaste = SID_PASTE;
- pTTProperties->nSidSourceView = SID_SOURCEVIEW;
- pTTProperties->nSidSelectAll = SID_SELECTALL;
- pTTProperties->nSidReferer = SID_REFERER;
- pTTProperties->nActualPR = 0;
- }
- break;
- case TT_PR_DISPATCHER:
+ pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION;
+ switch ( pTTProperties->nActualPR )
{
- // interface for TestTool
- SfxViewFrame* pViewFrame=0;
- SfxDispatcher* pDispatcher=0;
- pViewFrame = SfxViewFrame::Current();
- if ( !pViewFrame )
- pViewFrame = SfxViewFrame::GetFirst();
- if ( pViewFrame )
- pDispatcher = pViewFrame->GetDispatcher();
- else
- pDispatcher = NULL;
- if ( !pDispatcher )
- pTTProperties->nActualPR = TT_PR_ERR_NODISPATCHER;
- else
+ case TT_PR_SLOTS:
{
- pDispatcher->SetExecuteMode(EXECUTEMODE_DIALOGASYNCHRON);
- if ( pTTProperties->mnSID == SID_NEWDOCDIRECT
- || pTTProperties->mnSID == SID_OPENDOC )
+ pTTProperties->nSidOpenUrl = SID_OPENURL;
+ pTTProperties->nSidFileName = SID_FILE_NAME;
+ pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT;
+ pTTProperties->nSidCopy = SID_COPY;
+ pTTProperties->nSidPaste = SID_PASTE;
+ pTTProperties->nSidSourceView = SID_SOURCEVIEW;
+ pTTProperties->nSidSelectAll = SID_SELECTALL;
+ pTTProperties->nSidReferer = SID_REFERER;
+ pTTProperties->nActualPR = 0;
+ }
+ break;
+ case TT_PR_DISPATCHER:
+ {
+ // interface for TestTool
+ SfxViewFrame* pViewFrame=0;
+ SfxDispatcher* pDispatcher=0;
+ pViewFrame = SfxViewFrame::Current();
+ if ( !pViewFrame )
+ pViewFrame = SfxViewFrame::GetFirst();
+ if ( pViewFrame )
+ pDispatcher = pViewFrame->GetDispatcher();
+ else
+ pDispatcher = NULL;
+ if ( !pDispatcher )
+ pTTProperties->nActualPR = TT_PR_ERR_NODISPATCHER;
+ else
{
- SfxPoolItem** pArgs = pTTProperties->mppArgs;
- SfxAllItemSet aSet( SFX_APP()->GetPool() );
- if ( pArgs && *pArgs )
- {
- for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg )
- aSet.Put( **pArg );
- }
- if ( pTTProperties->mnSID == SID_NEWDOCDIRECT )
+ pDispatcher->SetExecuteMode(EXECUTEMODE_DIALOGASYNCHRON);
+ if ( pTTProperties->mnSID == SID_NEWDOCDIRECT
+ || pTTProperties->mnSID == SID_OPENDOC )
{
- String aFactory = String::CreateFromAscii("private:factory/");
+ SfxPoolItem** pArgs = pTTProperties->mppArgs;
+ SfxAllItemSet aSet( SFX_APP()->GetPool() );
if ( pArgs && *pArgs )
{
- SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False );
- if ( pFactoryName )
- aFactory += pFactoryName->GetValue();
+ for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg )
+ aSet.Put( **pArg );
+ }
+ if ( pTTProperties->mnSID == SID_NEWDOCDIRECT )
+ {
+ String aFactory = String::CreateFromAscii("private:factory/");
+ if ( pArgs && *pArgs )
+ {
+ SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False );
+ if ( pFactoryName )
+ aFactory += pFactoryName->GetValue();
+ else
+ aFactory += String::CreateFromAscii("swriter");
+ }
else
aFactory += String::CreateFromAscii("swriter");
+
+ aSet.Put( SfxStringItem( SID_FILE_NAME, aFactory ) );
+ aSet.ClearItem( SID_NEWDOCDIRECT );
+ pTTProperties->mnSID = SID_OPENDOC;
}
- else
- aFactory += String::CreateFromAscii("swriter");
- aSet.Put( SfxStringItem( SID_FILE_NAME, aFactory ) );
- aSet.ClearItem( SID_NEWDOCDIRECT );
- pTTProperties->mnSID = SID_OPENDOC;
+ aSet.Put( SfxStringItem( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") ) );
+ if ( pDispatcher->ExecuteFunction( pTTProperties->mnSID, aSet, pTTProperties->mnMode )
+ == EXECUTE_NO )
+ pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE;
+ else
+ pTTProperties->nActualPR = 0;
}
-
- aSet.Put( SfxStringItem( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") ) );
- if ( pDispatcher->ExecuteFunction( pTTProperties->mnSID, aSet, pTTProperties->mnMode )
- == EXECUTE_NO )
- pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE;
- else
- pTTProperties->nActualPR = 0;
- }
- else
- {
- if ( pDispatcher->ExecuteFunction(
- pTTProperties->mnSID, pTTProperties->mppArgs, pTTProperties->mnMode )
- == EXECUTE_NO )
- pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE;
else
- pTTProperties->nActualPR = 0;
+ {
+ if ( pDispatcher->ExecuteFunction(
+ pTTProperties->mnSID, pTTProperties->mppArgs, pTTProperties->mnMode )
+ == EXECUTE_NO )
+ pTTProperties->nActualPR = TT_PR_ERR_NOEXECUTE;
+ else
+ pTTProperties->nActualPR = 0;
+ }
}
}
+ break;
+ default:
+ {
+ pTTProperties->nPropertyVersion = 0;
+ }
}
- break;
-/*
- case TT_PR_IMG:
- {
- SvDataMemberObjectRef aDataObject = new SvDataMemberObject();
- SvData* pDataBmp = new SvData( FORMAT_BITMAP );
- pDataBmp->SetData( pTTProperties->mpBmp );
- aDataObject->Append( pDataBmp );
- aDataObject->CopyClipboard();
- pTTProperties->nActualPR = 0;
- }
- break;
-*/
- default:
- {
- pTTProperties->nPropertyVersion = 0;
- }
+ return;
}
- return;
}
+
+ class thePropertyHandler
+ : public rtl::Static<SfxPropertyHandler, thePropertyHandler> {};
}
#include <framework/imageproducer.hxx>
@@ -297,15 +279,16 @@ SfxApplication* SfxApplication::GetOrCreate()
SfxApplication *pNew = new SfxApplication;
//TODO/CLEANUP
- //ist das Mutex-Handling OK?
+ // Is the Mutex-Handling OK?
static ::osl::Mutex aProtector;
::osl::MutexGuard aGuard2( aProtector );
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
pApp = pNew;
- // at the moment a bug may occur when Initialize_Impl returns sal_False, but this is only temporary because all code that may cause such a
- // fault will be moved outside the SFX
+ // at the moment a bug may occur when Initialize_Impl returns FALSE,
+ // but this is only temporary because all code that may cause such
+ // a fault will be moved outside the SFX
pApp->Initialize_Impl();
::framework::SetImageProducer( GetImage );
@@ -316,7 +299,6 @@ SfxApplication* SfxApplication::GetOrCreate()
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
- SfxHelp* pSfxHelp = new SfxHelp;
Application::SetHelp( pSfxHelp );
if ( SvtHelpOptions().IsHelpTips() )
Help::EnableQuickHelp();
@@ -336,12 +318,11 @@ SfxApplication::SfxApplication()
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SfxApplication" );
SetName( DEFINE_CONST_UNICODE("StarOffice") );
- GetpApp()->SetPropertyHandler( GetOrCreatePropertyHandler() );
+ GetpApp()->SetPropertyHandler( &thePropertyHandler::get() );
SvtViewOptions::AcquireOptions();
pAppData_Impl = new SfxAppData_Impl( this );
- pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() );
pAppData_Impl->m_xImeStatusWindow->init();
pApp->PreInit();
@@ -353,7 +334,7 @@ SfxApplication::SfxApplication()
#else
if( !InitializeDde() )
{
- ByteString aStr( "Kein DDE-Service moeglich. Fehler: " );
+ ByteString aStr( "No DDE-Service possible. Error: " );
if( GetDdeService() )
aStr += ByteString::CreateFromInt32(GetDdeService()->GetError());
else
@@ -363,6 +344,8 @@ SfxApplication::SfxApplication()
#endif
#endif
+ pSfxHelp = new SfxHelp;
+
pBasic = new BasicDLL;
StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" );
@@ -376,6 +359,9 @@ SfxApplication::~SfxApplication()
SfxModule::DestroyModules_Impl();
+ delete pSfxHelp;
+ Application::SetHelp( NULL );
+
// delete global options
SvtViewOptions::ReleaseOptions();
delete pBasic;
@@ -391,16 +377,15 @@ SfxApplication::~SfxApplication()
const String& SfxApplication::GetLastDir_Impl() const
-/* [Beschreibung]
+/* [Description]
- Interne Methode, mit der im SFx das zuletzt mit der Methode
- <SfxApplication::SetLastDir_Impl()> gesetzte Verzeichnis
- zurueckgegeben wird.
+ Internal method by which the last set directory with the method
+ <SfxApplication::SetLastDir_Impl()> in SFX is returned.
- Dieses ist i.d.R. das zuletzt durch den SfxFileDialog
- angesprochene Verzeichnis.
+ This is usually the most recently addressed by the
+ SfxFileDialog directory.
- [Querverweis]
+ [Cross-reference]
<SfxApplication::SetLastDir_Impl()>
*/
@@ -410,11 +395,11 @@ const String& SfxApplication::GetLastDir_Impl() const
const String& SfxApplication::GetLastSaveDirectory() const
-/* [Beschreibung]
+/* [Description]
- Wie <SfxApplication::GetLastDir_Impl()>, nur extern
+ As <SfxApplication::GetLastDir_Impl()>, only external
- [Querverweis]
+ [Cross-reference]
<SfxApplication::GetLastDir_Impl()>
*/
@@ -426,15 +411,15 @@ const String& SfxApplication::GetLastSaveDirectory() const
void SfxApplication::SetLastDir_Impl
(
- const String& rNewDir /* kompletter Verzeichnis-Pfad als String */
- )
+ const String& rNewDir /* Complete directory path as a string */
+)
-/* [Beschreibung]
+/* [Description]
- Interne Methode, mit der ein Verzeichnis-Pfad gesetzt wird, der
- zuletzt (z.B. durch den SfxFileDialog) angesprochen wurde.
+ Internal Method, by which a directory path is set that was last addressed
+ (eg by the SfxFileDialog).
- [Querverweis]
+ [Cross-reference]
<SfxApplication::GetLastDir_Impl()>
*/
@@ -472,9 +457,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
// DocWinActivate : both frames belong to the same TopWindow
// TopWinActivate : both frames belong to different TopWindows
-// not used anymore!
-// sal_Bool bDocWinActivate = pOldContainerFrame && pNewContainerFrame &&
-// pOldContainerFrame->GetTopViewFrame() == pNewContainerFrame->GetTopViewFrame();
+
sal_Bool bTaskActivate = pOldContainerFrame != pNewContainerFrame;
if ( pOldContainerFrame )
@@ -489,15 +472,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
pAppData_Impl->pViewFrame = pFrame;
- //const SfxObjectShell* pSh = pViewFrame ? pViewFrame->GetObjectShell() : 0;
- //if ( !pSh )
- //{
- // // otherwise BaseURL is set in activation of document
- // INetURLObject aObject( SvtPathOptions().GetWorkPath() );
- // aObject.setFinalSlash();
- // INetURLObject::SetBaseURL( aObject.GetMainURL( INetURLObject::NO_DECODE ) );
- //}
-
if( pNewContainerFrame )
{
pNewContainerFrame->DoActivate( bTaskActivate );
@@ -557,8 +531,7 @@ short SfxApplication::QuerySave_Impl( SfxObjectShell& rDoc, sal_Bool /*bAutoSave
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
{
- String aMgrName = String::CreateFromAscii( pPrefix );
- return ResMgr::CreateResMgr(U2S(aMgrName));
+ return ResMgr::CreateResMgr(pPrefix);
}
//---------------------------------------------------------------------
@@ -727,7 +700,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;
}
@@ -743,8 +716,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() )
@@ -823,3 +796,5 @@ ErrCode SfxApplication::CallBasic( const String& rCode, BasicManager* pMgr, SbxA
{
return pMgr->ExecuteMacro( rCode, pArgs, pRet);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index ff01fd358d4d..25e4e4527e37 100644..100755
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -34,9 +34,6 @@
#define ACC_IBM (RID_SFX_APP_START+2)
#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)
@@ -77,13 +74,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 STR_HELP_WINDOW_TITLE (RID_SFX_APP_START+125) // string
#define STR_HELP_BUTTON_INDEX_ON (RID_SFX_APP_START+126)
@@ -114,16 +107,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)
@@ -134,31 +117,15 @@
#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)
#define RID_DESKTOP (RID_SFX_APP_START + 184)
-// #define RID_XMLSEC_WARNING_BROKENSIGNATURE (RID_SFX_APP_START + 185)
#define RID_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186)
#define RID_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187)
- // FREE
- // FREE
-#define RID_XMLSEC_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190)
-/* obsolete
-#define RID_WARNING_MACROSDISABLED (RID_SFX_APP_START + 191)
-*/
+#define RID_XMLSEC_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190)
#define STR_QUERY_UPDATE_LINKS (RID_SFX_APP_START + 192)
#define STR_DDE_ERROR (RID_SFX_APP_START + 193)
@@ -176,6 +143,16 @@
#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202)
#define RID_SVXSTR_GRFILTER_TOOBIG (RID_SFX_APP_START + 203)
+// For the License Information dialog box
+#define DLG_HELP_LICENSING (RID_SFX_APP_START + 204)
+#define STR_LICENSING_INFORMATION_1 (RID_SFX_APP_START + 205)
+#define STR_LICENSING_INFORMATION_2 (RID_SFX_APP_START + 206)
+#define STR_LICENSING_INFORMATION_3 (RID_SFX_APP_START + 207)
+#define STR_LICENSING_INFORMATION_4 (RID_SFX_APP_START + 208)
+#define STR_LICENSING_INFORMATION_5 (RID_SFX_APP_START + 209)
+#define PB_LICENSING_SHOW (RID_SFX_APP_START + 210)
+#define PB_LICENSING_CLOSE (RID_SFX_APP_START + 211)
+
#define MD_DDE_LINKEDIT (RID_SFX_APP_START + 1)
#endif // #ifndef _SFX_APP_HRC
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index fa5a1fc1c335..f11578805e4d 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -324,16 +324,6 @@ ToolBox RID_HELPBAR
{
Identifier = SID_HELP_ANNOTATE ;
};
- /*
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_DOWNLOAD ;
- };
-*/
};
};
@@ -399,7 +389,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
@@ -417,7 +407,6 @@ WarningBox RID_SECURITY_WARNING_HYPERLINK
WarningBox RID_SECURITY_WARNING_NO_HYPERLINKS
{
- //HelpId = HID_WARNING_SECURITY_NO_HYPERLINKS;
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] = "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened.";
@@ -435,7 +424,6 @@ String RID_DESKTOP
QueryBox RID_XMLSEC_QUERY_LOSINGSIGNATURE
{
-// HelpId = HID_XMLSEC_QUERY_LOSINGSIGNATURE;
Buttons = WB_YES_NO ;
DefButton = WB_DEF_NO ;
Message [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ;
@@ -443,7 +431,6 @@ QueryBox RID_XMLSEC_QUERY_LOSINGSIGNATURE
QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN
{
-// HelpId = HID_XMLSEC_QUERY_SAVEBEFORESIGN;
Buttons = WB_YES_NO ;
DefButton = WB_DEF_YES ;
Message [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ;
@@ -451,7 +438,6 @@ QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN
InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT
{
-// HelpId = HID_XMLSEC_INFO_WRONGDOCFORMAT;
Message [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ;
};
@@ -516,3 +502,57 @@ String RID_SVXSTR_GRFILTER_TOOBIG
Text [ en-US ] = "Not enough memory to insert graphic" ;
};
+ModalDialog DLG_HELP_LICENSING
+{
+ // Size is computed
+ Text [ en-US ] = "Licensing and Legal information";
+ MOVEABLE = TRUE ;
+ CLOSEABLE = TRUE ;
+ OUTPUTSIZE = TRUE ;
+ SVLOOK = TRUE ;
+ String STR_LICENSING_INFORMATION_1
+ {
+ Text [ en-US ] =
+ "%PRODUCTNAME is made available subject to the terms of GNU Lesser General Public\n"
+ "License Version 3. A copy of the LGPL license can be found at\n"
+ "http://www.gnu.org/licenses/lgpl-3.0.html" ;
+ };
+ String STR_LICENSING_INFORMATION_2
+ {
+ Text [ en-US ] =
+ "Third Party Code Additional copyright notices and license terms applicable to\n"
+ "portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html\n"
+ "file; choose Show License to see exact details in English." ;
+ };
+ String STR_LICENSING_INFORMATION_3
+ {
+ Text [ en-US ] =
+ "All trademarks and registered trademarks mentioned herein are the property of\n"
+ "their respective owners." ;
+ };
+ String STR_LICENSING_INFORMATION_4
+ {
+ Text [ en-US ] =
+ "Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights\n"
+ "reserved." ;
+ };
+ String STR_LICENSING_INFORMATION_5
+ {
+ Text [ en-US ] =
+ "This product was created by %OOOVENDOR, based on OpenOffice.org,\n"
+ "which is Copyright 2000, 2010 Oracle and/or its affiliates.\n"
+ "%OOOVENDOR acknowledges all community members, please see\n"
+ "http://www.libreoffice.org/ for more details." ;
+ };
+ OKButton PB_LICENSING_SHOW
+ {
+ // Position and size is computed
+ Text [ en-US ] = "~Show License" ;
+ DefButton = TRUE ;
+ };
+ CancelButton PB_LICENSING_CLOSE
+ {
+ // Position and size is computed
+ Text [ en-US ] = "~Close" ;
+ };
+};
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 6d6c8ace5a09..a776e09d1f74 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.
@@ -86,7 +87,7 @@
#define ITEMID_SEARCH SID_SEARCH_ITEM
#include <svl/srchitem.hxx>
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
#define SFX_TYPEMAP
#define Selection
@@ -99,17 +100,15 @@ using namespace ::com::sun::star::script;
using ::basic::BasicManagerRepository;
-//========================================================================
-
//------------------------------------------------------------------------
-String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/)
+String lcl_GetVersionString()
{
::rtl::OUString aDefault;
String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
if ( aVersion.Len() == 0 )
{
- DBG_ERROR( "No BUILDID in bootstrap file found" );
+ OSL_FAIL( "No BUILDID in bootstrap file found" );
}
aVersion.Erase( 0, aVersion.Search( ':' ) + 1 );
@@ -133,46 +132,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 )
{
@@ -229,7 +188,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
{
SbxObject* pObject = SbxBase::CreateObject( pItem->GetValue() );
pObject->AddRef();
-//(mba) rReq.SetReturnValue( SfxObjectItem( 0, pObject ) );
rReq.Done();
}
break;
@@ -237,12 +195,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
case SID_DELETE_BASICOBJECT:
{
- SFX_REQUEST_ARG(rReq, pItem, SfxObjectItem, nSID, sal_False);
- if ( pItem )
- {
-//(mba) SbxObject* pObject = pItem->GetObject();
-//(mba) pObject->ReleaseRef();
- }
break;
}
@@ -290,7 +242,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
//-------------------------------------------------------------------------
void SfxApplication::PropState_Impl( SfxItemSet &rSet )
{
-// SfxViewFrame *pFrame = SfxViewFrame::Current();
SfxWhichIter aIter(rSet);
for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
{
@@ -329,3 +280,4 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 7f4e8cedb637..eb2c43a27dd3 100755..100644
--- 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.
@@ -146,7 +147,7 @@ Reference< XLibraryContainer > SfxBasicManagerHolder::getLibraryContainer( Conta
case SCRIPTS: return mxBasicContainer.get();
case DIALOGS: return mxDialogContainer.get();
}
- DBG_ERROR( "SfxBasicManagerHolder::getLibraryContainer: illegal container type!" );
+ OSL_FAIL( "SfxBasicManagerHolder::getLibraryContainer: illegal container type!" );
return NULL;
}
@@ -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 d98147078bc6..7c399b32ad2c 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>
@@ -157,7 +154,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
{
ByteString aTmp( "SfxEvent: ");
aTmp += ByteString( String( aHint.GetEventName() ), RTL_TEXTENCODING_UTF8 );
- DBG_TRACE( aTmp.GetBuffer() );
+ OSL_TRACE( "%s", aTmp.GetBuffer() );
}
#endif
SFX_APP()->Broadcast( aHint );
@@ -174,7 +171,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
{
sal_Bool bRet = sal_False;
SfxItemPool &rPool = GetPool();
- String aTRUEStr('1');
+ String asal_TrueStr('1');
const sal_uInt16 *pRanges = rSet.GetRanges();
SvtSaveOptions aSaveOptions;
@@ -274,9 +271,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
}
break;
case SID_ATTR_METRIC :
-// if(rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_METRIC ),
-// pOptions->GetMetric() ) ) )
-// bRet = sal_True;
break;
case SID_HELPBALLOONS :
if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
@@ -390,23 +384,14 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS))
{
::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs();
- List aList;
+ std::vector<String> aList;
sal_uInt32 nCount = seqURLs.getLength();
sal_uInt32 nURL;
for( nURL=0; nURL<nCount; ++nURL )
- {
- aList.Insert( new String( seqURLs[nURL] ), LIST_APPEND );
- }
- if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL),
- &aList ) ) )
- {
+ aList.push_back(seqURLs[nURL]);
+
+ if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), &aList ) ) )
bRet = sal_False;
- }
- for( nURL=0; nURL<nCount; ++nURL )
- {
- delete (String*)aList.GetObject(nURL);
- }
- aList.Clear();
}
}
break;
@@ -505,7 +490,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
}
#ifdef DBG_UTIL
if ( !bRet )
- DBG_ERROR( "Putting options failed!" );
+ OSL_FAIL( "Putting options failed!" );
#endif
}
pRanges++;
@@ -520,13 +505,11 @@ sal_Bool SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* p
return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ), *pReferer );
}
//--------------------------------------------------------------------
-// TODO/CLEANUP: wieso zwei SetOptions Methoden?
+// TODO/CLEANUP: Why two SetOptions Methods?
void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{
const SfxPoolItem *pItem = 0;
SfxItemPool &rPool = GetPool();
- sal_Bool bResetSession = sal_False;
- sal_Bool bProxiesModified = sal_False;
SvtSaveOptions aSaveOptions;
SvtUndoOptions aUndoOptions;
@@ -609,14 +592,14 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
aSaveOptions.SetDocInfoSave(((const SfxBoolItem *)pItem)->GetValue());
}
- // offende Dokumente merken
+ // Mark open Documents
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
aSaveOptions.SetSaveWorkingSet(((const SfxBoolItem *)pItem)->GetValue());
}
- // Fenster-Einstellung speichern
+ // Save window settings
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
@@ -627,7 +610,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
-// pOptions->SetMetric((FieldUnit)((const SfxUInt16Item*)pItem)->GetValue());
}
// HelpBalloons
@@ -672,7 +654,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
sal_Bool bReset = ((const SfxBoolItem *)pItem)->GetValue();
if ( bReset )
{
- DBG_ERROR( "Not implemented, may be EOL!" );
+ OSL_FAIL( "Not implemented, may be EOL!" );
} }
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), sal_True, &pItem))
@@ -702,16 +684,16 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
sal_uInt16 nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
aUndoOptions.SetUndoCount( nUndoCount );
- // um alle Undo-Manager zu erwischen: "uber alle Frames iterieren
+ // To catch all Undo-Managers: Iterate over all Frames
for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst();
pFrame;
pFrame = SfxViewFrame::GetNext(*pFrame) )
{
- // den Dispatcher des Frames rausholen
+ // Get the Dispatcher of the Frames
SfxDispatcher *pDispat = pFrame->GetDispatcher();
pDispat->Flush();
- // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
+ // Iterate over all SfxShells on the Dispatchers Stack
sal_uInt16 nIdx = 0;
for ( SfxShell *pSh = pDispat->GetShell(nIdx);
pSh;
@@ -743,51 +725,38 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
aSecurityOptions.SetExecutePlugins( ( (const SfxBoolItem *)pItem )->GetValue() );
- bResetSession = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem))
{
DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
- bResetSession = sal_True;
- bProxiesModified = sal_True;
}
// Secure-Referers
@@ -796,13 +765,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
DELETEZ(pAppData_Impl->pSecureURLs);
DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected");
- const List *pList = ((SfxStringListItem*)pItem)->GetList();
- sal_uInt32 nCount = pList->Count();
+ const std::vector<String> &aList = ((SfxStringListItem*)pItem)->GetList();
+ sal_uInt32 nCount = aList.size();
::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs(nCount);
for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition)
- {
- seqURLs[nPosition] = *(const String*)(pList->GetObject(nPosition));
- }
+ seqURLs[nPosition] = aList[nPosition];
+
aSecurityOptions.SetSecureURLs( seqURLs );
}
@@ -825,7 +793,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
#endif
}
- // geaenderte Daten speichern
+ // Store changed data
aInetOptions.flush();
}
@@ -834,7 +802,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
{
SvtPathOptions aPathOptions;
- // Daten werden in DocInfo und IniManager gespeichert
+ // Data is saved in DocInfo and IniManager
const SfxPoolItem *pItem = 0;
SfxItemPool &rPool = GetPool();
@@ -933,7 +901,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
//--------------------------------------------------------------------
-// alle Dokumente speichern
+// Save all Documents
sal_Bool SfxApplication::SaveAll_Impl(sal_Bool bPrompt, sal_Bool bAutoSave)
{
@@ -993,13 +961,6 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
return;
-#ifdef DBG_UTIL
- //::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
- //ByteString aTmp( "SfxEvent: ");
- //aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
- //DBG_TRACE( aTmp.GetBuffer() );
-#endif
-
if ( bSynchron )
{
#ifdef DBG_UTIL
@@ -1007,7 +968,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
{
ByteString aTmp( "SfxEvent: ");
aTmp += ByteString( String( rEventHint.GetEventName() ), RTL_TEXTENCODING_UTF8 );
- DBG_TRACE( aTmp.GetBuffer() );
+ OSL_TRACE( "%s", aTmp.GetBuffer() );
}
#endif
Broadcast(rEventHint);
@@ -1020,3 +981,4 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
IMPL_OBJHINT( SfxStringHint, String )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index ea7b331b839b..08a5fc054425 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.
@@ -28,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#ifndef GCC
-#endif
#include <svl/whiter.hxx>
#include <svl/eitem.hxx>
@@ -60,17 +59,13 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
if (!pAppData_Impl->pFactArr)
pAppData_Impl->pFactArr = new SfxChildWinFactArr_Impl;
-//#ifdef DBG_UTIL
for (sal_uInt16 nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
{
if (pFact->nId == (*pAppData_Impl->pFactArr)[nFactory]->nId)
{
pAppData_Impl->pFactArr->Remove( nFactory );
-// DBG_ERROR("ChildWindow mehrfach registriert!");
-// return;
}
}
-//#endif
pAppData_Impl->pFactArr->C40_INSERT(
SfxChildWinFactory, pFact, pAppData_Impl->pFactArr->Count() );
@@ -83,7 +78,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
SfxChildWinFactory *pF = NULL;
if ( pMod )
{
- // Modul "ubergeben, ChildwindowFactory dort suchen
+ // Abandon Module, search there for ChildwindowFactory
pFactories = pMod->GetChildWinFactories_Impl();
if ( pFactories )
{
@@ -93,7 +88,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
SfxChildWinFactory *pFac = (*pFactories)[nFactory];
if ( nId == pFac->nId )
{
- // Factory gefunden, Context dort registrieren
+ // Factory found, registrer Context here.
pF = pFac;
break;
}
@@ -103,9 +98,9 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
if ( !pF )
{
- // Factory an der Application suchen
- DBG_ASSERT( pAppData_Impl, "Keine AppDaten!" );
- DBG_ASSERT( pAppData_Impl->pFactArr, "Keine Factories!" );
+ // Search for Factory in the Application
+ DBG_ASSERT( pAppData_Impl, "No AppData!" );
+ DBG_ASSERT( pAppData_Impl->pFactArr, "No Factories!" );
pFactories = pAppData_Impl->pFactArr;
sal_uInt16 nCount = pFactories->Count();
@@ -116,10 +111,10 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
{
if ( pMod )
{
- // Wenn der Context von einem Modul registriert wurde,
- // mu\s die ChildwindowFactory auch dort zur Verf"ugung
- // stehen, sonst m"u\ste sich die Contextfactory im DLL-Exit
- // wieder abmelden !
+ // If the context of a module has been registered, then the
+ // ChildWindowFactory must also be available there,
+ // else the ContextFactory would have be unsubscribed on
+ // DLL-exit
pF = new SfxChildWinFactory( pFac->pCtor, pFac->nId,
pFac->nPos );
pMod->RegisterChildWindow( pF );
@@ -139,7 +134,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
return;
}
- DBG_ERROR( "Kein ChildWindow fuer diesen Context!" );
+ OSL_FAIL( "No ChildWindow for this Context!" );
}
//--------------------------------------------------------------------
@@ -174,3 +169,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 2914c648bfe9..3838526a9eb1 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.
@@ -29,14 +30,12 @@
#include "precompiled_sfx2.hxx"
#include <tools/cachestr.hxx>
#include <tools/config.hxx>
-#ifndef _INETSTRM_HXX //autogen
#include <svl/inetstrm.hxx>
-#endif
#include <svl/stritem.hxx>
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
@@ -152,20 +151,6 @@ SfxAppData_Impl::~SfxAppData_Impl()
delete pBasMgrListener;
}
-void SfxAppData_Impl::UpdateApplicationSettings( sal_Bool bDontHide )
-{
- AllSettings aAllSet = Application::GetSettings();
- StyleSettings aStyleSet = aAllSet.GetStyleSettings();
- sal_uInt32 nStyleOptions = aStyleSet.GetOptions();
- if ( bDontHide )
- nStyleOptions &= ~STYLE_OPTION_HIDEDISABLED;
- else
- nStyleOptions |= STYLE_OPTION_HIDEDISABLED;
- aStyleSet.SetOptions( nStyleOptions );
- aAllSet.SetStyleSettings( aStyleSet );
- Application::SetSettings( aAllSet );
-}
-
SfxDocumentTemplates* SfxAppData_Impl::GetDocumentTemplates()
{
if ( !pTemplates )
@@ -184,3 +169,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 26e4fecf3864..c3fb0e9dfc92 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.
@@ -40,8 +41,6 @@
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/pathoptions.hxx>
-#ifndef GCC
-#endif
#include <sfx2/app.hxx>
#include "appdata.hxx"
@@ -78,9 +77,6 @@ public:
virtual sal_Bool MakeTopic( const String& );
virtual String Topics();
-// virtual String Formats();
-// virtual String SysItems();
-// virtual String Status();
virtual sal_Bool SysTopicExecute( const String* pStr );
};
@@ -111,12 +107,6 @@ public:
virtual sal_Bool Execute( const String* );
virtual sal_Bool StartAdviseLoop();
virtual sal_Bool MakeItem( const String& rItem );
-
-// wird benoetigt?
-// virtual void Connect( long n );
-// virtual void Disconnect( long n );
-// virtual void StopAdviseLoop();
-
};
@@ -128,15 +118,14 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *)
sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
const String &rCmd, const String &rEvent )
-/* [Beschreibung]
+/* [Description]
- Pr"uft, ob 'rCmd' das Event 'rEvent' ist (ohne '(') und baut
- aus diesem dann ein <ApplicationEvent> zusammen, das per
- <Application::AppEvent()> ausgef"uhrt werden kann. Ist 'rCmd' das
- angegegeben Event 'rEvent', dann wird TRUE zur"uckgegeben, sonst FALSE.
+ Checks if 'rCmd' of the event 'rEvent' is (without '(') and then assemble
+ this data into a <ApplicationEvent>, which can be excecuted through
+ <Application::AppEvent()>. If 'rCmd' is the given event 'rEvent', then
+ TRUE is returned, otherwise FALSE.
-
- [Beispiel]
+ [Example]
rCmd = "Open(\"d:\doc\doc.sdw\")"
rEvent = "Open"
@@ -151,7 +140,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
aData.Erase( 0, aEvent.Len() );
if ( aData.Len() > 2 )
{
- // in das ApplicationEvent-Format wandeln
+ // Transform into the ApplicationEvent Format
aData.Erase( aData.Len()-1, 1 );
for ( sal_uInt16 n = 0; n < aData.Len(); ++n )
{
@@ -175,31 +164,30 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
long SfxApplication::DdeExecute
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to thier SfxApplication subclass.
- Die Basisimplementierung versteht die API-Funktionalit"at der
- betreffenden SfxApplication-Subklasse in BASIC-Syntax. R"uckgabewerte
- k"onnen dabei leider nicht "ubertragen werden.
+ The base implementation understands the API functionality of the
+ relevant SfxApplication subclass in BASIC syntax. Return values can
+ not be transferred, unfortunately.
*/
{
- // Print oder Open-Event?
+ // Print or Open-Event?
ApplicationEvent aAppEvent;
if ( SfxAppEvent_Impl( aAppEvent, rCmd, DEFINE_CONST_UNICODE("Print") ) ||
SfxAppEvent_Impl( aAppEvent, rCmd, DEFINE_CONST_UNICODE("Open") ) )
GetpApp()->AppEvent( aAppEvent );
else
{
- // alle anderen per BASIC
+ // all others are BASIC
StarBASIC* pBasic = GetBasic();
- ENSURE_OR_RETURN( pBasic, "where's my basic?", 0 );
+ DBG_ASSERT( pBasic, "Where is the Basic???" );
SbxVariable* pRet = pBasic->Execute( rCmd );
if( !pRet )
{
@@ -214,18 +202,17 @@ long SfxApplication::DdeExecute
long SfxApplication::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -236,18 +223,17 @@ long SfxApplication::DdeGetData
long SfxApplication::DdeSetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -258,15 +244,15 @@ long SfxApplication::DdeSetData
::sfx2::SvLinkSource* SfxApplication::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxApplication-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
@@ -277,21 +263,20 @@ long SfxApplication::DdeSetData
long SfxObjectShell::DdeExecute
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to the thier SfxApplication subclass.
- Die Basisimplementierung f"uhrt nichts aus und liefert 0 zur"uck.
+ The base implementation does nothing and returns 0.
*/
{
StarBASIC* pBasic = GetBasic();
- DBG_ASSERT( pBasic, "Wo ist mein Basic???" ) ;
+ DBG_ASSERT( pBasic, "Where is the Basic???" ) ;
SbxVariable* pRet = pBasic->Execute( rCmd );
if( !pRet )
{
@@ -306,18 +291,17 @@ long SfxObjectShell::DdeExecute
long SfxObjectShell::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -328,18 +312,17 @@ long SfxObjectShell::DdeGetData
long SfxObjectShell::DdeSetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -349,38 +332,54 @@ long SfxObjectShell::DdeSetData
//--------------------------------------------------------------------
::sfx2::SvLinkSource* SfxObjectShell::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxObjectShell-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
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
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to the thier SfxApplication subclass.
- Die Basisimplementierung versteht die API-Funktionalit"at des
- betreffenden SfxViewFrame, der darin dargestellten SfxViewShell und
- der betreffenden SfxObjectShell-Subklasse in BASIC-Syntax.
- R"uckgabewerte k"onnen dabei leider nicht "ubertragen werden.
+ The base implementation understands the API functionality of the
+ relevant SfxViewFrame, which is shown and the relevant SfxViewShell
+ and the relevant SfxApplication subclass in BASIC syntax. Return
+ values can not be transferred, unfortunately.
*/
{
@@ -394,18 +393,17 @@ long SfxViewFrame::DdeExecute
long SfxViewFrame::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -416,18 +414,17 @@ long SfxViewFrame::DdeGetData
long SfxViewFrame::DdeSetData
(
- const String& , // das anzusprechende Item
- const String& , // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const String&, // the Item to be addressed
+ const String&, // in: Format
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -438,15 +435,15 @@ long SfxViewFrame::DdeSetData
::sfx2::SvLinkSource* SfxViewFrame::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxViewFrame-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
@@ -458,7 +455,7 @@ long SfxViewFrame::DdeSetData
sal_Bool SfxApplication::InitializeDde()
{
DBG_ASSERT( !pAppData_Impl->pDdeService,
- "Dde kann nicht mehrfach initialisiert werden" );
+ "Dde can not be initialized multiple times" );
pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() );
int nError = pAppData_Impl->pDdeService->GetError();
@@ -466,10 +463,10 @@ sal_Bool SfxApplication::InitializeDde()
{
pAppData_Impl->pDocTopics = new SfxDdeDocTopics_Impl;
- // wir wollen auf jedenfall RTF unterstuetzen!
+ // we certainly want to support RTF!
pAppData_Impl->pDdeService->AddFormat( FORMAT_RTF );
- // Config-Pfad als Topic wegen Mehrfachstart
+ // Config path as a topic becauseof multiple starts
INetURLObject aOfficeLockFile( SvtPathOptions().GetUserConfigPath() );
aOfficeLockFile.insertName( DEFINE_CONST_UNICODE( "soffice.lck" ) );
String aService( SfxDdeServiceName_Impl(
@@ -494,20 +491,18 @@ void SfxAppData_Impl::DeInitDDE()
void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
{
- DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
- //OV: Im Serverbetrieb ist DDE abgeklemmt!
+ DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
+ //OV: DDE is disconnected in server mode!
if( !pAppData_Impl->pDocTopics )
return;
- // doppeltes Eintragen verhindern
+ // prevent double submit
String sShellNm;
sal_Bool bFnd = sal_False;
for( sal_uInt16 n = pAppData_Impl->pDocTopics->Count(); n; )
if( (*pAppData_Impl->pDocTopics)[ --n ]->pSh == pSh )
{
- // JP 18.03.96 - Bug 26470
- // falls das Document unbenannt wurde, ist trotzdem ein
- // neues Topics anzulegen!
+ // If the document is untitled, is still a new Topic is created!
if( !bFnd )
{
bFnd = sal_True;
@@ -526,8 +521,8 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
{
- DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
- //OV: Im Serverbetrieb ist DDE abgeklemmt!
+ DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
+ //OV: DDE is disconnected in server mode!
if( !pAppData_Impl->pDocTopics )
return;
@@ -554,14 +549,14 @@ DdeService* SfxApplication::GetDdeService()
sal_Bool ImplDdeService::MakeTopic( const String& rNm )
{
- // Workaround gegen Event nach unserem Main() unter OS/2
- // passierte wenn man beim Beenden aus dem OffMgr die App neu startet
+ // Workaround for Event after Main() under OS/2
+ // happens when exiting starts the App again
if ( !Application::IsInExecute() )
return sal_False;
- // das Topic rNm wird gesucht, haben wir es ?
- // erstmal nur ueber die ObjectShells laufen und die mit dem
- // Namen heraussuchen:
+ // The Topic rNm is sought, do we have it?
+ // First only loop over the ObjectShells to find those
+ // with the specific name:
sal_Bool bRet = sal_False;
String sNm( rNm );
sNm.ToLowerAscii();
@@ -571,7 +566,7 @@ sal_Bool ImplDdeService::MakeTopic( const String& rNm )
{
String sTmp( pShell->GetTitle(SFX_TITLE_FULLNAME) );
sTmp.ToLowerAscii();
- if( sTmp == sNm ) // die wollen wir haben
+ if( sTmp == sNm )
{
SFX_APP()->AddDdeTopic( pShell );
bRet = sal_True;
@@ -587,9 +582,7 @@ sal_Bool ImplDdeService::MakeTopic( const String& rNm )
if ( aWorkPath.GetNewAbsURL( rNm, &aFile ) &&
SfxContentHelper::IsDocument( aFile.GetMainURL( INetURLObject::NO_DECODE ) ) )
{
- // File vorhanden
-
- // dann versuche die Datei zu laden:
+ // File exists? then try to load it:
SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) );
SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, sal_True);
@@ -698,7 +691,7 @@ sal_Bool SfxDdeDocTopic_Impl::StartAdviseLoop()
::sfx2::SvLinkSource* pNewObj = pSh->DdeCreateLinkSource( GetCurItem() );
if( pNewObj )
{
- // dann richten wir auch einen entsprechenden SvBaseLink ein
+ // then we also establish a corresponding SvBaseLink
String sNm, sTmp( Application::GetAppName() );
::sfx2::MakeLnkName( sNm, &sTmp, pSh->GetTitle(SFX_TITLE_FULLNAME), GetCurItem() );
new ::sfx2::SvBaseLink( sNm, OBJECT_DDE_EXTERN, pNewObj );
@@ -707,3 +700,4 @@ sal_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 ba23e04cad12..4f4f3a1ebe6a 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,17 @@
#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>
@@ -118,22 +113,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();
@@ -148,14 +144,13 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
xGlobalBroadcaster->notifyEvent(aEvent2);
}
- //pApp->Deinitialize();
delete pApp;
Application::Quit();
}
::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;
}
@@ -182,7 +177,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;
@@ -207,7 +202,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;
@@ -258,20 +253,20 @@ bool SfxApplication::Initialize_Impl()
#ifdef DBG_UTIL
- // Der SimplerErrorHandler dient Debugzwecken. In der Product werden
- // nichtgehandelte Fehler durch Errorcode 1 an SFX gegeben.
- new SimpleErrorHandler;
+ // The SimplerErrorHandler is for debugging. In the Product errors
+ // not processed are given to SFX as Errorcode 1.
+ pAppData_Impl->m_pSimpleErrorHdl = new SimpleErrorHandler;
#endif
+ pAppData_Impl->m_pToolsErrorHdl = new SfxErrorHandler(
+ RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1);
+
pAppData_Impl->pBasicResMgr = CreateResManager("sb");
pAppData_Impl->pSvtResMgr = CreateResManager("svt");
- new SfxErrorHandler( RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1 );
- new SfxErrorHandler( RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr );
- new SfxErrorHandler( RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr );
-
- // diverse Pointer
- SfxPickList::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) );
- /////////////////////////////////////////////////////////////////
+ pAppData_Impl->m_pSoErrorHdl = new SfxErrorHandler(
+ RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr );
+ pAppData_Impl->m_pSbxErrorHdl = new SfxErrorHandler(
+ RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr );
DBG_ASSERT( !pAppData_Impl->pAppDispat, "AppDispatcher already exists" );
pAppData_Impl->pAppDispat = new SfxDispatcher((SfxDispatcher*)0);
@@ -305,10 +300,12 @@ bool 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 64c6673bbafb..00ec4e88ecdd 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.
@@ -28,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-//#define TF_NEWDESKTOP
-
#define _SDINTERN_HXX
#include <stdio.h>
@@ -40,7 +39,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 +83,7 @@ DBG_NAME(SfxAppMainCHAOSReg)
//===================================================================
#ifdef TF_POOLABLE
-static SfxItemInfo __READONLY_DATA aItemInfos[] =
+static SfxItemInfo const aItemInfos[] =
{
{ 0, 0 }
};
@@ -100,18 +98,19 @@ void SfxApplication::Init
(
)
-/* [Beschreibung]
+/* [Description]
+
+ This virtual method is called from SFx through Application::Main(),
+ before Execute() is called and:
+ - the Intro is already displayed,
+ - the Applications window exists, but it is still hidden,
+ - the Bindings already exist (Controller can be registered),
+ - the Init and Config-Manager already exists,
+ - the Standard-Controller already exists,
+ - the SFx-Shells have alredy registered their Interfaces.
- Diese virtuelle Methode wird vom SFx aus Application:a:Main() gerufen,
- bevor Execute() ausgef"uhrt wird und
- - das Intro bereits angezeigt ist,
- - das Applikationsfenster exisitiert, aber noch hidden ist,
- - die Bindings bereits existieren (Controller sind anmeldbar),
- - der Ini- und Config-Manager bereits existiert,
- - die Standard-Controller bereits exisitieren,
- - die SFx-Shells ihre Interfaces bereits registriert haben.
+ [Cross-reference]
- [Querverweise]
<SfxApplication::Exit()>
<SfxApplication::OpenClients()>
*/
@@ -122,17 +121,17 @@ void SfxApplication::Init
void SfxApplication::Exit()
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird vom SFx aus Application::Main() gerufen,
- nachdem Execute() beendet ist und
- - die Konfiguration (SfxConfigManager) bereits gespeichert wurde,
- - die Fensterpostionen etc. in den SfxIniManager geschrieben wurden,
- - das Applikationsfenster noch existiert, aber hidden ist
- - s"amtliche Dokumente und deren Views bereits geschlossen sind.
- - Dispatcher, Bindings etc. bereits zerst"ort sind
+ This virtual method is called from SFx through Application::Main(),
+ after Execute() has finished and
+ - the configuration (SfxConfigManager) was already saved,
+ - the window postions etc. in the SfxIniManager were written,
+ - the Application widow still exists, but is hidden
+ - all Documents and their Views already are closed.
+ - Dispatcher, Bindings etc. already destroyed.
- [Querverweise]
+ [Cross-reference]
<SfxApplication::Init(int,char*[])>
*/
@@ -161,3 +160,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 eafe9d262189..eb0a10016d33 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.
@@ -29,8 +30,6 @@
#include "precompiled_sfx2.hxx"
#include <vcl/status.hxx>
#include <vcl/msgbox.hxx>
-#include <vos/process.hxx>
-#include <vos/xception.hxx>
#include <svl/whiter.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
@@ -46,7 +45,7 @@
#include <com/sun/star/uno/Reference.h>
#include <tools/config.hxx>
#include <tools/rcid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
#include <unotools/ucbstreamhelper.hxx>
@@ -86,7 +85,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;
@@ -156,13 +154,12 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP))
//--------------------------------------------------------------------
SfxProgress* SfxApplication::GetProgress() const
-/* [Beschreibung]
+/* [Description]
- Liefert den f"ur die gesamte Applikation laufenden SfxProgress
- oder 0, falls keiner f"ur die gesamte Applikation l"auft.
+ Returns the running SfxProgress for the entire application or 0 if
+ none is running for the entire application.
-
- [Querverweise]
+ [Cross-reference]
<SfxProgress::GetActiveProgress(SfxViewFrame*)>
<SfxViewFrame::GetProgress()const>
@@ -180,7 +177,7 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
SvUShorts* pList = pAppData_Impl->pDisabledSlotList;
if ( !pList )
{
- // Gibt es eine Slotdatei ?
+ // Is there a slot file?
INetURLObject aUserObj( SvtPathOptions().GetUserConfigPath() );
aUserObj.insertName( DEFINE_CONST_UNICODE( "slots.cfg" ) );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aUserObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ );
@@ -196,7 +193,7 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
sal_Bool bSlots = ( pStream && !pStream->GetError() );
if( bSlots && bSlotsEnabled )
{
- // SlotDatei einlesen
+ // Read Slot file
String aTitle;
pStream->ReadByteString(aTitle);
if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL )
@@ -216,21 +213,20 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
pStream->ReadByteString(aTitle);
if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() )
{
- // Lesen schief gegangen
+ // Read failed
DELETEZ( pList );
bError = sal_True;
}
}
else
{
- // Streamerkennung fehlgeschlagen
+ // Stream detection failure
bError = sal_True;
}
}
else if ( bSlots != bSlotsEnabled )
{
- // Wenn kein Slotlist-Eintrag, dann darf auch keine SlotDatei
- // vorhanden sein
+ // If no slot list entry, then no slot file shall exist
bError = sal_True;
}
@@ -246,9 +242,9 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
if ( bError )
{
- // Wenn ein Sloteintrag vorhanden ist, aber keine oder eine fehlerhafte
- // SlotDatei, oder aber eine Slotdatei, aber kein Sloteintrag, dann
- // gilt dies als fehlerhafte Konfiguration
+ // If an entry slot is present, but no or faulty slot file, or a slot
+ // file, but no slot entry, then this is considered to be a
+ // misconfiguration
new SfxSpecialConfigError_Impl( String( SfxResId( RID_SPECIALCONFIG_ERROR ) ) );
}
@@ -265,7 +261,7 @@ SfxModule* SfxApplication::GetModule_Impl()
return pModule;
else
{
- DBG_ERROR( "No module!" );
+ OSL_FAIL( "No module!" );
return NULL;
}
}
@@ -285,8 +281,6 @@ SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppDat
sal_Bool SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; }
SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; }
-//SfxOptions& SfxApplication::GetOptions() { return *pAppData_Impl->pOptions; }
-//const SfxOptions& SfxApplication::GetOptions() const { return *pAppData_Impl->pOptions; }
static bool impl_loadBitmap(
const rtl::OUString &rPath, const rtl::OUString &rBmpFileName,
@@ -302,8 +296,8 @@ static bool impl_loadBitmap(
// Use graphic class to also support more graphic formats (bmp,png,...)
Graphic aGraphic;
- GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
+ GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
+ rGF.ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
// Default case, we load the intro bitmap from a seperate file
// (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
@@ -325,7 +319,7 @@ Image SfxApplication::GetApplicationLogo()
do
{
bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
}
while ( !bLoaded && ( nIndex >= 0 ) );
@@ -334,25 +328,26 @@ Image SfxApplication::GetApplicationLogo()
if ( !bLoaded )
{
bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
- rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo );
if ( !bLoaded )
bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
- rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo );
}
if ( !bLoaded )
{
bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
- rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo );
if ( !bLoaded )
bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
- rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo );
}
return aAppLogo;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 8b76024c1afb..c644e5dcb30f 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>
@@ -152,45 +153,45 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) thr
SfxObjectShellRef SfxApplication::DocAlreadyLoaded
(
- const String& rName, // Name des Dokuments mit Pfad
- sal_Bool bSilent, // sal_True: nicht nach neuer Sicht fragen
- sal_Bool bActivate, // soll bestehende Sicht aktiviert werden
+ const String& rName, // Name of Documents including path
+ sal_Bool bSilent, // sal_True: do not ask for a new view
+ sal_Bool bActivate, // existing view to be activated
sal_Bool bForbidVisible,
const String* pPostStr
)
-/* [Beschreibung]
+/* [Description]
- Stellt fest, ob ein Dokument mit dem Namen 'rName' bereits geladen
- ist und liefert einen Pointer darauf zu"uck.
+ Determines whether a document with the name 'rName' already is loaded and
+ returns a pointer to this document.
- Ist das Dokument noch nicht geladen, wird ein 0-Pointer zur"uckgeliefert.
+ If the document is not loaded, a 0-pointer is returned.
*/
{
- // zu suchenden Namen als URL aufbereiten
+ // prepare to search for names as URL
INetURLObject aUrlToFind( rName );
DBG_ASSERT( aUrlToFind.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL" );
String aPostString;
if ( pPostStr )
aPostString = *pPostStr;
- // noch offen?
+ // still open?
SfxObjectShellRef xDoc;
if ( !aUrlToFind.HasError() )
{
- // dann bei den normal geoeffneten Docs
+ // then with the normally open Documents
if ( !xDoc.Is() )
{
- xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // auch hidden Docs
+ xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // also hidden Documents
while( xDoc.Is() )
{
if ( xDoc->GetMedium() &&
xDoc->GetCreateMode() == SFX_CREATE_MODE_STANDARD &&
!xDoc->IsAbortingImport() && !xDoc->IsLoading() )
{
- // Vergleiche anhand der URLs
+ // Comparisons between URLs
INetURLObject aUrl( xDoc->GetMedium()->GetName() );
if ( !aUrl.HasError() && aUrl == aUrlToFind &&
(!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, sal_True )) &&
@@ -204,11 +205,10 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
}
}
- // gefunden?
+ // Found?
if ( xDoc.Is() && bActivate )
{
- DBG_ASSERT(
- !bForbidVisible, "Unsichtbares kann nicht aktiviert werden" );
+ DBG_ASSERT(!bForbidVisible, "Invisible can not be enabled" );
SfxViewFrame* pFrame;
for( pFrame = SfxViewFrame::GetFirst( xDoc );
@@ -301,19 +301,17 @@ private:
sal_uInt32 CheckPasswd_Impl
(
- //Window *pWin, // Parent des Dialogs
SfxObjectShell* pDoc,
- SfxItemPool& /*rPool*/, // Pool, falls ein Set erzeugt werden mus
- SfxMedium* pFile // das Medium, dessen Passwort gfs. erfragt werden soll
+ SfxItemPool& /*rPool*/, // Pool, if a Set has to be created
+ SfxMedium* pFile // the Medium and its Password shold be obtained
)
-/* [Beschreibung]
+/* [Description]
- Zu einem Medium das Passwort erfragen; funktioniert nur, wenn es sich
- um einen Storage handelt.
- Wenn in der Documentinfo das Passwort-Flag gesetzt ist, wird
- das Passwort vom Benutzer per Dialog erfragt und an dem Set
- des Mediums gesetzt; das Set wird, wenn nicht vorhanden, erzeugt.
+ Ask for the password for a medium, only works if it concerns storage.
+ If the password flag is set in the Document Info, then the password is
+ requested through a user dialogue and the set at the Set of the medium.
+ If the set does not exist the it is created.
*/
{
sal_uIntPtr nRet = ERRCODE_NONE;
@@ -328,16 +326,13 @@ 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& )
{
// TODO/LATER:
// the storage either has no encrypted elements or it's just
// does not allow to detect it, probably it should be implemented laiter
- /*
- bIsEncrypted = ( aInfo.Load( xStorage ) && aInfo.IsPasswd() );
- */
}
if ( bIsEncrypted )
@@ -398,7 +393,7 @@ sal_uInt32 CheckPasswd_Impl
}
else
{
- OSL_ENSURE( sal_False, "A storage must implement XPropertySet interface!" );
+ OSL_FAIL( "A storage must implement XPropertySet interface!" );
nRet = ERRCODE_SFX_CANTGETPASSWD;
}
}
@@ -491,8 +486,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String
xDoc->GetStorage()->copyToStorage( xTempStorage );
-//REMOVE // the following operations should be done in one step
-//REMOVE xDoc->DoHandsOff();
if ( !xDoc->DoSaveCompleted( new SfxMedium( xTempStorage, String() ) ) )
throw uno::RuntimeException();
}
@@ -521,7 +514,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String
SfxItemSet* pNew = xDoc->GetMedium()->GetItemSet()->Clone();
pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL );
pNew->ClearItem( SID_FILTER_NAME );
- //pNew->Put( SfxStringItem( SID_FILTER_NAME, xDoc->GetFactory().GetFilter(0)->GetFilterName() ) );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
TransformItems( SID_OPENDOC, *pNew, aArgs );
sal_Int32 nLength = aArgs.getLength();
@@ -576,7 +568,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- // keine Parameter vom BASIC nur Factory angegeben?
+ // No Parameter from BASIC only Factory given?
SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
@@ -584,7 +576,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
SfxObjectShellLock xDoc;
String aTemplateRegion, aTemplateName, aTemplateFileName;
- sal_Bool bDirect = sal_False; // "uber FileName anstelle Region/Template
+ sal_Bool bDirect = sal_False; // through FileName instead of Region/Template
SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
if ( !pTemplNameItem && !pTemplFileNameItem )
{
@@ -680,6 +672,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();
@@ -797,8 +812,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.RemoveItem( SID_FILE_NAME );
rReq.AppendItem( SfxStringItem( SID_FILE_NAME, aURL ) );
- // synchron ausf"uhren, damit beim Reschedulen nicht schon das n"achste Dokument
- // geladen wird
+ // Run synchronous, so that not the next document is loaded
+ // when rescheduling
// TODO/LATER: use URLList argument and always remove one document after another, each step in asychronous execution, until finished
// but only if reschedule is a problem
GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs() );
@@ -830,13 +845,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
delete pURLList;
}
- if ( !rReq.IsSynchronCall() )
- {
- // now check wether a stream is already there
- // if not: download it in a thread and restart the call
- // return;
- }
-
sal_Bool bHyperlinkUsed = sal_False;
if ( SID_OPENURL == nSID )
@@ -910,13 +918,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.AppendItem( SfxBoolItem( SID_PREVIEW, sal_True ) );
}
- if ( STRING_NOTFOUND != aFileFlags.Search( 0x0053 ) ) // S = 53h
- {
- // not supported anymore
- //rReq.RemoveItem( SID_SILENT );
- //rReq.AppendItem( SfxBoolItem( SID_SILENT, sal_True ) );
- }
-
rReq.RemoveItem( SID_OPTIONS );
}
@@ -925,7 +926,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() )
{
@@ -934,49 +935,16 @@ 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();
SvtExtendedSecurityOptions aExtendedSecurityOptions;
SvtExtendedSecurityOptions::OpenHyperlinkMode eMode = aExtendedSecurityOptions.GetOpenHyperlinkMode();
- if ( eMode == SvtExtendedSecurityOptions::OPEN_WITHSECURITYCHECK )
- {
- if ( aINetProtocol == INET_PROT_FILE )
- {
-/*!!! pb: #i49802# no security warning any longer
- // Check if file URL is a directory. This is not insecure!
- osl::Directory aDir( aURL.Main );
- sal_Bool bIsDir = ( aDir.open() == osl::Directory::E_None );
-
- if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete ) )
- {
- // Security check for local files depending on the extension
- vos::OGuard aGuard( Application::GetSolarMutex() );
- Window *pWindow = SFX_APP()->GetTopWindow();
-
- String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
- WarningBox aSecurityWarningBox( pWindow, SfxResId( RID_SECURITY_WARNING_HYPERLINK ));
- aSecurityWarningBox.SetText( aSecurityWarningBoxTitle );
- // Replace %s with the real file name
- String aMsgText = aSecurityWarningBox.GetMessText();
- String aMainURL( aURL.Main );
- String aFileName;
-
- utl::LocalFileHelper::ConvertURLToPhysicalName( aMainURL, aFileName );
- aMsgText.SearchAndReplaceAscii( "%s", aFileName );
- aSecurityWarningBox.SetMessText( aMsgText );
-
- if( aSecurityWarningBox.Execute() == RET_NO )
- return;
- }
-*/
- }
- }
- else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
+ 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 ));
@@ -989,11 +957,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 )
@@ -1014,13 +982,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();
}
@@ -1033,14 +1001,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();
@@ -1052,7 +1020,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;
@@ -1097,7 +1065,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();
}
@@ -1105,7 +1073,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();
}
@@ -1189,7 +1157,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)) );
}
@@ -1218,8 +1186,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
Reference < XController > xController;
-// if ( ( !bIsBlankTarget && pFrame ) || pLinkItem || !rReq.IsSynchronCall() )
-// {
// if a frame is given, it must be used for the starting point of the targetting mechanism
// this code is also used if asynchronous loading is possible, because loadComponent always is synchron
if ( !xTargetFrame.is() )
@@ -1230,7 +1196,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
else
{
- xTargetFrame.set( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+ xTargetFrame.set( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
}
}
@@ -1256,15 +1222,11 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
// if loading must be done synchron, we must wait for completion to get a return value
// find frame by myself; I must konw the exact frame to get the controller for the return value from it
- //if( aTarget.getLength() )
- // xTargetFrame = xTargetFrame->findFrame( aTarget, FrameSearchFlag::ALL );
Reference < XComponent > xComp;
try
{
xComp = ::comphelper::SynchronousDispatch::dispatch( xTargetFrame, aFileName, aTarget, 0, aArgs );
-// Reference < XComponentLoader > xLoader( xTargetFrame, UNO_QUERY );
-// xComp = xLoader->loadComponentFromURL( aFileName, aTarget, 0, aArgs );
}
catch(const RuntimeException&)
{
@@ -1285,7 +1247,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 );
@@ -1294,37 +1256,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( xDisp.is() )
xDisp->dispatch( aURL, aArgs );
}
- /*
- }
- else
- {
- // synchron loading without a given frame or as blank frame
- SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
-
- // 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 < XComponent > xComp;
- try
- {
- xComp = xDesktop->loadComponentFromURL( pFileNameItem->GetValue(), aTarget, 0, aArgs );
- }
- catch(const RuntimeException&)
- {
- throw;
- }
- catch(const ::com::sun::star::uno::Exception&)
- {
- xDesktop.clear();
- xComp.clear();
- }
-
- Reference < XModel > xModel( xComp, UNO_QUERY );
- if ( xModel.is() )
- xController = xModel->getCurrentController();
- else
- xController = Reference < XController >( xComp, UNO_QUERY );
- }*/
if ( xController.is() )
{
@@ -1358,3 +1289,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 1a62f48a7a24..c8f3cb7c11d8 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.
@@ -31,17 +32,12 @@
#include <basic/sbstar.hxx>
#include <svl/svdde.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <svl/eitem.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/misccfg.hxx>
-#ifndef GCC
-#endif
-
#include "app.hrc"
#include <sfx2/app.hxx>
#include <sfx2/evntconf.hxx>
@@ -76,13 +72,13 @@ sal_Bool SfxApplication::QueryExit_Impl()
{
sal_Bool bQuit = sal_True;
- // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben?
+ // Does some instance, that can not be shut down, still require the app?
if ( !bQuit )
{
- // nicht wirklich beenden, nur minimieren
+ // Not really exit, only minimize
InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) );
aInfoBox.Execute();
- DBG_TRACE( "QueryExit => FALSE (in use)" );
+ OSL_TRACE( "QueryExit => sal_False (in use)" );
return sal_False;
}
@@ -98,14 +94,14 @@ void SfxApplication::Deinitialize()
StarBASIC::Stop();
- // ggf. BASIC speichern
+ // Save BASIC if possible
BasicManager* pBasMgr = BasicManagerRepository::getApplicationBasicManager( false );
if ( pBasMgr && pBasMgr->IsModified() )
SaveBasicManager();
SaveBasicAndDialogContainer();
- pAppData_Impl->bDowning = sal_True; // wegen Timer aus DecAliveCount und QueryExit
+ pAppData_Impl->bDowning = sal_True; // due to Timer from DecAliveCount and QueryExit
DELETEZ( pAppData_Impl->pTemplates );
@@ -113,8 +109,6 @@ void SfxApplication::Deinitialize()
// this method. Therefore this call makes no sense and is the source of
// some stack traces, which we don't understand.
// For more information see:
- // #123501#
- //SetViewFrame(0);
pAppData_Impl->bDowning = sal_False;
DBG_ASSERT( !SfxViewFrame::GetFirst(),
"existing SfxViewFrame after Execute" );
@@ -128,8 +122,8 @@ void SfxApplication::Deinitialize()
// call derived application-exit
Exit();
- // Controller u."a. freigeben
- // dabei sollten auch restliche Komponenten ( Beamer! ) verschwinden
+ // Release Controller and others
+ // then the remaining components should alse disapear ( Beamer! )
BasicManagerRepository::resetApplicationBasicManager();
pAppData_Impl->pBasicManager->reset( NULL );
// this will also delete pBasMgr
@@ -143,7 +137,7 @@ void SfxApplication::Deinitialize()
SfxResId::DeleteResMgr();
DELETEZ(pAppData_Impl->pOfaResMgr);
- // ab hier d"urfen keine SvObjects mehr existieren
+ // from here no SvObjects have to exists
DELETEZ(pAppData_Impl->pMatcher);
DELETEX(pAppData_Impl->pSlotPool);
@@ -159,14 +153,18 @@ void SfxApplication::Deinitialize()
//TODO/CLEANTUP
//ReleaseArgs could be used instead!
-/* This leak is intended !
- Otherwise the TestTool cant use .uno:QuitApp ...
- because every destructed ItemSet work's on an already
- released pool pointer .-)
-
- NoChaos::ReleaseItemPool();
-*/
pAppData_Impl->pPool = NULL;
+ NoChaos::ReleaseItemPool();
+
DELETEZ(pAppData_Impl->pBasicResMgr);
DELETEZ(pAppData_Impl->pSvtResMgr);
+
+ delete pAppData_Impl->m_pSbxErrorHdl;
+ delete pAppData_Impl->m_pSoErrorHdl;
+ delete pAppData_Impl->m_pToolsErrorHdl;
+#ifdef DBG_UTIL
+ delete pAppData_Impl->m_pSimpleErrorHdl;
+#endif
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index dfecc21f9d4b..743c783471a3 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"
@@ -94,7 +92,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("TbxController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("TbxController registration is not clearly defined!");
}
}
#endif
@@ -119,7 +117,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("StbController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("StbController registration is not clearly defined!");
}
}
#endif
@@ -144,10 +142,12 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("MenuController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("MenuController register is not clearly defined!");
}
}
#endif
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 3e9629149d2a..e3c7fd09be5c 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.
@@ -47,6 +48,8 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/system/SystemShellExecuteException.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include "comphelper/configurationhelper.hxx"
@@ -70,15 +73,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>
@@ -151,10 +155,49 @@ long QuitAgain_Impl( void* pObj, void* pArg )
return 0;
}
+/// Find the correct location of the document (LICENSE.odt, etc.), and return
+/// it in rURL if found.
+static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL )
+{
+ using namespace osl;
+ DirectoryItem aDirItem;
+
+ rURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/") );
+ rURL += rtl::OUString::createFromAscii( pName );
+ rURL += rtl::OUString::createFromAscii( pExt );
+ rtl::Bootstrap::expandMacros( rURL );
+
+ if (rURL.getLength() != 0)
+ return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
+ else
+ return sal_False;
+}
+
+/// Displays CREDITS or LICENSE in any of the available version
+static void showDocument( const char* pBaseName )
+{
+ 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;
+ if ( checkURL ( pBaseName, ".odt", aURL ) ||
+ checkURL ( pBaseName, ".html", aURL ) ||
+ checkURL ( pBaseName, "", aURL ) ) {
+ xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
+ }
+ } catch (const ::com::sun::star::uno::Exception &) {
+ }
+}
+
void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- bool bDone = sal_False;
+ bool bDone = false;
switch ( rReq.GetSlot() )
{
case SID_SETOPTIONS:
@@ -206,7 +249,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if this dialog is closed by the user ...
So we ignore this request now and wait for a new user decision.
*/
- DBG_TRACE1( "QueryExit => FALSE (DispatchLevel == %u)", Application::GetDispatchLevel() );
+ OSL_TRACE( "QueryExit => sal_False (DispatchLevel == %u)", Application::GetDispatchLevel() );
return;
}
@@ -222,7 +265,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
// if terminate() was successful, SfxApplication is now dead!
pAppData_Impl->bInQuit = sal_False;
- // Returnwert setzten, ggf. terminieren
+ // Set return value, terminate if possible
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) );
return;
}
@@ -266,7 +309,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
const short nRet = pDlg->Execute();
if ( nRet )
- bDone = sal_True;
+ bDone = true;
delete pDlg;
}
@@ -305,14 +348,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sal_Bool bOk = ( n == 0);
rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
- bDone = sal_True;
+ bDone = true;
break;
}
case SID_SAVEDOCS:
{
sal_Bool bOK = sal_True;
- sal_Bool bTmpDone = sal_True;
for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
pObjSh;
pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
@@ -322,7 +364,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 = sal_False;
}
@@ -333,26 +374,62 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
+ case SID_SHOW_LICENSE:
+ {
+ ModalDialog aDialog( NULL, SfxResId( DLG_HELP_LICENSING ) );
+
+ String aLicensing;
+ for ( int i = STR_LICENSING_INFORMATION_1; i <= STR_LICENSING_INFORMATION_5; ++i )
+ {
+ if ( i != STR_LICENSING_INFORMATION_1 )
+ aLicensing += String( RTL_CONSTASCII_USTRINGPARAM( "\n\n" ) );
+ aLicensing += String( SfxResId( i ) );
+ }
+
+ FixedText aText( &aDialog );
+ aText.SetText( aLicensing );
+ OKButton aShow( &aDialog, SfxResId( PB_LICENSING_SHOW ) );
+ CancelButton aClose( &aDialog, SfxResId( PB_LICENSING_CLOSE ) );
+
+ // positions and sizes are computed to always fit the language
+ Size aTextSize( aText.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+ Size aShowSize( aShow.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+ Size aCloseSize( aClose.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+
+ long nDelimX = 12;
+ long nDelimY = 12;
+ long nWidth = aTextSize.Width() + 2*nDelimX;
+ long nButtonY = aTextSize.Height() + 2*nDelimY;
+ Size aButtonSize( std::max( aShowSize.Width(), aCloseSize.Width() ) + nDelimX,
+ std::max( aShowSize.Height(), aCloseSize.Height() ) );
+
+ aDialog.SetSizePixel( Size( nWidth, aTextSize.Height() + 3*nDelimY + aButtonSize.Height() ) );
+ aText.SetPosSizePixel( Point( nDelimX, nDelimY ), aTextSize );
+ aShow.SetPosSizePixel( Point( ( nWidth - nDelimX ) / 2 - aButtonSize.Width(), nButtonY ), aButtonSize );
+ aClose.SetPosSizePixel( Point( aShow.GetPosPixel().X() + aButtonSize.Width() + nDelimX, nButtonY ), aButtonSize );
+
+ aText.Show();
+
+ if ( aDialog.Execute() == RET_OK )
+ showDocument( "LICENSE" );
+
+ break;
+ }
+
+ case SID_SHOW_CREDITS:
+ {
+ showDocument( "CREDITS" );
+ break;
+ }
+
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_HELPINDEX:
- case SID_HELP_SUPPORTPAGE:
{
Help* pHelp = Application::GetHelp();
if ( pHelp )
{
- if ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE )
- {
- // show Support page with new URL
- String sHelpURL = SfxHelp::CreateHelpURL( String::CreateFromAscii(".uno:HelpSupport"), String() );
- String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) );
- sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp");
- sHelpURL += sParams;
- sHelpURL += String::CreateFromAscii("&UseDB=no");
- pHelp->Start( sHelpURL, NULL );
- }
- else
- pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
- bDone = sal_True;
+ pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
+ bDone = true;
}
break;
}
@@ -360,22 +437,21 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_HELPTIPS:
{
- // Parameter aus werten
+ // Evaluate Parameter
SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, sal_False);
bool bOn = pOnItem
? ((SfxBoolItem*)pOnItem)->GetValue()
: !Help::IsQuickHelpEnabled();
- // ausf"uhren
if ( bOn )
Help::EnableQuickHelp();
else
Help::DisableQuickHelp();
SvtHelpOptions().SetHelpTips( bOn );
Invalidate(SID_HELPTIPS);
- bDone = sal_True;
+ bDone = true;
- // ggf. recorden
+ // Record if possible
if ( !rReq.IsAPI() )
rReq.AppendItem( SfxBoolItem( SID_HELPTIPS, bOn) );
break;
@@ -388,22 +464,21 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
case SID_HELPBALLOONS:
{
- // Parameter auswerten
+ // Evaluate Parameter
SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, sal_False);
bool bOn = pOnItem
? ((SfxBoolItem*)pOnItem)->GetValue()
: !Help::IsBalloonHelpEnabled();
- // ausf"uhren
if ( bOn )
Help::EnableBalloonHelp();
else
Help::DisableBalloonHelp();
SvtHelpOptions().SetExtendedHelp( bOn );
Invalidate(SID_HELPBALLOONS);
- bDone = sal_True;
+ bDone = true;
- // ggf. recorden
+ // Record if possible
if ( !rReq.IsAPI() )
rReq.AppendItem( SfxBoolItem( SID_HELPBALLOONS, bOn) );
break;
@@ -419,7 +494,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
: !aHelpOpt.IsHelpAgentAutoStartMode();
aHelpOpt.SetHelpAgentAutoStartMode( bOn );
Invalidate(SID_HELP_PI);
- bDone = sal_True;
+ bDone = true;
break;
}
@@ -432,7 +507,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
VclAbstractDialog* pDlg = pFact->CreateVclDialog( 0, RID_DEFAULTABOUT );
pDlg->Execute();
delete pDlg;
- bDone = sal_True;
+ bDone = true;
}
break;
}
@@ -444,7 +519,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
new SfxTemplateOrganizeDlg(NULL);
pDlg->Execute();
delete pDlg;
- bDone = sal_True;
+ bDone = true;
break;
}
@@ -452,7 +527,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory());
aDialog.Execute();
- bDone = sal_True;
+ bDone = true;
break;
}
@@ -525,7 +600,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
rtl::OUStringBuffer aBuf( aToolbarResName );
aBuf.append( pToolbarName->GetValue() );
- // Parameter auswerten
+ // Evaluate Parameter
rtl::OUString aToolbarName( aBuf.makeStringAndClear() );
sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName ));
@@ -559,7 +634,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
const sal_uInt16 *pRanges = rSet.GetRanges();
- DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
+ DBG_ASSERT(pRanges && *pRanges, "Set without range");
while ( *pRanges )
{
for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
@@ -580,6 +655,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);
@@ -656,7 +743,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;
}
@@ -770,7 +857,7 @@ namespace
{
Reference < XFrame > xFrame( xContainer->getByIndex(i), UNO_QUERY_THROW );
::rtl::OUString sModule = xCheck->identify( xFrame );
- if ( sModule.equalsAscii( "com.sun.star.frame.StartModule" ) )
+ if ( sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.StartModule" ) ) )
return xFrame;
}
catch( const UnknownModuleException& )
@@ -841,11 +928,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(sal_False);
pView = SfxViewFrame::GetNext( *pView );
}
@@ -866,9 +959,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
// read repository URL from configuration
::rtl::OUString sTemplRepoURL =
getConfigurationStringValue(
- ::rtl::OUString::createFromAscii("org.openoffice.Office.Common"),
- ::rtl::OUString::createFromAscii("Dictionaries"),
- ::rtl::OUString::createFromAscii("RepositoryURL"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dictionaries")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepositoryURL")),
::rtl::OUString());
if ( xSystemShell.is() && sTemplRepoURL.getLength() > 0 )
@@ -879,10 +972,10 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
// read locale from configuration
::rtl::OUString sLocale = getConfigurationStringValue(
- ::rtl::OUString::createFromAscii("org.openoffice.Setup"),
- ::rtl::OUString::createFromAscii("L10N"),
- ::rtl::OUString::createFromAscii("ooLocale"),
- ::rtl::OUString::createFromAscii("en-US"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
aURLBuf.append( sLocale );
xSystemShell->execute(
@@ -912,12 +1005,12 @@ 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& )
{
- DBG_ERROR( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
+ OSL_FAIL( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
}
}
break;
@@ -1152,13 +1245,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;
@@ -1182,13 +1275,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;
@@ -1240,7 +1333,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
{
const sal_uInt16 *pRanges = rSet.GetRanges();
- DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
+ DBG_ASSERT(pRanges && *pRanges, "Set without Region");
while ( *pRanges )
{
for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
@@ -1270,3 +1363,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 9ffb48e1b34a..193834d44ed5 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.
@@ -135,7 +136,6 @@ using namespace ::com::sun::star::io;
#include <ownsubfilterservice.hxx>
#include "SfxDocumentMetaData.hxx"
-#define FRAMELOADER_SERVICENAME "com.sun.star.frame.FrameLoader"
#define PROTOCOLHANDLER_SERVICENAME "com.sun.star.frame.ProtocolHandler"
static char const sTemplateRegionName[] = "TemplateRegionName";
@@ -145,6 +145,7 @@ static char const sOpenNewView[] = "OpenNewView";
static char const sViewId[] = "ViewId";
static char const sPluginMode[] = "PluginMode";
static char const sReadOnly[] = "ReadOnly";
+static char const sDdeReconnect[] = "DDEReconnect";
static char const sStartPresentation[] = "StartPresentation";
static char const sFrameName[] = "FrameName";
static char const sMediaType[] = "MediaType";
@@ -219,7 +220,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aStr( "No creator method for item: ");
aStr += ByteString::CreateFromInt32( nSlotId );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#endif
return;
}
@@ -243,7 +244,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += pSlot->pUnoName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -253,7 +254,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
// for a simple property there can be only one parameter and its name *must* match
ByteString aStr( "Property name does not match: ");
aStr += ByteString( aName, RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
else
@@ -296,7 +297,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aDbgStr( "Property not convertable: ");
aDbgStr += pSlot->pUnoName;
- DBG_ERROR( aDbgStr.GetBuffer() );
+ OSL_FAIL( aDbgStr.GetBuffer() );
}
#endif
break;
@@ -309,7 +310,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
// there was a parameter with a name that didn't match to any of the members
ByteString aStr( "Property name does not match: ");
aStr += ByteString( String(rPropValue.Name), RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -337,7 +338,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aStr( "No creator method for argument: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#endif
return;
}
@@ -367,7 +368,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
break;
@@ -396,7 +397,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -435,7 +436,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aDbgStr( "Property not convertable: ");
aDbgStr += rArg.pName;
- DBG_ERROR( aDbgStr.GetBuffer() );
+ OSL_FAIL( aDbgStr.GetBuffer() );
#endif
}
@@ -608,6 +609,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
if (bOK)
rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) );
}
+ else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDdeReconnect)) )
+ {
+ sal_Bool bVal = sal_True;
+ sal_Bool bOK = (rProp.Value >>= bVal);
+ DBG_ASSERT( bOK, "invalid type for DDEReconnect" );
+ if (bOK)
+ rSet.Put( SfxBoolItem( SID_DDE_RECONNECT_ONLOAD, bVal ) );
+ }
else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sStartPresentation)) )
{
sal_Bool bVal = sal_False;
@@ -875,7 +884,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 +906,6 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
}
}
}
- // <--
#ifdef DB_UTIL
if ( nFoundArgs == nCount )
{
@@ -953,7 +961,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
// we will not rely on the "toggle" ability of some property slots
ByteString aStr( "Processing property slot without argument: ");
aStr += ByteString::CreateFromInt32( nSlotId );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
@@ -1027,6 +1035,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 )
@@ -1266,13 +1276,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
sal_uInt16 nSubCount = pType->nAttribs;
if ( !nSubCount )
{
- //rPool.FillVariable( *pItem, *pVar, eUserMetric );
pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ;
if ( !pItem->QueryValue( pValue[nActProp].Value ) )
{
ByteString aStr( "Item not convertable: ");
aStr += ByteString::CreateFromInt32(nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
else
@@ -1280,7 +1289,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
// complex type, add a property value for every member of the struct
for ( sal_uInt16 n=1; n<=nSubCount; ++n )
{
- //rPool.FillVariable( *pItem, *pVar, eUserMetric );
sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[n-1].nAID;
if ( bConvertTwips )
nSubId |= CONVERT_TWIPS;
@@ -1296,7 +1304,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
aStr += ByteString::CreateFromInt32( pType->aAttrib[n-1].nAID );
aStr += " not convertable in slot: ";
aStr += ByteString::CreateFromInt32(nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
}
@@ -1317,13 +1325,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
sal_uInt16 nSubCount = rArg.pType->nAttribs;
if ( !nSubCount )
{
- //rPool.FillVariable( *pItem, *pVar, eUserMetric );
pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ;
if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
{
ByteString aStr( "Item not convertable: ");
aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
else
@@ -1331,7 +1338,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
// complex type, add a property value for every member of the struct
for ( sal_uInt16 n = 1; n <= nSubCount; ++n )
{
- //rPool.FillVariable( rItem, *pVar, eUserMetric );
sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
if ( bConvertTwips )
nSubId |= CONVERT_TWIPS;
@@ -1347,7 +1353,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
aStr += ByteString::CreateFromInt32( rArg.pType->aAttrib[n-1].nAID );
aStr += " not convertable in slot: ";
aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
}
@@ -1423,13 +1429,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sFrame));
if ( pItem->ISA( SfxUsrAnyItem ) )
{
- OSL_ENSURE( false, "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
+ OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
pValue[nActProp++].Value = static_cast< const SfxUsrAnyItem* >( pItem )->GetValue();
}
else if ( pItem->ISA( SfxUnoFrameItem ) )
pValue[nActProp++].Value <<= static_cast< const SfxUnoFrameItem* >( pItem )->GetFrame();
else
- OSL_ENSURE( false, "TransformItems: invalid item type for SID_FILLFRAME!" );
+ OSL_FAIL( "TransformItems: invalid item type for SID_FILLFRAME!" );
}
if ( rSet.GetItemState( SID_TEMPLATE, sal_False, &pItem ) == SFX_ITEM_SET )
{
@@ -1456,6 +1462,11 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sReadOnly));
pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() );
}
+ if ( rSet.GetItemState( SID_DDE_RECONNECT_ONLOAD, sal_False, &pItem ) == SFX_ITEM_SET )
+ {
+ pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sDdeReconnect));
+ pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() );
+ }
if ( rSet.GetItemState( SID_DOC_STARTPRESENTATION, sal_False, &pItem ) == SFX_ITEM_SET )
{
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sStartPresentation));
@@ -1688,7 +1699,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 +1744,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;
@@ -1980,7 +1991,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();
@@ -2015,7 +2026,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 )
@@ -2159,7 +2170,6 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
//=============================================================================
// Add new macro line to handle new service.
- //
// !!! ATTENTION !!!
// Write no ";" at end of line and dont forget "else" ! (see macro)
//=============================================================================
@@ -2177,13 +2187,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 )
@@ -2195,6 +2198,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() )
@@ -2396,3 +2409,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 2af0e9c179e2..3ce4d0ee5a00 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,21 +29,14 @@
// 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>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#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"
@@ -219,8 +213,8 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
SfxChildWinFactory* pFact=0;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
- // Zuerst ChildWindow im SDT suchen; "Uberlagerungen m"ussen mit einem
- // ChildWindowContext realisiert werden
+ // First search for ChildWindow in SDT; "Overloading has to be realized
+ // by using ChildWindowContext
SfxApplication *pApp = SFX_APP();
{
SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
@@ -282,12 +276,12 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
if ( pChild )
pChild->SetFactory_Impl( pFact );
- DBG_ASSERT(pFact && (pChild || !rInfo.bVisible), "ChildWindow-Typ nicht registriert!");
+ DBG_ASSERT(pFact && (pChild || !rInfo.bVisible), "ChildWindow-Typ not registered!");
if ( pChild && !pChild->pWindow )
{
DELETEZ(pChild);
- DBG_WARNING("ChildWindow hat kein Fenster!");
+ DBG_WARNING("ChildWindow has no Window!");
}
return pChild;
@@ -311,8 +305,6 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
}
SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nID ) );
- // aWinOpt.SetPosition( rInfo.aPos.X(), rInfo.aPos.Y() );
- // aWinOpt.SetSize( rInfo.aSize.Width(), rInfo.aSize.Height() );
aWinOpt.SetWindowState( String( rInfo.aWinState, RTL_TEXTENCODING_UTF8 ) );
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
@@ -378,43 +370,6 @@ sal_uInt16 SfxChildWindow::GetPosition()
return pImp->pFact->nPos;
}
-#if 0
-static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr )
-{
- sal_uIntPtr 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 )
{
@@ -433,19 +388,18 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
String aWinData( aTmp );
rInfo.aWinState = ByteString( String(aWinOpt.GetWindowState()), RTL_TEXTENCODING_UTF8 );
- //ImplWindowStateFromStr( rInfo.aPos, rInfo.aSize, ByteString( aWinState, RTL_TEXTENCODING_UTF8 ) );
if ( aWinData.Len() )
{
- // Nach Versionskennung suchen
+ // Search for version ID
if ( aWinData.GetChar((sal_uInt16)0) != 0x0056 ) // 'V' = 56h
- // Keine Versionskennung, daher nicht verwenden
+ // A version ID, so do not use
return;
- // 'V' l"oschen
+ // Delete 'V'
aWinData.Erase(0,1);
- // Version lesen
+ // Read version
char cToken = ',';
sal_uInt16 nPos = aWinData.Search( cToken );
sal_uInt16 nActVersion = (sal_uInt16)aWinData.Copy( 0, nPos + 1 ).ToInt32();
@@ -454,10 +408,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
aWinData.Erase(0,nPos+1);
- //aWinOpt.GetPosition( rInfo.aPos.X(), rInfo.aPos.Y() );
- //aWinOpt.GetSize( rInfo.aSize.Width(), rInfo.aSize.Height() );
-
- // Sichtbarkeit laden: ist als ein char codiert
+ // Load Visibility: is coded as a char
rInfo.bVisible = (aWinData.GetChar(0) == 0x0056); // 'V' = 56h
aWinData.Erase(0,1);
nPos = aWinData.Search( cToken );
@@ -466,7 +417,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
sal_uInt16 nNextPos = aWinData.Search( cToken, 2 );
if ( nNextPos != STRING_NOTFOUND )
{
- // es gibt noch Extra-Information
+ // there is extra information
rInfo.nFlags = (sal_uInt16)aWinData.Copy( nPos+1, nNextPos - nPos - 1 ).ToInt32();
aWinData.Erase( nPos, nNextPos-nPos+1 );
rInfo.aExtraString = aWinData;
@@ -495,7 +446,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
pFact = rFactories[nFactory];
if ( pFact->nId == GetType() )
{
- DBG_ASSERT( pFact->pArr, "Kein Kontext angemeldet!" );
+ DBG_ASSERT( pFact->pArr, "No context registered!" );
if ( !pFact->pArr )
break;
@@ -527,7 +478,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
pFact = rFactories[nFactory];
if ( pFact->nId == GetType() )
{
- DBG_ASSERT( pFact->pArr, "Kein Kontext angemeldet!" );
+ DBG_ASSERT( pFact->pArr, "No context registered!" );
if ( !pFact->pArr )
break;
@@ -552,7 +503,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
if ( !pCon )
{
- DBG_ERROR( "Kein geeigneter Context gefunden!" );
+ OSL_FAIL( "No suitable context found! ");
return;
}
@@ -587,7 +538,7 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
}
else
{
- DBG_ERROR("Kein FloatingWindow-Context!");
+ OSL_FAIL("No FloatingWindow-Context!");
return NULL;
}
}
@@ -661,7 +612,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
sal_uInt16 *pPos
) const
{
- // ung"ultig?
+ // invalid?
if ( !aExtraString.Len() )
return sal_False;
String aStr;
@@ -669,8 +620,8 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
if ( nPos == STRING_NOTFOUND )
return sal_False;
- // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn
- // er nicht vorhanden ist, liegt eine "altere Version vor
+ // Try to read the alignment string "ALIGN :(...)", but if
+ // it is not present, then use an older version
if ( nPos != STRING_NOTFOUND )
{
sal_uInt16 n1 = aExtraString.Search('(', nPos);
@@ -679,20 +630,20 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
sal_uInt16 n2 = aExtraString.Search(')', n1);
if ( n2 != STRING_NOTFOUND )
{
- // Alignment-String herausschneiden
+ // Cut out Alignment string
aStr = aExtraString.Copy(nPos, n2 - nPos + 1);
aStr.Erase(nPos, n1-nPos+1);
}
}
}
- // Zuerst das Alignment extrahieren
+ // First extract the Alignment
if ( !aStr.Len() )
return sal_False;
if ( pAlign )
*pAlign = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
- // Dann das LastAlignment
+ // then the LastAlignment
nPos = aStr.Search(',');
if ( nPos == STRING_NOTFOUND )
return sal_False;
@@ -700,10 +651,10 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
if ( pLastAlign )
*pLastAlign = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
- // Dann die Splitting-Informationen
+ // Then the splitting information
nPos = aStr.Search(',');
if ( nPos == STRING_NOTFOUND )
- // Dockt nicht in einem Splitwindow
+ // No docking in a Splitwindow
return sal_True;
aStr.Erase(0, nPos+1);
Point aChildPos;
@@ -747,8 +698,6 @@ void SfxChildWindow::Hide()
}
}
-
-
void SfxChildWindow::Show( sal_uInt16 nFlags )
{
switch ( pWindow->GetType() )
@@ -777,20 +726,14 @@ void SfxChildWindow::SetWorkWindow_Impl( SfxWorkWindow* pWin )
pImp->pWorkWin->SetActiveChild_Impl( pWindow );
}
-//SfxWorkWindow* SfxChildWindow::GetWorkWindow_Impl() const
-//{
-// return pImp->pWorkWin;
-//}
-
void SfxChildWindow::Activate_Impl()
{
- if(pImp->pWorkWin!=NULL) //@#60568#
+ if(pImp->pWorkWin!=NULL)
pImp->pWorkWin->SetActiveChild_Impl( pWindow );
}
void SfxChildWindow::Deactivate_Impl()
{
-// pImp->pWorkWin->SetActiveChild_Impl( NULL );
}
sal_Bool SfxChildWindow::QueryClose()
@@ -853,3 +796,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/dde.hrc b/sfx2/source/appl/dde.hrc
index d3e178606809..d3e178606809 100644..100755
--- a/sfx2/source/appl/dde.hrc
+++ b/sfx2/source/appl/dde.hrc
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index a2b29344f52c..95d32df52f1a 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.
@@ -109,9 +110,9 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
case FILETYPE_TEXT:
if( FORMAT_FILE == nFmt )
{
- // das Medium muss in der Applikation geoffnet werden, um die
- // relativen Datei Links aufzuloesen!!!! Wird ueber den
- // LinkManager und damit von dessen Storage erledigt.
+ // The media in the application must be opened to lookup the
+ // relative file links!! This is done through the link manager
+ // of the Storage.
rData <<= rtl::OUString( sFileNm );
}
break;
@@ -126,20 +127,15 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
{
Graphic aGrf;
- //JP 15.07.98: Bug 52959
- // falls das Nativformat doch erwuenscht ist, muss am
- // Ende das Flag zurueckgesetzt werden.
-// wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
-// GraphicNode entfernt wird.
+ // If the native format is reqested, has to be reset at the
+ // end of the flag. Is solely in the sw/ndgrf.cxx used when
+ // the link is removed form GraphicNode.
sal_Bool bOldNativFormat = bNativFormat;
-//!!?? bNativFormat = 0 != (ASPECT_ICON & pSvData->GetAspect());
- // falls gedruckt werden soll, warten wir bis die
- // Daten vorhanden sind
+ // If about to print, waiting for the data to be available
if( bGetSynchron )
{
- // testhalber mal ein LoadFile rufen um das nach-
- // laden ueberahaupt anzustossen
+ // call a LoadFile every second time to test the loading
if( !xMed.Is() )
LoadFile_Impl();
@@ -155,13 +151,10 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
}
if( pDownLoadData ||
- ( !bWaitForData && ( xMed.Is() || // wurde als URL geladen
+ ( !bWaitForData && ( xMed.Is() || // was loaded as URL
( bSynchron && LoadFile_Impl() && xMed.Is() ) )) )
{
- // falls
-
- // falls es uebers Internet gesogen wurde, nicht
- // wieder versuchen
+ // If it was loaded from the Internet, do not retry
if( !bGetSynchron )
bLoadAgain = !xMed->IsRemote();
bLoadError = !GetGraphic_Impl( aGrf, xMed->GetInStream() );
@@ -196,7 +189,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
break;
default:
- if( aGrf.GetGDIMetaFile().GetActionCount() )
+ if( aGrf.GetGDIMetaFile().GetActionSize() )
{
GDIMetaFile aMeta( aGrf.GetGDIMetaFile() );
aMeta.Write( aMemStm );
@@ -207,7 +200,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
bNativFormat = bOldNativFormat;
- // alles fertig?
+ // Everything ready?
if( xMed.Is() && !bSynchron && bClearMedium )
{
xMed.Clear();
@@ -224,16 +217,12 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
return sal_True/*0 != aTypeList.Count()*/;
}
-
-
-
sal_Bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
{
if( !pLink || !pLink->GetLinkManager() )
return sal_False;
- // teste doch mal, ob nicht ein anderer Link mit der gleichen
- // Verbindung schon existiert
+ // Test if not another link of the same connection already exists
pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sFileNm, 0, &sFilter );
if( OBJECT_CLIENT_GRF == pLink->GetObjType() )
@@ -271,26 +260,24 @@ sal_Bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
SetUpdateTimeout( 0 );
- // und jetzt bei diesem oder gefundenem Pseudo-Object anmelden
+ // and now register by this or other found Pseudo-Object
AddDataAdvise( pLink, SotExchange::GetFormatMimeType( pLink->GetContentType()), 0 );
return sal_True;
}
-
sal_Bool SvFileObject::LoadFile_Impl()
{
- // wir sind noch im Laden!!
+ // We are still at Loading!!
if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
return sal_False;
- // z.Z. nur auf die aktuelle DocShell
+ // at the moment on the current DocShell
xMed = new SfxMedium( sFileNm, STREAM_STD_READ, sal_True );
SvLinkSource::StreamToLoadFrom aStreamToLoadFrom =
getStreamToLoadFrom();
xMed->setStreamToLoadFrom(
aStreamToLoadFrom.m_xInputStreamToLoadFrom,
aStreamToLoadFrom.m_bIsReadOnly);
- // setStreamToLoadFrom(0,0);
if( sReferer.Len() )
xMed->SetReferer( sReferer );
@@ -307,7 +294,7 @@ sal_Bool SvFileObject::LoadFile_Impl()
bClearMedium = !xMed.Is();
if( bClearMedium )
- xMed = xTmpMed; // falls gleich im DownLoad schon schluss ist
+ xMed = xTmpMed; // If already finished in DownLoad
return bDataReady;
}
@@ -317,7 +304,7 @@ sal_Bool SvFileObject::LoadFile_Impl()
bLoadAgain = !xMed->IsRemote();
bWaitForData = sal_False;
- // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
+ // Graphic is finished, also send DataChanged of the Status change:
SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
return sal_True;
@@ -326,32 +313,32 @@ sal_Bool SvFileObject::LoadFile_Impl()
sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
{
- GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+ GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
- const sal_uInt16 nFilter = sFilter.Len() && pGF->GetImportFormatCount()
- ? pGF->GetImportFormatNumber( sFilter )
+ const sal_uInt16 nFilter = sFilter.Len() && rGF.GetImportFormatCount()
+ ? rGF.GetImportFormatNumber( sFilter )
: GRFILTER_FORMAT_DONTKNOW;
String aEmptyStr;
int nRes;
- // vermeiden, dass ein native Link angelegt wird
+ // To avoid that a native link is created
if( ( !pStream || !pDownLoadData ) && !rGrf.IsLink() &&
!rGrf.GetContext() && !bNativFormat )
rGrf.SetLink( GfxLink() );
if( !pStream )
nRes = xMed.Is() ? GRFILTER_OPENERROR
- : pGF->ImportGraphic( rGrf, INetURLObject(sFileNm),
+ : rGF.ImportGraphic( rGrf, INetURLObject(sFileNm),
nFilter );
else if( !pDownLoadData )
{
pStream->Seek( STREAM_SEEK_TO_BEGIN );
- nRes = pGF->ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
+ nRes = rGF.ImportGraphic( rGrf, aEmptyStr, *pStream, nFilter );
}
else
{
- nRes = pGF->ImportGraphic( pDownLoadData->aGrf, aEmptyStr,
+ nRes = rGF.ImportGraphic( pDownLoadData->aGrf, aEmptyStr,
*pStream, nFilter );
if( pDownLoadData )
@@ -364,14 +351,13 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
if( !pDownLoadData->aGrf.GetContext() )
{
xMed->SetDataAvailableLink( Link() );
-// xMed->SetDoneLink( Link() );
delete pDownLoadData, pDownLoadData = 0;
bDataReady = sal_True;
bWaitForData = sal_False;
}
else if( sal_False )
{
- // Timer aufsetzen, um zurueck zukehren
+ // Set up Timer, to return back
pDownLoadData->aTimer.Start();
}
}
@@ -385,14 +371,14 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
{
if( xMed.Is() && !pStream )
{
- DBG_WARNING3( "GrafikFehler [%d] - [%s] URL[%s]",
+ DBG_WARNING3( "Graphic error [%d] - [%s] URL[%s]",
nRes,
xMed->GetPhysicalName().GetBuffer(),
sFileNm.GetBuffer() );
}
else
{
- DBG_WARNING2( "GrafikFehler [%d] - [%s]",
+ DBG_WARNING2( "Graphic error [%d] - [%s]",
nRes, sFileNm.GetBuffer() );
}
}
@@ -418,7 +404,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 +421,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() );
}
}
}
@@ -459,7 +445,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
{
case OBJECT_CLIENT_GRF:
{
- nType = FILETYPE_GRF; // falls noch nicht gesetzt
+ nType = FILETYPE_GRF; // If not set already
SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK));
aDlg.EnableLink(sal_False);
@@ -518,19 +504,18 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
{
- // wenn wir von hier kommen, kann es kein Fehler mehr sein
+ // When we come form here there it can not be an error no more.
pThis->bLoadError = sal_False;
pThis->bWaitForData = sal_False;
pThis->bInCallDownLoad = sal_False;
if( !pThis->bInNewData && !pThis->bDataReady )
{
- // Grafik ist fertig, also DataChanged von der Status-
- // aederung schicken:
+ // Graphic is finished, also send DataChanged from Status change
pThis->bDataReady = sal_True;
pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
- // und dann nochmal die Daten senden
+ // and then send the data again
pThis->NotifyDataChanged();
}
@@ -563,7 +548,7 @@ IMPL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef*, pDelMed )
IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
{
- // wenn wir von hier kommen, kann es kein Fehler mehr sein
+ // When we come form here there it can not be an error no more.
if( pThis->bInNewData )
return 0;
@@ -574,13 +559,11 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
{
pThis->pDownLoadData = new Impl_DownLoadData(
STATIC_LINK( pThis, SvFileObject, LoadGrfNewData_Impl ) );
-
- // Null-Link setzen, damit keine temporaeren Grafiken
- // rausgeswapt werden; der Filter prueft, ob schon
- // ein Link gesetzt ist => falls dies zutrifft, wird
- // _kein_ neuer Link gesetzt; der Link muss hier gesetzt werden,
- // (bevor das erste Mal gefiltert wird), um zu verhindern,
- // dass der Kontext zurueckgesetzt wird (aynchrones Laden)
+ // Set Zero-link, so that no temporary graphics can be swapped out,
+ // the filter checks whether a link is set already => if so, is _no_
+ // new link set, the link here must be set (before it is first
+ // filtered), to prevent, that the context will be reset
+ // (aynchronous loading)
if( !pThis->bNativFormat )
{
static GfxLink aDummyLink;
@@ -596,7 +579,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
if( ERRCODE_IO_PENDING == pStrm->GetError() )
pStrm->ResetError();
- // im DataChanged ein DataReady?
+ // a DataReady in DataChanged?
else if( pThis->bWaitForData && pThis->pDownLoadData )
{
pThis->bLoadError = sal_True;
@@ -605,8 +588,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
if( pThis->bDataReady )
{
- // Grafik ist fertig, also DataChanged von der Status-
- // aederung schicken:
+ // Graphic is finished, also send DataChanged from Status change
pThis->SendStateChg_Impl( pStrm->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
}
@@ -640,14 +622,14 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
return 0;
}
-/* [Beschreibung]
+/* [Description]
+
+ The method determines whether the data-object can be read from a DDE.
- 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
+ The following can be returned:
+ ERRCODE_NONE if it has been completely read
+ ERRCODE_SO_PENDING if it has not been completely read
+ ERRCODE_SO_FALSE otherwise
*/
sal_Bool SvFileObject::IsPending() const
{
@@ -680,10 +662,10 @@ sal_Bool SvFileObject::IsDataComplete() const
void SvFileObject::CancelTransfers()
{
- // und aus dem Cache austragen, wenn man mitten im Laden ist
+ // unsubscribe from the cache if in the middle of loading
if( !bDataReady )
{
- // nicht noch mal aufsetzen
+ // Do not set-up again
bLoadAgain = sal_False;
bDataReady = bLoadError = bWaitForData = sal_True;
SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
@@ -704,3 +686,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 0510f38092bd..ceb0f14ea1bc 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.
@@ -82,8 +83,7 @@ public:
virtual sal_Bool Connect( sfx2::SvBaseLink* );
virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl );
- // erfrage ob das man direkt auf die Daten zugreifen kann oder ob das
- // erst angestossen werden muss
+ // Ask whether you can access data directly or whether it has to be triggered
virtual sal_Bool IsPending() const;
virtual sal_Bool IsDataComplete() const;
@@ -93,3 +93,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 1909bcac2e17..60ae5499cc8e 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 2e1128aea277..4a7a2f5c0254 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 b9d1e7b17b63..f99c054a3063 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 4f24ecb21355..26f0117aa566 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 ( sal_uInt16 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;
- sal_uIntPtr nCount = m_pHistory->Count();
+
+ size_t nCount = m_pHistory->size();
if ( nCount && m_nCurPos < ( nCount - 1 ) )
{
- for ( sal_uIntPtr 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 ), ((sal_uIntPtr)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 ) );
}
@@ -159,9 +169,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
if ( m_xSlaveDispatcher.is() )
xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags );
- // INetURLObject aObj( aURL.Complete );
- // sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
- sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+ sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
if ( bHelpURL )
{
@@ -257,7 +265,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 +273,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();
}
}
sal_uIntPtr 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 +341,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 5a6f0d024c20..e912fcdf2364 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>
@@ -38,8 +37,8 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <tools/link.hxx>
+#include <vector>
struct HelpHistoryEntry_Impl
{
@@ -50,7 +49,7 @@ struct HelpHistoryEntry_Impl
aURL( rURL ), aViewData(rViewData) {}
};
-DECLARE_LIST(HelpHistoryList_Impl,HelpHistoryEntry_Impl*)
+typedef ::std::vector< HelpHistoryEntry_Impl* > HelpHistoryList_Impl;
class SfxHelpWindow_Impl;
class HelpIn