Merge branch 'feature/template-dialog'

Conflicts:
sfx2/Library_sfx.mk
sfx2/inc/sfx2/sfxcommands.h
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/appl/appserv.cxx
svtools/Library_svt.mk

Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6

2 files changed, 29 insertions, 0 deletions

diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 4fd62fabde65..d3c6eaa64bc7 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -127,6 +127,11 @@ interface Application
         ExecMethod = MiscExec_Impl ;
         StateMethod = MiscState_Impl ;
     ]
+    SID_TEMPLATE_MANAGER // ole(no) api(final/play/rec)
+    [
+        ExecMethod = MiscExec_Impl ;
+        StateMethod = MiscState_Impl ;
+    ]
     SID_ORGANIZER // ole(no) api(final/play/rec)
     [
         ExecMethod = MiscExec_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index f7f9e89586bb..e74731e58574 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4508,6 +4508,30 @@ SfxVoidItem Options SID_OPTIONS
     GroupId = GID_OPTIONS;
 ]
 
+SfxVoidItem TemplateManager SID_TEMPLATE_MANAGER
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = TRUE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_APPLICATION;
+]
+
 //--------------------------------------------------------------------------
 SfxVoidItem Organizer SID_ORGANIZER
 ()