diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-20 09:42:58 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-20 18:02:53 +0100 |
| commit | f011e84a75651204f72d61773772f6a30841d18b (patch) | |
| tree | 5c5159193be5ace53f85c6cecfc6ef0d9e2c03b4 /sfx2 | |
| parent | 29c7c90fd26cd04fb1f0ba648609df36ebcc53ff (diff) | |
Partially reverted 786f15e605867668d88ab23d66cabb18f18bdcf9
This dialog is still of some use with some Writer Wizards and templates.
Re-added the dialog, but moved the menu entry to Tools menu in Writer.
The menu entry has not been added back in the other applications.
Conflicts:
sfx2/sdi/appslots.sdi
sfx2/source/appl/appserv.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/docvor.hrc
sfx2/source/doc/docvor.src
Change-Id: I1388d955752e99ab6d39dfc81bb41a97b33bdfcd
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/sdi/appslots.sdi | 5 | ||||
| -rw-r--r-- | sfx2/sdi/sfx.sdi | 25 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 9 |
3 files changed, 39 insertions, 0 deletions
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 59ea5b8ee2c3..aa1da36faebf 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -123,6 +123,11 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] + SID_TEMPLATE_ADDRESSBOKSOURCE // ole(no) api(final/play/rec) + [ + ExecMethod = MiscExec_Impl ; + StateMethod = MiscState_Impl ; + ] SID_ATTR_UNDO_COUNT // ole(no) api(final/play) [ ExecMethod = PropExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 1de3657d17d5..607f2060af38 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -337,6 +337,31 @@ SfxObjectItem AddDirect SID_NEWDOCDIRECT ] //-------------------------------------------------------------------------- +SfxVoidItem AddressBookSource SID_TEMPLATE_ADDRESSBOKSOURCE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_TEMPLATE; +] + +//-------------------------------------------------------------------------- SfxVoidItem AddWatch SID_BASICIDE_ADDWATCH () [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 5b1ad64618bb..4a4fc90f94a5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -45,6 +45,7 @@ #include <comphelper/storagehelper.hxx> #include "comphelper/configurationhelper.hxx" +#include <svtools/addresstemplate.hxx> #include <svtools/miscopt.hxx> #include <svtools/restartdialog.hxx> #include <svl/visitem.hxx> @@ -599,6 +600,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; } + case SID_TEMPLATE_ADDRESSBOKSOURCE: + { + svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory()); + aDialog.Execute(); + bDone = true; + break; + } + #ifndef DISABLE_SCRIPTING case SID_BASICSTOP: StarBASIC::Stop(); |