sw/inc/poolfmt.hxx | 26 +++++++++++-----------
sw/source/core/doc/DocumentStylePoolManager.cxx | 28 ++++++++++++------------
sw/source/core/doc/SwStyleNameMapper.cxx | 24 +++++++++++---------
sw/source/core/doc/poolfmt.cxx | 23 +++++++------------
4 files changed, 49 insertions(+), 52 deletions(-)
New commits:
commit 1fefb68a916918620f0bad7c879ff805c416bec4
Author: Kira Tubo <kira.t...@gmail.com>
AuthorDate: Fri Aug 23 22:00:53 2024 -0700
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon Aug 26 10:38:07 2024 +0200
tdf#153722 Move Headings from "Text Styles" to "Document Structure"
In Paragraph Styles, move "Heading" and "Heading [1-10]" from "Text Styles"
to "Document Structure"
Change-Id: Ie8bbfa7d3f31e68f1c2579ec2acaded3bfe37397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172340
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 4f017de21d3a..7d82c0c02108 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -257,19 +257,6 @@ RES_POOLCOLL_SIGNATURE,
///< Signature.
RES_POOLCOLL_CONFRONTATION, ///< List indent.
RES_POOLCOLL_MARGINAL, ///< Marginalia.
-/// Subgroup headings.
-RES_POOLCOLL_HEADLINE_BASE, ///< Base heading.
-RES_POOLCOLL_HEADLINE1, ///< Heading 1.
-RES_POOLCOLL_HEADLINE2, ///< Heading 2.
-RES_POOLCOLL_HEADLINE3, ///< Heading 3.
-RES_POOLCOLL_HEADLINE4, ///< Heading 4.
-RES_POOLCOLL_HEADLINE5, ///< Heading 5.
-RES_POOLCOLL_HEADLINE6, ///< Heading 6.
-RES_POOLCOLL_HEADLINE7, ///< Heading 7.
-RES_POOLCOLL_HEADLINE8, ///< Heading 8.
-RES_POOLCOLL_HEADLINE9, ///< Heading 9.
-RES_POOLCOLL_HEADLINE10, ///< Heading 10.
-
RES_POOLCOLL_TEXT_END,
/// Group lists.
@@ -426,6 +413,19 @@ RES_POOLCOLL_DOC_TITLE = RES_POOLCOLL_DOC_BEGIN,
///< Doc. title.
RES_POOLCOLL_DOC_SUBTITLE, ///< Doc. subtitle.
RES_POOLCOLL_DOC_APPENDIX, ///< Doc. appendix.
+/// Subgroup headings.
+RES_POOLCOLL_HEADLINE_BASE, ///< Base heading.
+RES_POOLCOLL_HEADLINE1, ///< Heading 1.
+RES_POOLCOLL_HEADLINE2, ///< Heading 2.
+RES_POOLCOLL_HEADLINE3, ///< Heading 3.
+RES_POOLCOLL_HEADLINE4, ///< Heading 4.
+RES_POOLCOLL_HEADLINE5, ///< Heading 5.
+RES_POOLCOLL_HEADLINE6, ///< Heading 6.
+RES_POOLCOLL_HEADLINE7, ///< Heading 7.
+RES_POOLCOLL_HEADLINE8, ///< Heading 8.
+RES_POOLCOLL_HEADLINE9, ///< Heading 9.
+RES_POOLCOLL_HEADLINE10, ///< Heading 10.
+
RES_POOLCOLL_DOC_END,
/// Group HTML-styles.
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 32d1c3db80fc..06909c556ab3 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -295,19 +295,7 @@ const TranslateId STR_POOLCOLL_TEXT_ARY[] =
STR_POOLCOLL_GREETING,
STR_POOLCOLL_SIGNATURE,
STR_POOLCOLL_CONFRONTATION,
- STR_POOLCOLL_MARGINAL,
- // Subcategory Headlines
- STR_POOLCOLL_HEADLINE_BASE,
- STR_POOLCOLL_HEADLINE1,
- STR_POOLCOLL_HEADLINE2,
- STR_POOLCOLL_HEADLINE3,
- STR_POOLCOLL_HEADLINE4,
- STR_POOLCOLL_HEADLINE5,
- STR_POOLCOLL_HEADLINE6,
- STR_POOLCOLL_HEADLINE7,
- STR_POOLCOLL_HEADLINE8,
- STR_POOLCOLL_HEADLINE9,
- STR_POOLCOLL_HEADLINE10
+ STR_POOLCOLL_MARGINAL
};
const TranslateId STR_POOLCOLL_LISTS_ARY[]
@@ -445,7 +433,19 @@ const TranslateId STR_POOLCOLL_DOC_ARY[] =
// Category Chapter/Document
STR_POOLCOLL_DOC_TITLE,
STR_POOLCOLL_DOC_SUBTITLE,
- STR_POOLCOLL_DOC_APPENDIX
+ STR_POOLCOLL_DOC_APPENDIX,
+ // Subcategory Headlines
+ STR_POOLCOLL_HEADLINE_BASE,
+ STR_POOLCOLL_HEADLINE1,
+ STR_POOLCOLL_HEADLINE2,
+ STR_POOLCOLL_HEADLINE3,
+ STR_POOLCOLL_HEADLINE4,
+ STR_POOLCOLL_HEADLINE5,
+ STR_POOLCOLL_HEADLINE6,
+ STR_POOLCOLL_HEADLINE7,
+ STR_POOLCOLL_HEADLINE8,
+ STR_POOLCOLL_HEADLINE9,
+ STR_POOLCOLL_HEADLINE10
};
const TranslateId STR_POOLCOLL_HTML_ARY[] =
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index ae582cb3a76b..b375b5ab3ad0 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -472,17 +472,7 @@ const std::vector<OUString>&
SwStyleNameMapper::GetTextProgNameArray()
u"Signature"_ustr,
u"List Indent"_ustr, // RES_POOLCOLL_CONFRONTATION
u"Marginalia"_ustr,
- u"Heading"_ustr,
- u"Heading 1"_ustr,
- u"Heading 2"_ustr,
- u"Heading 3"_ustr,
- u"Heading 4"_ustr,
- u"Heading 5"_ustr,
- u"Heading 6"_ustr,
- u"Heading 7"_ustr,
- u"Heading 8"_ustr,
- u"Heading 9"_ustr,
- u"Heading 10"_ustr, // RES_POOLCOLL_TEXT_END
+ // RES_POOLCOLL_TEXT_END
};
return s_aTextProgNameArray;
}
@@ -612,6 +602,18 @@ const std::vector<OUString>&
SwStyleNameMapper::GetDocProgNameArray()
u"Title"_ustr, // STR_POCO_PRGM_DOC_TITLE
u"Subtitle"_ustr,
u"Appendix"_ustr,
+ u"Heading"_ustr,
+ u"Heading 1"_ustr,
+ u"Heading 2"_ustr,
+ u"Heading 3"_ustr,
+ u"Heading 4"_ustr,
+ u"Heading 5"_ustr,
+ u"Heading 6"_ustr,
+ u"Heading 7"_ustr,
+ u"Heading 8"_ustr,
+ u"Heading 9"_ustr,
+ u"Heading 10"_ustr,
+ // RES_POOLCOLL_DOC_END
};
return s_aDocProgNameArray;
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index d1adc4421034..ea80ffb266bd 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -201,20 +201,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
case RES_POOLCOLL_TEXT:
case RES_POOLCOLL_GREETING:
case RES_POOLCOLL_SIGNATURE:
- case RES_POOLCOLL_HEADLINE_BASE:
nRet = RES_POOLCOLL_STANDARD; break;
-
- case RES_POOLCOLL_HEADLINE1:
- case RES_POOLCOLL_HEADLINE2:
- case RES_POOLCOLL_HEADLINE3:
- case RES_POOLCOLL_HEADLINE4:
- case RES_POOLCOLL_HEADLINE5:
- case RES_POOLCOLL_HEADLINE6:
- case RES_POOLCOLL_HEADLINE7:
- case RES_POOLCOLL_HEADLINE8:
- case RES_POOLCOLL_HEADLINE9:
- case RES_POOLCOLL_HEADLINE10:
- nRet = RES_POOLCOLL_HEADLINE_BASE; break;
}
break;
@@ -288,7 +275,15 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
break;
case COLL_DOC_BITS:
- nRet = RES_POOLCOLL_HEADLINE_BASE;
+ switch (nId)
+ {
+ case RES_POOLCOLL_HEADLINE_BASE:
+ nRet = RES_POOLCOLL_STANDARD;
+ break;
+ default:
+ nRet = RES_POOLCOLL_HEADLINE_BASE;
+ break;
+ }
break;
case COLL_HTML_BITS:
