Revert "Removed list and numbering paragraph styles and related option page"

This reverts commits 359d0fbd03a68d9131e8fb25e7dac9f19ddf6dcb,
6a15a2898b7f822ddfba23553dd127e25af15fff and
21352f88caba9dee73d5a87c8e3724d17ac6b428.

This change is not mature enought: needs more work

5 files changed, 92 insertions, 0 deletions

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 17e919d58f61..1f022a044354 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -206,6 +206,7 @@
 #define TP_LAYOUT_OPT               (RC_GLOBALS_BEGIN +  44)
 #define TP_CONTENT_OPT              (RC_GLOBALS_BEGIN +  45)
 #define TP_HTML_OPT                 (RC_GLOBALS_BEGIN +  46)
+#define TP_STD_FONT                 (RC_GLOBALS_BEGIN +  47)
 #define TP_CONDCOLL                 (RC_GLOBALS_BEGIN +  48)
 
 #define TP_FRM_WRAP                 (RC_GLOBALS_BEGIN +  49)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 9f19b8ea2029..fcabfc6b5b47 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -248,6 +248,7 @@
 #define HID_CHAR_URL                                            "SW_HID_CHAR_URL"
 #define HID_CONTENT_OPT                                         "SW_HID_CONTENT_OPT"
 #define HID_LAYOUT_OPT                                          "SW_HID_LAYOUT_OPT"
+#define HID_STD_FONT                                            "SW_HID_STD_FONT"
 #define HID_COND_COLL                                           "SW_HID_COND_COLL"
 #define HID_FRM_ADD                                             "SW_HID_FRM_ADD"
 #define HID_TABLE_TEXTFLOW                                      "SW_HID_TABLE_TEXTFLOW"
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index f4c35ea9813a..84c060e9c6a5 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -211,6 +211,7 @@ public:
     static char* GetOutlineRuleName() { return pDefOutlineName; }
 
     static sal_uInt16 GetNumIndent( sal_uInt8 nLvl );
+    static sal_uInt16 GetBullIndent( sal_uInt8 nLvl );
 
     SwNumRuleType GetRuleType() const           { return eRuleType; }
     void SetRuleType( SwNumRuleType eNew )      { eRuleType = eNew;
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index 7e552e249447..e68de680c243 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -100,6 +100,49 @@
 
 // Gruppe Listen
 #define STR_POOLCOLL_NUMBUL_BASE        (RC_POOLCOLL_LISTS_BEGIN+  0)
+    // Untergruppe Nummerierung
+#define STR_POOLCOLL_NUM_LEVEL1S        (RC_POOLCOLL_LISTS_BEGIN+  1)
+#define STR_POOLCOLL_NUM_LEVEL1         (RC_POOLCOLL_LISTS_BEGIN+  2)
+#define STR_POOLCOLL_NUM_LEVEL1E        (RC_POOLCOLL_LISTS_BEGIN+  3)
+#define STR_POOLCOLL_NUM_NONUM1         (RC_POOLCOLL_LISTS_BEGIN+  4)
+#define STR_POOLCOLL_NUM_LEVEL2S        (RC_POOLCOLL_LISTS_BEGIN+  5)
+#define STR_POOLCOLL_NUM_LEVEL2         (RC_POOLCOLL_LISTS_BEGIN+  6)
+#define STR_POOLCOLL_NUM_LEVEL2E        (RC_POOLCOLL_LISTS_BEGIN+  7)
+#define STR_POOLCOLL_NUM_NONUM2         (RC_POOLCOLL_LISTS_BEGIN+  8)
+#define STR_POOLCOLL_NUM_LEVEL3S        (RC_POOLCOLL_LISTS_BEGIN+  9)
+#define STR_POOLCOLL_NUM_LEVEL3         (RC_POOLCOLL_LISTS_BEGIN+ 10)
+#define STR_POOLCOLL_NUM_LEVEL3E        (RC_POOLCOLL_LISTS_BEGIN+ 11)
+#define STR_POOLCOLL_NUM_NONUM3         (RC_POOLCOLL_LISTS_BEGIN+ 12)
+#define STR_POOLCOLL_NUM_LEVEL4S        (RC_POOLCOLL_LISTS_BEGIN+ 13)
+#define STR_POOLCOLL_NUM_LEVEL4         (RC_POOLCOLL_LISTS_BEGIN+ 14)
+#define STR_POOLCOLL_NUM_LEVEL4E        (RC_POOLCOLL_LISTS_BEGIN+ 15)
+#define STR_POOLCOLL_NUM_NONUM4         (RC_POOLCOLL_LISTS_BEGIN+ 16)
+#define STR_POOLCOLL_NUM_LEVEL5S        (RC_POOLCOLL_LISTS_BEGIN+ 17)
+#define STR_POOLCOLL_NUM_LEVEL5         (RC_POOLCOLL_LISTS_BEGIN+ 18)
+#define STR_POOLCOLL_NUM_LEVEL5E        (RC_POOLCOLL_LISTS_BEGIN+ 19)
+#define STR_POOLCOLL_NUM_NONUM5         (RC_POOLCOLL_LISTS_BEGIN+ 20)
+
+    // Untergruppe Aufzaehlung
+#define STR_POOLCOLL_BUL_LEVEL1S        (RC_POOLCOLL_LISTS_BEGIN+ 21)
+#define STR_POOLCOLL_BUL_LEVEL1         (RC_POOLCOLL_LISTS_BEGIN+ 22)
+#define STR_POOLCOLL_BUL_LEVEL1E        (RC_POOLCOLL_LISTS_BEGIN+ 23)
+#define STR_POOLCOLL_BUL_NONUM1         (RC_POOLCOLL_LISTS_BEGIN+ 24)
+#define STR_POOLCOLL_BUL_LEVEL2S        (RC_POOLCOLL_LISTS_BEGIN+ 25)
+#define STR_POOLCOLL_BUL_LEVEL2         (RC_POOLCOLL_LISTS_BEGIN+ 26)
+#define STR_POOLCOLL_BUL_LEVEL2E        (RC_POOLCOLL_LISTS_BEGIN+ 27)
+#define STR_POOLCOLL_BUL_NONUM2         (RC_POOLCOLL_LISTS_BEGIN+ 28)
+#define STR_POOLCOLL_BUL_LEVEL3S        (RC_POOLCOLL_LISTS_BEGIN+ 29)
+#define STR_POOLCOLL_BUL_LEVEL3         (RC_POOLCOLL_LISTS_BEGIN+ 30)
+#define STR_POOLCOLL_BUL_LEVEL3E        (RC_POOLCOLL_LISTS_BEGIN+ 31)
+#define STR_POOLCOLL_BUL_NONUM3         (RC_POOLCOLL_LISTS_BEGIN+ 32)
+#define STR_POOLCOLL_BUL_LEVEL4S        (RC_POOLCOLL_LISTS_BEGIN+ 33)
+#define STR_POOLCOLL_BUL_LEVEL4         (RC_POOLCOLL_LISTS_BEGIN+ 34)
+#define STR_POOLCOLL_BUL_LEVEL4E        (RC_POOLCOLL_LISTS_BEGIN+ 35)
+#define STR_POOLCOLL_BUL_NONUM4         (RC_POOLCOLL_LISTS_BEGIN+ 36)
+#define STR_POOLCOLL_BUL_LEVEL5S        (RC_POOLCOLL_LISTS_BEGIN+ 37)
+#define STR_POOLCOLL_BUL_LEVEL5         (RC_POOLCOLL_LISTS_BEGIN+ 38)
+#define STR_POOLCOLL_BUL_LEVEL5E        (RC_POOLCOLL_LISTS_BEGIN+ 39)
+#define STR_POOLCOLL_BUL_NONUM5         (RC_POOLCOLL_LISTS_BEGIN+ 40)
 
 // Sonderbereiche
     // Untergruppe Header
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 3ed8d52ab7f7..cd8596282bd7 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -248,6 +248,52 @@ RES_POOLCOLL_TEXT_END,
 RES_POOLCOLL_LISTS_BEGIN = COLL_LISTS_BITS,
 
 RES_POOLCOLL_NUMBUL_BASE = RES_POOLCOLL_LISTS_BEGIN,    // Base list.
+
+// Subgroup numberings.
+RES_POOLCOLL_NUM_LEVEL1S,                               // Start 1st level.
+RES_POOLCOLL_NUM_LEVEL1,                                // 1st level.
+RES_POOLCOLL_NUM_LEVEL1E,                               // End 1st level.
+RES_POOLCOLL_NUM_NONUM1,                                // No numbering.
+RES_POOLCOLL_NUM_LEVEL2S,                               // Start 2nd level.
+RES_POOLCOLL_NUM_LEVEL2,                                // 2nd level.
+RES_POOLCOLL_NUM_LEVEL2E,                               // End 2nd level.
+RES_POOLCOLL_NUM_NONUM2,                                // No numbering.
+RES_POOLCOLL_NUM_LEVEL3S,                               // Start 3rd level.
+RES_POOLCOLL_NUM_LEVEL3,                                // 3rd level.
+RES_POOLCOLL_NUM_LEVEL3E,                               // End 3rd level.
+RES_POOLCOLL_NUM_NONUM3,                                // No numbering.
+RES_POOLCOLL_NUM_LEVEL4S,                               // Start 4th level.
+RES_POOLCOLL_NUM_LEVEL4,                                // 4th level.
+RES_POOLCOLL_NUM_LEVEL4E,                               // End 4th level.
+RES_POOLCOLL_NUM_NONUM4,                                // No numbering.
+RES_POOLCOLL_NUM_LEVEL5S,                               // Start 5th level.
+RES_POOLCOLL_NUM_LEVEL5,                                // 5th level.
+RES_POOLCOLL_NUM_LEVEL5E,                               // End 5th level.
+RES_POOLCOLL_NUM_NONUM5,                                // No numbering.
+
+
+//Subgroup bullets.
+RES_POOLCOLL_BUL_LEVEL1S,                               // Start 1st level.
+RES_POOLCOLL_BUL_LEVEL1,                                // 1st level.
+RES_POOLCOLL_BUL_LEVEL1E,                               // End 1st level
+RES_POOLCOLL_BUL_NONUM1,                                // No numbering.
+RES_POOLCOLL_BUL_LEVEL2S,                               // Start 2nd level.
+RES_POOLCOLL_BUL_LEVEL2,                                // 2nd level.
+RES_POOLCOLL_BUL_LEVEL2E,                               // End 2nd level.
+RES_POOLCOLL_BUL_NONUM2,                                // No numbering.
+RES_POOLCOLL_BUL_LEVEL3S,                               // Start 3rd level.
+RES_POOLCOLL_BUL_LEVEL3,                                // 3rd Level.
+RES_POOLCOLL_BUL_LEVEL3E,                               // End 3rd level.
+RES_POOLCOLL_BUL_NONUM3,                                // No numbering.
+RES_POOLCOLL_BUL_LEVEL4S,                               // Start 4th level.
+RES_POOLCOLL_BUL_LEVEL4,                                // 4th level.
+RES_POOLCOLL_BUL_LEVEL4E,                               // End 4th level.
+RES_POOLCOLL_BUL_NONUM4,                                // No numbering.
+RES_POOLCOLL_BUL_LEVEL5S,                               // Start 5th level.
+RES_POOLCOLL_BUL_LEVEL5,                                // 5th level.
+RES_POOLCOLL_BUL_LEVEL5E,                               // End 5th Level.
+RES_POOLCOLL_BUL_NONUM5,                                // No numbering.
+
 RES_POOLCOLL_LISTS_END,