scp2/source/ooo/directory_ooo.scp | 29 ++---------------------------
sfx2/inc/doctempl.hrc | 6 ------
sfx2/source/doc/doctemplates.cxx | 6 ------
3 files changed, 2 insertions(+), 39 deletions(-)
New commits:
commit 5cf31e332ed835fd1755bda133cee7bbc328dc09
Author: Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Wed Sep 28 21:29:55 2022 +0200
Commit: Rafael Lima <rafael.palma.l...@gmail.com>
CommitDate: Sat Oct 1 18:27:56 2022 +0200
tdf#132576 Remove unused template categories
This patch removes the names of template categories that are not used. None
of these template category names are reachable via the Templates Manager nor
via the Save as Template function.
Change-Id: Ic2caf485106134de8554b93b5d6e14bdf7f382e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140610
Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr>
Tested-by: Jenkins
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 71bc2f2f76eb..53dbbe5eec52 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -564,39 +564,14 @@ Directory gid_Dir_Template_Common
DosName = "common";
End
-Directory gid_Dir_Template_Common_Educate
- ParentID = gid_Dir_Template_Common;
- DosName = "educate";
-End
-
-Directory gid_Dir_Template_Common_Finance
- ParentID = gid_Dir_Template_Common;
- DosName = "finance";
-End
-
-Directory gid_Dir_Template_Common_Forms
- ParentID = gid_Dir_Template_Common;
- DosName = "forms";
-End
-
Directory gid_Dir_Template_Common_Internal
ParentID = gid_Dir_Template_Common;
DosName = "internal";
End
-Directory gid_Dir_Template_Common_Labels
- ParentID = gid_Dir_Template_Common;
- DosName = "labels";
-End
-
-Directory gid_Dir_Template_Common_Layout
- ParentID = gid_Dir_Template_Common;
- DosName = "layout";
-End
-
-Directory gid_Dir_Template_Common_Misc
+Directory gid_Dir_Template_Common_Draw
ParentID = gid_Dir_Template_Common;
- DosName = "misc";
+ DosName = "draw";
End
Directory gid_Dir_Template_Common_Officorr
diff --git a/sfx2/inc/doctempl.hrc b/sfx2/inc/doctempl.hrc
index 10a10d0de0c6..1e940cc6e1e2 100644
--- a/sfx2/inc/doctempl.hrc
+++ b/sfx2/inc/doctempl.hrc
@@ -31,13 +31,7 @@ const TranslateId TEMPLATE_LONG_NAMES_ARY[] =
NC_("TEMPLATE_LONG_NAMES_ARY", "Business Correspondence"),
NC_("TEMPLATE_LONG_NAMES_ARY", "Other Business Documents"),
NC_("TEMPLATE_LONG_NAMES_ARY", "Personal Correspondence and Documents"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Forms and Contracts"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Finances"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Education"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Presentation Backgrounds"),
NC_("TEMPLATE_LONG_NAMES_ARY", "Presentations"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Miscellaneous"),
- NC_("TEMPLATE_LONG_NAMES_ARY", "Labels"),
NC_("TEMPLATE_LONG_NAMES_ARY", "Drawings")
};
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 45d7d1015a97..e256b50ded6c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -487,13 +487,7 @@ const char* TEMPLATE_SHORT_NAMES_ARY[] =
"officorr",
"offimisc",
"personal",
- "forms",
- "finance",
- "educate",
- "layout",
"presnt",
- "misc",
- "labels",
"draw"
};
