sw/inc/comcore.hxx | 2
sw/inc/poolfmt.hxx | 44 ++---
sw/inc/strings.hrc | 44 ++---
sw/inc/swtypes.hxx | 10 -
sw/inc/viewsh.hxx | 2
sw/source/core/doc/DocumentStylePoolManager.cxx | 188 ++++++++++++------------
sw/source/core/doc/SwStyleNameMapper.cxx | 4
sw/source/core/doc/number.cxx | 4
sw/source/core/doc/poolfmt.cxx | 4
sw/source/core/edit/autofmt.cxx | 20 +-
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/pagechg.cxx | 4
sw/source/core/layout/paintfrm.cxx | 20 +-
sw/source/core/tox/tox.cxx | 2
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/view/viewsh.cxx | 10 -
sw/source/filter/html/css1atr.cxx | 10 -
sw/source/filter/html/htmlatr.cxx | 34 ++--
sw/source/filter/html/htmlcss1.cxx | 4
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlnum.hxx | 4
sw/source/filter/html/htmlnumreader.cxx | 24 +--
sw/source/filter/html/htmlnumwriter.cxx | 8 -
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/htmltabw.cxx | 2
sw/source/filter/html/swhtml.cxx | 16 +-
sw/source/filter/html/swhtml.hxx | 10 -
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/html/wrthtml.hxx | 10 -
sw/source/filter/ww8/wrtw8sty.cxx | 20 +-
sw/source/ui/config/optpage.cxx | 6
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/misc/num.cxx | 2
sw/source/uibase/app/docshini.cxx | 6
sw/source/uibase/docvw/FrameControlsManager.cxx | 8 -
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 32 ++--
sw/source/uibase/shells/txtcrsr.cxx | 8 -
sw/source/uibase/shells/txtnum.cxx | 2
sw/source/uibase/uiview/view.cxx | 8 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
41 files changed, 294 insertions(+), 294 deletions(-)
New commits:
commit 696689c1da7dd8097a2322548572a0fe44b17c28
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Dec 11 11:23:15 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 11 15:45:36 2019 +0100
num->number and bul->bullet in sw/
make some symbols easier to read
Change-Id: Icb5ea48dce1bcf4ae17e57e8f4c7bec3acd33f82
Reviewed-on: https://gerrit.libreoffice.org/84924
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/comcore.hxx b/sw/inc/comcore.hxx
index 4ef35ae44bf9..6b6230e87268 100644
--- a/sw/inc/comcore.hxx
+++ b/sw/inc/comcore.hxx
@@ -39,7 +39,7 @@
#define STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT 16
#define STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT 17
#define STR_AUTOFMTREDL_SET_TMPL_HEADLINE 18
-#define STR_AUTOFMTREDL_SET_NUMBULLET 19
+#define STR_AUTOFMTREDL_SET_NUMBER_BULLET 19
#define STR_AUTOFMTREDL_DEL_MORELINES 20
#define STR_AUTOFMTREDL_NON_BREAK_SPACE 21
// !!!!!!!!!!!!!!!!!!!!!!!!!! always set the correct end !!!!!!!!!!!!
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 22b075978aff..2f66749e30a9 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -116,7 +116,7 @@ RES_POOLCHR_PAGENO, ///<
Pages/field.
RES_POOLCHR_LABEL, ///< Label.
RES_POOLCHR_DROPCAPS, ///< Dropcaps.
RES_POOLCHR_NUM_LEVEL, ///< Numbering symbols
-RES_POOLCHR_BUL_LEVEL, ///< Bullets.
+RES_POOLCHR_BULLET_LEVEL, ///< Bullets.
RES_POOLCHR_INET_NORMAL, ///< Internet normal.
RES_POOLCHR_INET_VISIT, ///< Internet visited.
@@ -275,7 +275,7 @@ RES_POOLCOLL_TEXT_END,
/// Group lists.
RES_POOLCOLL_LISTS_BEGIN = COLL_LISTS_BITS,
-RES_POOLCOLL_NUMBUL_BASE = RES_POOLCOLL_LISTS_BEGIN, ///< Base list.
+RES_POOLCOLL_NUMBER_BULLET_BASE = RES_POOLCOLL_LISTS_BEGIN, ///< Base list.
/// Subgroup numberings.
RES_POOLCOLL_NUM_LEVEL1S, ///< Start 1st level.
@@ -300,26 +300,26 @@ 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_BULLET_LEVEL1S, ///< Start 1st
level.
+RES_POOLCOLL_BULLET_LEVEL1, ///< 1st level.
+RES_POOLCOLL_BULLET_LEVEL1E, ///< End 1st level
+RES_POOLCOLL_BULLET_NONUM1, ///< No numbering.
+RES_POOLCOLL_BULLET_LEVEL2S, ///< Start 2nd
level.
+RES_POOLCOLL_BULLET_LEVEL2, ///< 2nd level.
+RES_POOLCOLL_BULLET_LEVEL2E, ///< End 2nd level.
+RES_POOLCOLL_BULLET_NONUM2, ///< No numbering.
+RES_POOLCOLL_BULLET_LEVEL3S, ///< Start 3rd
level.
+RES_POOLCOLL_BULLET_LEVEL3, ///< 3rd Level.
+RES_POOLCOLL_BULLET_LEVEL3E, ///< End 3rd level.
+RES_POOLCOLL_BULLET_NONUM3, ///< No numbering.
+RES_POOLCOLL_BULLET_LEVEL4S, ///< Start 4th
level.
+RES_POOLCOLL_BULLET_LEVEL4, ///< 4th level.
+RES_POOLCOLL_BULLET_LEVEL4E, ///< End 4th level.
+RES_POOLCOLL_BULLET_NONUM4, ///< No numbering.
+RES_POOLCOLL_BULLET_LEVEL5S, ///< Start 5th
level.
+RES_POOLCOLL_BULLET_LEVEL5, ///< 5th level.
+RES_POOLCOLL_BULLET_LEVEL5E, ///< End 5th Level.
+RES_POOLCOLL_BULLET_NONUM5, ///< No numbering.
RES_POOLCOLL_LISTS_END,
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index cc421939d2e2..34b5c4b9a5bf 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -29,7 +29,7 @@
#define STR_POOLCHR_LABEL NC_("STR_POOLCHR_LABEL",
"Caption Characters")
#define STR_POOLCHR_DROPCAPS NC_("STR_POOLCHR_DROPCAPS",
"Drop Caps")
#define STR_POOLCHR_NUM_LEVEL NC_("STR_POOLCHR_NUM_LEVEL",
"Numbering Symbols")
-#define STR_POOLCHR_BUL_LEVEL NC_("STR_POOLCHR_BUL_LEVEL",
"Bullets")
+#define STR_POOLCHR_BULLET_LEVEL
NC_("STR_POOLCHR_BULLET_LEVEL", "Bullets")
#define STR_POOLCHR_INET_NORMAL NC_("STR_POOLCHR_INET_NORMAL",
"Internet Link")
#define STR_POOLCHR_INET_VISIT NC_("STR_POOLCHR_INET_VISIT",
"Visited Internet Link")
#define STR_POOLCHR_JUMPEDIT NC_("STR_POOLCHR_JUMPEDIT",
"Placeholder")
@@ -68,7 +68,7 @@
#define STR_POOLCOLL_GREETING NC_("STR_POOLCOLL_GREETING",
"Complimentary Close")
#define STR_POOLCOLL_SIGNATURE NC_("STR_POOLCOLL_SIGNATURE",
"Signature")
#define STR_POOLCOLL_HEADLINE_BASE
NC_("STR_POOLCOLL_HEADLINE_BASE", "Heading")
-#define STR_POOLCOLL_NUMBUL_BASE
NC_("STR_POOLCOLL_NUMBUL_BASE", "List")
+#define STR_POOLCOLL_NUMBER_BULLET_BASE
NC_("STR_POOLCOLL_NUMBER_BULLET_BASE", "List")
#define STR_POOLCOLL_REGISTER_BASE
NC_("STR_POOLCOLL_REGISTER_BASE", "Index")
#define STR_POOLCOLL_CONFRONTATION
NC_("STR_POOLCOLL_CONFRONTATION", "List Indent")
#define STR_POOLCOLL_MARGINAL NC_("STR_POOLCOLL_MARGINAL",
"Marginalia")
@@ -102,26 +102,26 @@
#define STR_POOLCOLL_NUM_LEVEL5 NC_("STR_POOLCOLL_NUM_LEVEL5",
"Numbering 5")
#define STR_POOLCOLL_NUM_LEVEL5E
NC_("STR_POOLCOLL_NUM_LEVEL5E", "Numbering 5 End")
#define STR_POOLCOLL_NUM_NONUM5 NC_("STR_POOLCOLL_NUM_NONUM5",
"Numbering 5 Cont.")
-#define STR_POOLCOLL_BUL_LEVEL1S
NC_("STR_POOLCOLL_BUL_LEVEL1S", "List 1 Start")
-#define STR_POOLCOLL_BUL_LEVEL1 NC_("STR_POOLCOLL_BUL_LEVEL1",
"List 1")
-#define STR_POOLCOLL_BUL_LEVEL1E
NC_("STR_POOLCOLL_BUL_LEVEL1E", "List 1 End")
-#define STR_POOLCOLL_BUL_NONUM1 NC_("STR_POOLCOLL_BUL_NONUM1",
"List 1 Cont.")
-#define STR_POOLCOLL_BUL_LEVEL2S
NC_("STR_POOLCOLL_BUL_LEVEL2S", "List 2 Start")
-#define STR_POOLCOLL_BUL_LEVEL2 NC_("STR_POOLCOLL_BUL_LEVEL2",
"List 2")
-#define STR_POOLCOLL_BUL_LEVEL2E
NC_("STR_POOLCOLL_BUL_LEVEL2E", "List 2 End")
-#define STR_POOLCOLL_BUL_NONUM2 NC_("STR_POOLCOLL_BUL_NONUM2",
"List 2 Cont.")
-#define STR_POOLCOLL_BUL_LEVEL3S
NC_("STR_POOLCOLL_BUL_LEVEL3S", "List 3 Start")
-#define STR_POOLCOLL_BUL_LEVEL3 NC_("STR_POOLCOLL_BUL_LEVEL3",
"List 3")
-#define STR_POOLCOLL_BUL_LEVEL3E
NC_("STR_POOLCOLL_BUL_LEVEL3E", "List 3 End")
-#define STR_POOLCOLL_BUL_NONUM3 NC_("STR_POOLCOLL_BUL_NONUM3",
"List 3 Cont.")
-#define STR_POOLCOLL_BUL_LEVEL4S
NC_("STR_POOLCOLL_BUL_LEVEL4S", "List 4 Start")
-#define STR_POOLCOLL_BUL_LEVEL4 NC_("STR_POOLCOLL_BUL_LEVEL4",
"List 4")
-#define STR_POOLCOLL_BUL_LEVEL4E
NC_("STR_POOLCOLL_BUL_LEVEL4E", "List 4 End")
-#define STR_POOLCOLL_BUL_NONUM4 NC_("STR_POOLCOLL_BUL_NONUM4",
"List 4 Cont.")
-#define STR_POOLCOLL_BUL_LEVEL5S
NC_("STR_POOLCOLL_BUL_LEVEL5S", "List 5 Start")
-#define STR_POOLCOLL_BUL_LEVEL5 NC_("STR_POOLCOLL_BUL_LEVEL5",
"List 5")
-#define STR_POOLCOLL_BUL_LEVEL5E
NC_("STR_POOLCOLL_BUL_LEVEL5E", "List 5 End")
-#define STR_POOLCOLL_BUL_NONUM5 NC_("STR_POOLCOLL_BUL_NONUM5",
"List 5 Cont.")
+#define STR_POOLCOLL_BULLET_LEVEL1S
NC_("STR_POOLCOLL_BULLET_LEVEL1S", "List 1 Start")
+#define STR_POOLCOLL_BULLET_LEVEL1
NC_("STR_POOLCOLL_BULLET_LEVEL1", "List 1")
+#define STR_POOLCOLL_BULLET_LEVEL1E
NC_("STR_POOLCOLL_BULLET_LEVEL1E", "List 1 End")
+#define STR_POOLCOLL_BULLET_NONUM1
NC_("STR_POOLCOLL_BULLET_NONUM1", "List 1 Cont.")
+#define STR_POOLCOLL_BULLET_LEVEL2S
NC_("STR_POOLCOLL_BULLET_LEVEL2S", "List 2 Start")
+#define STR_POOLCOLL_BULLET_LEVEL2
NC_("STR_POOLCOLL_BULLET_LEVEL2", "List 2")
+#define STR_POOLCOLL_BULLET_LEVEL2E
NC_("STR_POOLCOLL_BULLET_LEVEL2E", "List 2 End")
+#define STR_POOLCOLL_BULLET_NONUM2
NC_("STR_POOLCOLL_BULLET_NONUM2", "List 2 Cont.")
+#define STR_POOLCOLL_BULLET_LEVEL3S
NC_("STR_POOLCOLL_BULLET_LEVEL3S", "List 3 Start")
+#define STR_POOLCOLL_BULLET_LEVEL3
NC_("STR_POOLCOLL_BULLET_LEVEL3", "List 3")
+#define STR_POOLCOLL_BULLET_LEVEL3E
NC_("STR_POOLCOLL_BULLET_LEVEL3E", "List 3 End")
+#define STR_POOLCOLL_BULLET_NONUM3
NC_("STR_POOLCOLL_BULLET_NONUM3", "List 3 Cont.")
+#define STR_POOLCOLL_BULLET_LEVEL4S
NC_("STR_POOLCOLL_BULLET_LEVEL4S", "List 4 Start")
+#define STR_POOLCOLL_BULLET_LEVEL4
NC_("STR_POOLCOLL_BULLET_LEVEL4", "List 4")
+#define STR_POOLCOLL_BULLET_LEVEL4E
NC_("STR_POOLCOLL_BULLET_LEVEL4E", "List 4 End")
+#define STR_POOLCOLL_BULLET_NONUM4
NC_("STR_POOLCOLL_BULLET_NONUM4", "List 4 Cont.")
+#define STR_POOLCOLL_BULLET_LEVEL5S
NC_("STR_POOLCOLL_BULLET_LEVEL5S", "List 5 Start")
+#define STR_POOLCOLL_BULLET_LEVEL5
NC_("STR_POOLCOLL_BULLET_LEVEL5", "List 5")
+#define STR_POOLCOLL_BULLET_LEVEL5E
NC_("STR_POOLCOLL_BULLET_LEVEL5E", "List 5 End")
+#define STR_POOLCOLL_BULLET_NONUM5
NC_("STR_POOLCOLL_BULLET_NONUM5", "List 5 Cont.")
#define STR_POOLCOLL_HEADERFOOTER NC_("STR_POOLCOLL_HEADER",
"Header and Footer")
#define STR_POOLCOLL_HEADER NC_("STR_POOLCOLL_HEADER",
"Header")
#define STR_POOLCOLL_HEADERL NC_("STR_POOLCOLL_HEADERL",
"Header Left")
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index fe22c3d5cab2..e83406e8c5e5 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -108,10 +108,10 @@ extern SwPathFinder *pPathFinder;
// (For more levels the values have to be multiplied with the levels+1;
// levels 0 ..4!)
-const short lBullIndent = 1440/4;
-const short lBullFirstLineOffset = -lBullIndent;
-const sal_uInt16 lNumIndent = 1440/4;
-const short lNumFirstLineOffset = -lNumIndent;
+const short lBulletIndent = 1440/4;
+const short lBulletFirstLineOffset = -lBulletIndent;
+const sal_uInt16 lNumberIndent = 1440/4;
+const short lNumberFirstLineOffset = -lNumberIndent;
const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
// Count of SystemField-types of SwDoc.
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index d3b0761128dd..3fdc20e00271 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -305,7 +305,7 @@ static const char* STR_POOLCOLL_TEXT_ARY[] =
static const char* STR_POOLCOLL_LISTS_ARY[]
{
// Category Lists
- STR_POOLCOLL_NUMBUL_BASE,
+ STR_POOLCOLL_NUMBER_BULLET_BASE,
// Subcategory Numbering
STR_POOLCOLL_NUM_LEVEL1S,
STR_POOLCOLL_NUM_LEVEL1,
@@ -329,26 +329,26 @@ static const char* STR_POOLCOLL_LISTS_ARY[]
STR_POOLCOLL_NUM_NONUM5,
// Subcategory Enumeration
- STR_POOLCOLL_BUL_LEVEL1S,
- STR_POOLCOLL_BUL_LEVEL1,
- STR_POOLCOLL_BUL_LEVEL1E,
- STR_POOLCOLL_BUL_NONUM1,
- STR_POOLCOLL_BUL_LEVEL2S,
- STR_POOLCOLL_BUL_LEVEL2,
- STR_POOLCOLL_BUL_LEVEL2E,
- STR_POOLCOLL_BUL_NONUM2,
- STR_POOLCOLL_BUL_LEVEL3S,
- STR_POOLCOLL_BUL_LEVEL3,
- STR_POOLCOLL_BUL_LEVEL3E,
- STR_POOLCOLL_BUL_NONUM3,
- STR_POOLCOLL_BUL_LEVEL4S,
- STR_POOLCOLL_BUL_LEVEL4,
- STR_POOLCOLL_BUL_LEVEL4E,
- STR_POOLCOLL_BUL_NONUM4,
- STR_POOLCOLL_BUL_LEVEL5S,
- STR_POOLCOLL_BUL_LEVEL5,
- STR_POOLCOLL_BUL_LEVEL5E,
- STR_POOLCOLL_BUL_NONUM5
+ STR_POOLCOLL_BULLET_LEVEL1S,
+ STR_POOLCOLL_BULLET_LEVEL1,
+ STR_POOLCOLL_BULLET_LEVEL1E,
+ STR_POOLCOLL_BULLET_NONUM1,
+ STR_POOLCOLL_BULLET_LEVEL2S,
+ STR_POOLCOLL_BULLET_LEVEL2,
+ STR_POOLCOLL_BULLET_LEVEL2E,
+ STR_POOLCOLL_BULLET_NONUM2,
+ STR_POOLCOLL_BULLET_LEVEL3S,
+ STR_POOLCOLL_BULLET_LEVEL3,
+ STR_POOLCOLL_BULLET_LEVEL3E,
+ STR_POOLCOLL_BULLET_NONUM3,
+ STR_POOLCOLL_BULLET_LEVEL4S,
+ STR_POOLCOLL_BULLET_LEVEL4,
+ STR_POOLCOLL_BULLET_LEVEL4E,
+ STR_POOLCOLL_BULLET_NONUM4,
+ STR_POOLCOLL_BULLET_LEVEL5S,
+ STR_POOLCOLL_BULLET_LEVEL5,
+ STR_POOLCOLL_BULLET_LEVEL5E,
+ STR_POOLCOLL_BULLET_NONUM5
};
// Special Areas
@@ -455,7 +455,7 @@ static const char* STR_POOLCHR_ARY[] =
STR_POOLCHR_LABEL,
STR_POOLCHR_DROPCAPS,
STR_POOLCHR_NUM_LEVEL,
- STR_POOLCHR_BUL_LEVEL,
+ STR_POOLCHR_BULLET_LEVEL,
STR_POOLCHR_INET_NORMAL,
STR_POOLCHR_INET_VISIT,
STR_POOLCHR_JUMPEDIT,
@@ -787,7 +787,7 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
}
break;
- case RES_POOLCOLL_NUMBUL_BASE: // Base Numbering
+ case RES_POOLCOLL_NUMBER_BULLET_BASE: // Base Numbering
break;
case RES_POOLCOLL_GREETING: // Greeting
@@ -1096,17 +1096,17 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_NUM_LEVEL1S:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 0
),
PT_12, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL1:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 0
),
0, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL1E:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL1,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 0 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 0
),
0, PT_12 );
break;
case RES_POOLCOLL_NUM_NONUM1:
@@ -1115,17 +1115,17 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
break;
case RES_POOLCOLL_NUM_LEVEL2S:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 1
),
PT_12, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL2:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 1
),
0, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL2E:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL2,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 1 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 1
),
0, PT_12 );
break;
case RES_POOLCOLL_NUM_NONUM2:
@@ -1134,17 +1134,17 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
break;
case RES_POOLCOLL_NUM_LEVEL3S:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 2
),
PT_12, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL3:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 2
),
0, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL3E:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL3,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 2 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 2
),
0, PT_12 );
break;
case RES_POOLCOLL_NUM_NONUM3:
@@ -1153,17 +1153,17 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
break;
case RES_POOLCOLL_NUM_LEVEL4S:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 3
),
PT_12, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL4:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 3
),
0, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL4E:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL4,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 3 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 3
),
0, PT_12 );
break;
case RES_POOLCOLL_NUM_NONUM4:
@@ -1172,17 +1172,17 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
break;
case RES_POOLCOLL_NUM_LEVEL5S:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 4
),
PT_12, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL5:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 4
),
0, PT_6 );
break;
case RES_POOLCOLL_NUM_LEVEL5E:
lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_NUM_LEVEL5,
- lNumFirstLineOffset, SwNumRule::GetNumIndent( 4 ),
+ lNumberFirstLineOffset, SwNumRule::GetNumIndent( 4
),
0, PT_12 );
break;
case RES_POOLCOLL_NUM_NONUM5:
@@ -1190,99 +1190,99 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
0, SwNumRule::GetNumIndent( 4 ), 0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL1S:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 0
),
+ case RES_POOLCOLL_BULLET_LEVEL1S:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL1,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
0 ),
PT_12, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL1:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 0
),
+ case RES_POOLCOLL_BULLET_LEVEL1:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL1,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
0 ),
0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL1E:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL1,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 0
),
+ case RES_POOLCOLL_BULLET_LEVEL1E:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL1,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
0 ),
0, PT_12 );
break;
- case RES_POOLCOLL_BUL_NONUM1:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM1,
+ case RES_POOLCOLL_BULLET_NONUM1:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_NONUM1,
0, SwNumRule::GetBullIndent( 0 ), 0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL2S:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 1
),
+ case RES_POOLCOLL_BULLET_LEVEL2S:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL2,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
1 ),
PT_12, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL2:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 1
),
+ case RES_POOLCOLL_BULLET_LEVEL2:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL2,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
1 ),
0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL2E:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL2,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 1
),
+ case RES_POOLCOLL_BULLET_LEVEL2E:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL2,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
1 ),
0, PT_12 );
break;
- case RES_POOLCOLL_BUL_NONUM2:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM2,
+ case RES_POOLCOLL_BULLET_NONUM2:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_NONUM2,
0, SwNumRule::GetBullIndent( 1 ), 0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL3S:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 2
),
+ case RES_POOLCOLL_BULLET_LEVEL3S:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL3,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
2 ),
PT_12, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL3:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 2
),
+ case RES_POOLCOLL_BULLET_LEVEL3:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL3,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
2 ),
0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL3E:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL3,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 2
),
+ case RES_POOLCOLL_BULLET_LEVEL3E:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL3,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
2 ),
0, PT_12 );
break;
- case RES_POOLCOLL_BUL_NONUM3:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM3,
+ case RES_POOLCOLL_BULLET_NONUM3:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_NONUM3,
0, SwNumRule::GetBullIndent( 2 ), 0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL4S:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 3
),
+ case RES_POOLCOLL_BULLET_LEVEL4S:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL4,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
3 ),
PT_12, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL4:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 3
),
+ case RES_POOLCOLL_BULLET_LEVEL4:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL4,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
3 ),
0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL4E:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL4,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 3
),
+ case RES_POOLCOLL_BULLET_LEVEL4E:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL4,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
3 ),
0, PT_12 );
break;
- case RES_POOLCOLL_BUL_NONUM4:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM4,
+ case RES_POOLCOLL_BULLET_NONUM4:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_NONUM4,
0, SwNumRule::GetBullIndent( 3 ), 0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL5S:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 4
),
+ case RES_POOLCOLL_BULLET_LEVEL5S:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL5,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
4 ),
PT_12, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL5:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 4
),
+ case RES_POOLCOLL_BULLET_LEVEL5:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL5,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
4 ),
0, PT_6 );
break;
- case RES_POOLCOLL_BUL_LEVEL5E:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_LEVEL5,
- lBullFirstLineOffset, SwNumRule::GetBullIndent( 4
),
+ case RES_POOLCOLL_BULLET_LEVEL5E:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_LEVEL5,
+ lBulletFirstLineOffset, SwNumRule::GetBullIndent(
4 ),
0, PT_12 );
break;
- case RES_POOLCOLL_BUL_NONUM5:
- lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BUL_NONUM5,
+ case RES_POOLCOLL_BULLET_NONUM5:
+ lcl_SetNumBul( &m_rDoc, pNewColl, aSet, RES_POOLCOLL_BULLET_NONUM5,
0, SwNumRule::GetBullIndent( 4 ), 0, PT_6 );
break;
@@ -1501,7 +1501,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool(
sal_uInt16 nId )
}
break;
- case RES_POOLCHR_BUL_LEVEL: // Bullet character
+ case RES_POOLCHR_BULLET_LEVEL: // Bullet character
{
const vcl::Font& rBulletFont = numfunc::GetDefBulletFont();
SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamilyType(),
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 63729613d5bc..ca43036a704d 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -488,7 +488,7 @@ const std::vector<OUString>&
SwStyleNameMapper::GetTextProgNameArray()
const std::vector<OUString>& SwStyleNameMapper::GetListsProgNameArray()
{
static const std::vector<OUString> s_aListsProgNameArray = {
- "List", // STR_POCO_PRGM_NUMBUL_BASE
+ "List", // STR_POCO_PRGM_NUMBER_BULLET_BASE
"Numbering 1 Start", // STR_POCO_PRGM_NUM_LEVEL1S
"Numbering 1",
"Numbering 1 End",
@@ -528,7 +528,7 @@ const std::vector<OUString>&
SwStyleNameMapper::GetListsProgNameArray()
"List 5 Start",
"List 5",
"List 5 End",
- "List 5 Cont.", // STR_POCO_PRGM_BUL_NONUM5
+ "List 5 Cont.", // STR_POCO_PRGM_BULLET_NONUM5
};
return s_aListsProgNameArray;
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 44b59a283faf..4ab6e48b3785 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -382,8 +382,8 @@ SwNumRule::SwNumRule( const OUString& rNm,
pFormat = new SwNumFormat;
pFormat->SetIncludeUpperLevels( 1 );
pFormat->SetStart( 1 );
- pFormat->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
- pFormat->SetFirstLineOffset( lNumFirstLineOffset );
+ pFormat->SetAbsLSpace( lNumberIndent + SwNumRule::GetNumIndent( n
) );
+ pFormat->SetFirstLineOffset( lNumberFirstLineOffset );
pFormat->SetSuffix( "." );
pFormat->SetBulletChar( numfunc::GetBulletChar(n));
SwNumRule::maBaseFormats[ NUM_RULE ][ n ] = pFormat;
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index be521cfdccd7..326e05eaf892 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -195,11 +195,11 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
case COLL_LISTS_BITS:
switch( nId )
{
- case RES_POOLCOLL_NUMBUL_BASE:
+ case RES_POOLCOLL_NUMBER_BULLET_BASE:
nRet = RES_POOLCOLL_TEXT; break;
default:
- nRet = RES_POOLCOLL_NUMBUL_BASE; break;
+ nRet = RES_POOLCOLL_NUMBER_BULLET_BASE; break;
}
break;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index a31ea3a8d3a8..dbef15654fc0 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -263,7 +263,7 @@ void SwAutoFormat::SetRedlineText_( sal_uInt16 nActionId )
sText = SwViewShell::GetShellRes()->GetAutoFormatNameLst()[ nActionId
];
switch( nActionId )
{
- case STR_AUTOFMTREDL_SET_NUMBULLET:
+ case STR_AUTOFMTREDL_SET_NUMBER_BULLET:
case STR_AUTOFMTREDL_DEL_MORELINES:
// AutoCorrect actions
@@ -1460,7 +1460,7 @@ void SwAutoFormat::BuildText()
void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
{
- SetRedlineText( STR_AUTOFMTREDL_SET_NUMBULLET );
+ SetRedlineText( STR_AUTOFMTREDL_SET_NUMBER_BULLET );
bool bBreak = true;
@@ -1520,7 +1520,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
if( m_aFlags.bSetNumRule )
{
SwCharFormat* pCFormat =
m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
- RES_POOLCHR_BUL_LEVEL );
+ RES_POOLCHR_BULLET_LEVEL );
bChgBullet = true;
// Was the format already somewhere adjusted?
if( !aRule.GetNumFormat( nLvl ) )
@@ -1546,10 +1546,10 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl,
sal_uInt16 nDigitLevel )
}
}
- sal_Int32 nAbsPos = lBullIndent;
+ sal_Int32 nAbsPos = lBulletIndent;
SwTwips nSpaceSteps = nLvl
? nLeftTextPos / nLvl
- : lBullIndent;
+ : lBulletIndent;
for( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nAbsPos = nAbsPos
+ nSpaceSteps )
{
SwNumFormat aFormat( aRule.Get( n ) );
@@ -1559,7 +1559,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
// #i93908# clear suffix for bullet lists
aFormat.SetPrefix(OUString());
aFormat.SetSuffix(OUString());
- aFormat.SetFirstLineOffset( lBullFirstLineOffset );
+ aFormat.SetFirstLineOffset( lBulletFirstLineOffset );
aFormat.SetAbsLSpace( nAbsPos );
if( !aFormat.GetCharFormat() )
aFormat.SetCharFormat( pCFormat );
@@ -1579,7 +1579,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
else
{
bChgBullet = true;
- SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_BUL_LEVEL1 + (
std::min( nLvl, cnNumBullColls ) * 4 )) );
+ SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_BULLET_LEVEL1 + (
std::min( nLvl, cnNumBullColls ) * 4 )) );
}
}
else
@@ -1598,7 +1598,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
// Level 0 and Indentation, determine level by left indentation
and default NumIndent
if( !nDigitLevel && nLeftTextPos )
- nLvl = std::min( sal_uInt16( nLeftTextPos / lNumIndent ),
+ nLvl = std::min( sal_uInt16( nLeftTextPos / lNumberIndent ),
sal_uInt16( MAXLEVEL - 1 ) );
else
nLvl = nDigitLevel;
@@ -1648,7 +1648,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
aFormat.SetNumberingType(static_cast<SvxNumType>(aNumTypes[ n ] - '0'));
aFormat.SetAbsLSpace( nSpaceSteps * n
- + lNumIndent );
+ + lNumberIndent );
if( !aFormat.GetCharFormat() )
aFormat.SetCharFormat( pCFormat );
@@ -1669,7 +1669,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16
nDigitLevel )
SwNumRule::GetNumIndent(static_cast<sal_uInt8>(n-nLvl)));
else
aFormat.SetAbsLSpace( nSpaceSteps * n
- + lNumIndent );
+ + lNumberIndent );
aRule.Set( n, aFormat );
}
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 59f841dab111..24c5675fd5c4 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -295,7 +295,7 @@ static const char* STR_POOLCOLL_TOX_CITATION_ARY[] =
// Edit forms
SwForm::SwForm( TOXTypes eTyp ) // #i21237#
: m_eType( eTyp ), m_nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )),
-// nFirstTabPos( lNumIndent ),
+// nFirstTabPos( lNumberIndent ),
m_bCommaSeparated(false)
{
//bHasFirstTabPos =
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index 49d567d1ed07..9b202ea03ae2 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2061,7 +2061,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
&& !SwXNumberingRules::isInvalidStyle(rCharStyleName))
{
OUString tmp;
- SwStyleNameMapper::FillProgName(RES_POOLCHR_BUL_LEVEL, tmp);
+ SwStyleNameMapper::FillProgName(RES_POOLCHR_BULLET_LEVEL, tmp);
rCharStyleName = tmp;
}
}
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 98ef1e42d6e4..b15fc85d5164 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1854,7 +1854,7 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const
SfxPoolItem& rHt )
return rWrt;
}
-Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
+Writer& OutCSS1_NumberBulletListStyleOpt( Writer& rWrt, const SwNumRule&
rNumRule,
sal_uInt8 nLevel )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1866,7 +1866,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const
SwNumRule& rNumRule,
long nLSpace = rNumFormat.GetAbsLSpace();
long nFirstLineOffset = rNumFormat.GetFirstLineOffset();
- long nDfltFirstLineOffset = HTML_NUMBUL_INDENT;
+ long nDfltFirstLineOffset = HTML_NUMBER_BULLET_INDENT;
if( nLevel > 0 )
{
const SwNumFormat& rPrevNumFormat = rNumRule.Get( nLevel-1 );
@@ -1874,11 +1874,11 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const
SwNumRule& rNumRule,
nDfltFirstLineOffset = rPrevNumFormat.GetFirstLineOffset();
}
- if( rHTMLWrt.IsHTMLMode(HTMLMODE_LSPACE_IN_NUMBUL) &&
- nLSpace != HTML_NUMBUL_MARGINLEFT )
+ if( rHTMLWrt.IsHTMLMode(HTMLMODE_LSPACE_IN_NUMBER_BULLET) &&
+ nLSpace != HTML_NUMBER_BULLET_MARGINLEFT )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLSpace );
- if( rHTMLWrt.IsHTMLMode(HTMLMODE_FRSTLINE_IN_NUMBUL) &&
+ if( rHTMLWrt.IsHTMLMode(HTMLMODE_FRSTLINE_IN_NUMBER_BULLET) &&
nFirstLineOffset != nDfltFirstLineOffset )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_text_indent, nFirstLineOffset );
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 0af993324d62..ce151862aef0 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -208,14 +208,14 @@ struct SwHTMLTextCollOutputInfo
OString aToken; // End token to be output
std::unique_ptr<SfxItemSet> pItemSet; // hard attribute
- bool bInNumBulList; // in an enumerated list;
+ bool bInNumberBulletList; // in an enumerated list;
bool bParaPossible; // a </P> may be output additionally
bool bOutPara; // a </P> is supposed to be output
bool bOutDiv; // write a </DIV>
bool bOutLi = false; // write a </li>
SwHTMLTextCollOutputInfo() :
- bInNumBulList( false ),
+ bInNumberBulletList( false ),
bParaPossible( false ),
bOutPara( false ),
bOutDiv( false )
@@ -436,7 +436,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
sal_uInt16 nNumStart = USHRT_MAX;
bool bForceDL = false;
bool bDT = false;
- rInfo.bInNumBulList = false; // Are we in a list?
+ rInfo.bInNumberBulletList = false; // Are we in a list?
bool bNumbered = false; // The current paragraph is numbered
bool bPara = false; // the current token is <P>
rInfo.bParaPossible = false; // a <P> may be additionally output
@@ -461,7 +461,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
if( aNumInfo.GetNumRule() )
{
- rInfo.bInNumBulList = true;
+ rInfo.bInNumberBulletList = true;
nNewDefListLvl = 0;
// is the current paragraph numbered?
@@ -635,7 +635,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
const SvxLRSpaceItem& rLRSpace =
pNodeItemSet ? pNodeItemSet->Get(RES_LR_SPACE)
: rFormat.GetLRSpace();
- if( (!rHWrt.m_bCfgOutStyles || bForceDL) && !rInfo.bInNumBulList )
+ if( (!rHWrt.m_bCfgOutStyles || bForceDL) && !rInfo.bInNumberBulletList )
{
sal_Int32 nLeftMargin;
if( bForceDL )
@@ -687,10 +687,10 @@ static void OutHTML_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
rHWrt.OutAndSetDefList( nNewDefListLvl );
// if necessary, start a bulleted or numbered list
- if( rInfo.bInNumBulList )
+ if( rInfo.bInNumberBulletList )
{
OSL_ENSURE( !rHWrt.m_nDefListLvl, "DL cannot be inside OL!" );
- OutHTML_NumBulListStart( rHWrt, aNumInfo );
+ OutHTML_NumberBulletListStart( rHWrt, aNumInfo );
if( bNumbered )
{
@@ -707,16 +707,16 @@ static void OutHTML_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
rHWrt.m_nDfltRightMargin = pFormatInfo->nRightMargin;
rHWrt.m_nDfltFirstLineIndent = pFormatInfo->nFirstLineIndent;
- if( rInfo.bInNumBulList )
+ if( rInfo.bInNumberBulletList )
{
- if( !rHWrt.IsHTMLMode( HTMLMODE_LSPACE_IN_NUMBUL ) )
+ if( !rHWrt.IsHTMLMode( HTMLMODE_LSPACE_IN_NUMBER_BULLET ) )
rHWrt.m_nDfltLeftMargin = rLRSpace.GetTextLeft();
// In numbered lists, don't output a first line indent.
rHWrt.m_nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
}
- if( rInfo.bInNumBulList && bNumbered && bPara && !rHWrt.m_bCfgOutStyles )
+ if( rInfo.bInNumberBulletList && bNumbered && bPara &&
!rHWrt.m_bCfgOutStyles )
{
// a single LI doesn't have spacing
rHWrt.m_nDfltTopMargin = 0;
@@ -757,7 +757,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
bool bHasParSpace = bUseParSpace && rULSpace.GetLower() > 0;
// if necessary, start a new list item
- if( rInfo.bInNumBulList && bNumbered )
+ if( rInfo.bInNumberBulletList && bNumbered )
{
HtmlWriter html(rWrt.Strm(), rHWrt.maNamespace);
html.start(OOO_STRING_SVTOOLS_HTML_li);
@@ -852,8 +852,8 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
// - a user format is exported, or
// - a paragraph attribute exists
if( !bPara ||
- (!rInfo.bInNumBulList && !rHWrt.m_nDefListLvl) ||
- (rInfo.bInNumBulList && !bNumbered) ||
+ (!rInfo.bInNumberBulletList && !rHWrt.m_nDefListLvl) ||
+ (rInfo.bInNumberBulletList && !bNumbered) ||
(!rHWrt.m_bCfgOutStyles &&
(bHasParSpace || pAdjItem ||
(eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.m_eLang))) ||
@@ -978,7 +978,7 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const
SwHTMLTextCollOutputInfo& r
rHWrt.FillNextNumInfo();
const SwHTMLNumRuleInfo& rNextInfo = *rHWrt.GetNextNumInfo();
// a bulleted list must be closed in PRE as well
- if( rInfo.bInNumBulList )
+ if( rInfo.bInNumberBulletList )
{
const SwHTMLNumRuleInfo& rNRInfo = rHWrt.GetNumInfo();
@@ -986,7 +986,7 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const
SwHTMLTextCollOutputInfo& r
rNextInfo.GetDepth() != rNRInfo.GetDepth() ||
rNextInfo.IsNumbered() || rNextInfo.IsRestart() )
rHWrt.ChangeParaToken( HtmlTokenId::NONE );
- OutHTML_NumBulListEnd( rHWrt, rNextInfo );
+ OutHTML_NumberBulletListEnd( rHWrt, rNextInfo );
}
else if( rNextInfo.GetNumRule() != nullptr )
rHWrt.ChangeParaToken( HtmlTokenId::NONE );
@@ -1026,10 +1026,10 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const
SwHTMLTextCollOutputInfo& r
false);
// if necessary, close a bulleted or numbered list
- if( rInfo.bInNumBulList )
+ if( rInfo.bInNumberBulletList )
{
rHWrt.FillNextNumInfo();
- OutHTML_NumBulListEnd( rHWrt, *rHWrt.GetNextNumInfo() );
+ OutHTML_NumberBulletListEnd( rHWrt, *rHWrt.GetNextNumInfo() );
}
}
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index 67da1d78dece..40a2395ad793 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2002,7 +2002,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const
SvxCSS1PropertyInfo &rPropInfo,
sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
short nIndent = 0;
- GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent );
+ GetMarginsFromContextWithNumberBullet( nLeftSpace, nRightSpace,
nIndent );
if( SvxAdjust::Right==rPropInfo.m_eFloat )
{
@@ -2166,7 +2166,7 @@ void SwHTMLParser::GetMarginsFromContext( sal_uInt16&
nLeft,
}
}
-void SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
+void SwHTMLParser::GetMarginsFromContextWithNumberBullet( sal_uInt16& nLeft,
sal_uInt16& nRight,
short& nIndent ) const
{
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index b585055ae8aa..4df050d60acb 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -191,7 +191,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16
eVertOri,
// determine paragraph indent
sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
short nIndent = 0;
- GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent );
+ GetMarginsFromContextWithNumberBullet( nLeftSpace, nRightSpace,
nIndent );
// determine horizontal alignment and wrapping
sal_Int16 eHoriRel;
diff --git a/sw/source/filter/html/htmlnum.hxx
b/sw/source/filter/html/htmlnum.hxx
index 66cd293fca1e..917c0514a259 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -22,8 +22,8 @@
#include <swtypes.hxx>
#include <string.h>
-#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2)
-#define HTML_NUMBUL_INDENT (-MM50)
+#define HTML_NUMBER_BULLET_MARGINLEFT (MM50*2 + MM50/2)
+#define HTML_NUMBER_BULLET_INDENT (-MM50)
class SwTextNode;
class SwNumRule;
diff --git a/sw/source/filter/html/htmlnumreader.cxx
b/sw/source/filter/html/htmlnumreader.cxx
index 9d914eaea6da..c443b93c6a00 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -54,7 +54,7 @@ static HTMLOptionEnum<sal_Unicode> const aHTMLULTypeTable[] =
};
-void SwHTMLParser::NewNumBulList( HtmlTokenId nToken )
+void SwHTMLParser::NewNumberBulletList( HtmlTokenId nToken )
{
SwHTMLNumRuleInfo& rInfo = GetNumInfo();
@@ -103,12 +103,12 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken )
}
aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aNumFormat.SetBulletChar( cBulletChar );
- nChrFormatPoolId = RES_POOLCHR_BUL_LEVEL;
+ nChrFormatPoolId = RES_POOLCHR_BULLET_LEVEL;
}
- sal_Int32 nAbsLSpace = HTML_NUMBUL_MARGINLEFT;
+ sal_Int32 nAbsLSpace = HTML_NUMBER_BULLET_MARGINLEFT;
- sal_Int32 nFirstLineIndent = HTML_NUMBUL_INDENT;
+ sal_Int32 nFirstLineIndent = HTML_NUMBER_BULLET_INDENT;
if( nLevel > 0 )
{
const SwNumFormat& rPrevNumFormat = rInfo.GetNumRule()->Get(
nLevel-1 );
@@ -268,7 +268,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken )
{
// Default indent has already been added
long nAbsLSpace =
- aNumFormat.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
+ aNumFormat.GetAbsLSpace() -
HTML_NUMBER_BULLET_MARGINLEFT;
if( aPropInfo.m_nLeftMargin < 0 &&
nAbsLSpace < -aPropInfo.m_nLeftMargin )
nAbsLSpace = 0U;
@@ -331,7 +331,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken )
SetTextCollAttrs(m_aContexts.back().get());
}
-void SwHTMLParser::EndNumBulList( HtmlTokenId nToken )
+void SwHTMLParser::EndNumberBulletList( HtmlTokenId nToken )
{
SwHTMLNumRuleInfo& rInfo = GetNumInfo();
@@ -387,8 +387,8 @@ void SwHTMLParser::EndNumBulList( HtmlTokenId nToken )
}
aNumFormat.SetBulletChar( cBulletChar );
}
- aNumFormat.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
- aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+ aNumFormat.SetAbsLSpace( (i+1) *
HTML_NUMBER_BULLET_MARGINLEFT );
+ aNumFormat.SetFirstLineOffset( HTML_NUMBER_BULLET_INDENT );
aNumFormat.SetCharFormat( pRefNumFormat->GetCharFormat() );
rInfo.GetNumRule()->Set( i, aNumFormat );
bChanged = true;
@@ -428,7 +428,7 @@ void SwHTMLParser::EndNumBulList( HtmlTokenId nToken )
}
-void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken )
+void SwHTMLParser::NewNumberBulletListItem( HtmlTokenId nToken )
{
sal_uInt8 nLevel = GetNumInfo().GetLevel();
OUString aId, aStyle, aClass, aLang, aDir;
@@ -500,8 +500,8 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken )
}
aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aNumFormat.SetBulletChar( cBulletChar ); // the bullet character !!
- aNumFormat.SetCharFormat(
m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
- aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+ aNumFormat.SetCharFormat(
m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BULLET_LEVEL) );
+ aNumFormat.SetFirstLineOffset( HTML_NUMBER_BULLET_INDENT );
aNumRule.Set( 0, aNumFormat );
m_xDoc->MakeNumRule( aNumRuleName, &aNumRule );
@@ -556,7 +556,7 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken )
ShowStatline();
}
-void SwHTMLParser::EndNumBulListItem( HtmlTokenId nToken, bool bSetColl )
+void SwHTMLParser::EndNumberBulletListItem( HtmlTokenId nToken, bool bSetColl )
{
// Create a new paragraph
if( nToken == HtmlTokenId::NONE && m_pPam->GetPoint()->nContent.GetIndex()
)
diff --git a/sw/source/filter/html/htmlnumwriter.cxx
b/sw/source/filter/html/htmlnumwriter.cxx
index 416c5da16105..76ab63d909b6 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -94,7 +94,7 @@ void SwHTMLWriter::SetNextNumInfo(
std::unique_ptr<SwHTMLNumRuleInfo> pNxt )
m_pNextNumRuleInfo = std::move(pNxt);
}
-Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
+Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt,
const SwHTMLNumRuleInfo& rInfo )
{
SwHTMLNumRuleInfo& rPrevInfo = rWrt.GetNumInfo();
@@ -262,7 +262,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
}
else
{
- OSL_FAIL( "<OutHTML_NumBulListStart(..) - text node has no
number." );
+ OSL_FAIL( "<OutHTML_NumberBulletListStart(..) - text node
has no number." );
}
}
if( nStartVal != 1 )
@@ -275,7 +275,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
rWrt.Strm().WriteOString( sOut );
if( rWrt.m_bCfgOutStyles )
- OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(),
static_cast<sal_uInt8>(i) );
+ OutCSS1_NumberBulletListStyleOpt( rWrt, *rInfo.GetNumRule(),
static_cast<sal_uInt8>(i) );
rWrt.Strm().WriteChar( '>' );
@@ -285,7 +285,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
return rWrt;
}
-Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
+Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
const SwHTMLNumRuleInfo& rNextInfo )
{
SwHTMLNumRuleInfo& rInfo = rWrt.GetNumInfo();
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 3afb79aa47a6..56c3457b7fb2 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3272,7 +3272,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable,
bool bReadOptions,
sal_uInt16 nLeftSpace = 0;
sal_uInt16 nRightSpace = 0;
short nIndent;
- GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent
);
+ GetMarginsFromContextWithNumberBullet( nLeftSpace, nRightSpace,
nIndent );
// save the current position we'll get back to some time
SwPosition *pSavePos = nullptr;
diff --git a/sw/source/filter/html/htmltabw.cxx
b/sw/source/filter/html/htmltabw.cxx
index 34a56cf818b7..1bb526a2111b 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -1142,7 +1142,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode &
rNode,
// to maybe close the Num list.
rHTMLWrt.ClearNextNumInfo();
rHTMLWrt.FillNextNumInfo();
- OutHTML_NumBulListEnd( rHTMLWrt, *rHTMLWrt.GetNextNumInfo() );
+ OutHTML_NumberBulletListEnd( rHTMLWrt, *rHTMLWrt.GetNextNumInfo() );
}
return rWrt;
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a2c5fa1b9bfb..f1fcfbbbacf2 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -686,7 +686,7 @@ void SwHTMLParser::Continue( HtmlTokenId nToken )
// close still open numbering
while( GetNumInfo().GetNumRule() )
- EndNumBulList();
+ EndNumberBulletList();
OSL_ENSURE( !m_nContextStMin, "There are protected contexts" );
// try this twice, first normally to let m_nContextStMin decrease
@@ -1763,7 +1763,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
case HtmlTokenId::UNORDERLIST_ON:
if( m_nOpenParaToken != HtmlTokenId::NONE )
EndPara();
- NewNumBulList( nToken );
+ NewNumberBulletList( nToken );
break;
case HtmlTokenId::DIRLIST_OFF:
@@ -1772,8 +1772,8 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
case HtmlTokenId::UNORDERLIST_OFF:
if( m_nOpenParaToken != HtmlTokenId::NONE )
EndPara();
- EndNumBulListItem( HtmlTokenId::NONE, true );
- EndNumBulList( nToken );
+ EndNumberBulletListItem( HtmlTokenId::NONE, true );
+ EndNumberBulletList( nToken );
break;
case HtmlTokenId::LI_ON:
@@ -1786,13 +1786,13 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
EndPara();
}
- EndNumBulListItem( HtmlTokenId::NONE, false );// close <LI>/<LH> and
don't set a template
- NewNumBulListItem( nToken );
+ EndNumberBulletListItem( HtmlTokenId::NONE, false );// close <LI>/<LH>
and don't set a template
+ NewNumberBulletListItem( nToken );
break;
case HtmlTokenId::LI_OFF:
case HtmlTokenId::LISTHEADER_OFF:
- EndNumBulListItem( nToken, false );
+ EndNumberBulletListItem( nToken, false );
break;
// Attribute :
@@ -4968,7 +4968,7 @@ void SwHTMLParser::InsertSpacer()
sal_uInt16 nLeft=0, nRight=0;
short nIndent = 0;
- GetMarginsFromContextWithNumBul( nLeft, nRight, nIndent );
+ GetMarginsFromContextWithNumberBullet( nLeft, nRight, nIndent
);
nIndent = nIndent + static_cast<short>(nSize);
SvxLRSpaceItem aLRItem( RES_LR_SPACE );
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 081a7e8fed69..5aab2fe5d43e 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -558,7 +558,7 @@ class SwHTMLParser : public SfxHTMLParser, public
SvtListener
void GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short&
nIndent,
bool bIgnoreCurrent=false ) const;
- void GetMarginsFromContextWithNumBul( sal_uInt16 &nLeft, sal_uInt16
&nRight,
+ void GetMarginsFromContextWithNumberBullet( sal_uInt16 &nLeft, sal_uInt16
&nRight,
short& nIndent ) const;
void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const;
@@ -602,10 +602,10 @@ class SwHTMLParser : public SfxHTMLParser, public
SvtListener
// Handling of lists
// order list <OL> and unordered list <UL> with <LI>
- void NewNumBulList( HtmlTokenId nToken );
- void EndNumBulList( HtmlTokenId nToken = HtmlTokenId::NONE );
- void NewNumBulListItem( HtmlTokenId nToken );
- void EndNumBulListItem( HtmlTokenId nToken, bool bSetColl);
+ void NewNumberBulletList( HtmlTokenId nToken );
+ void EndNumberBulletList( HtmlTokenId nToken = HtmlTokenId::NONE );
+ void NewNumberBulletListItem( HtmlTokenId nToken );
+ void EndNumberBulletListItem( HtmlTokenId nToken, bool bSetColl);
// definitions lists <DL> with <DD>, <DT>
void NewDefList();
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index d1e213f5ad71..454b4ad59abd 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -265,7 +265,7 @@ ErrCode SwHTMLWriter::WriteStream()
m_nHTMLMode |= HTMLMODE_BLOCK_SPACER;
if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_MSIE == m_nExportMode )
- m_nHTMLMode |= (HTMLMODE_FLOAT_FRAME | HTMLMODE_LSPACE_IN_NUMBUL);
+ m_nHTMLMode |= (HTMLMODE_FLOAT_FRAME |
HTMLMODE_LSPACE_IN_NUMBER_BULLET);
if( HTML_CFG_MSIE == m_nExportMode )
m_nHTMLMode |= HTMLMODE_NBSP_IN_TABLES;
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index 9743e70a6a93..e217d0fb21d3 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -115,7 +115,7 @@ namespace o3tl {
#define HTMLMODE_FLOAT_FRAME 0x00020000
#define HTMLMODE_VERT_SPACER 0x00040000
#define HTMLMODE_NBSP_IN_TABLES 0x00080000
-#define HTMLMODE_LSPACE_IN_NUMBUL 0x00100000
+#define HTMLMODE_LSPACE_IN_NUMBER_BULLET 0x00100000
//was HTMLMODE_NO_BR_AT_PAREND 0x00200000
#define HTMLMODE_PRINT_EXT 0x00400000
#define HTMLMODE_ABS_POS_FLY 0x00800000
@@ -123,7 +123,7 @@ namespace o3tl {
#define HTMLMODE_FLY_MARGINS 0x02000000
#define HTMLMODE_BORDER_NONE 0x04000000
#define HTMLMODE_FONT_GENERIC 0x08000000
-#define HTMLMODE_FRSTLINE_IN_NUMBUL 0x10000000
+#define HTMLMODE_FRSTLINE_IN_NUMBER_BULLET 0x10000000
#define HTMLMODE_NO_CONTROL_CENTERING 0x20000000
#define HTML_DLCOLL_DD 0x4000
@@ -683,12 +683,12 @@ Writer& OutCSS1_HintSpanTag( Writer& rWrt, const
SfxPoolItem& rHt );
Writer& OutCSS1_HintStyleOpt( Writer& rWrt, const SfxPoolItem& rHt );
Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt );
-Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
+Writer& OutCSS1_NumberBulletListStyleOpt( Writer& rWrt, const SwNumRule&
rNumRule,
sal_uInt8 nLevel );
-Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
+Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt,
const SwHTMLNumRuleInfo& rInfo );
-Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
+Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
const SwHTMLNumRuleInfo& rNextInfo );
Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt );
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 8373b5c2f40d..30a150744486 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -244,13 +244,13 @@ sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat
)
case RES_POOLCOLL_ENDNOTE: nRet = 43; break;
case RES_POOLCOLL_TOX_AUTHORITIESH: nRet = 44; break;
case RES_POOLCOLL_TOX_CNTNTH: nRet = 46; break;
- case RES_POOLCOLL_BUL_LEVEL1: nRet = 48; break;
+ case RES_POOLCOLL_BULLET_LEVEL1: nRet = 48; break;
case RES_POOLCOLL_LISTS_BEGIN: nRet = 47; break;
case RES_POOLCOLL_NUM_LEVEL1: nRet = 49; break;
- case RES_POOLCOLL_BUL_LEVEL2: nRet = 54; break;
- case RES_POOLCOLL_BUL_LEVEL3: nRet = 55; break;
- case RES_POOLCOLL_BUL_LEVEL4: nRet = 56; break;
- case RES_POOLCOLL_BUL_LEVEL5: nRet = 57; break;
+ case RES_POOLCOLL_BULLET_LEVEL2: nRet = 54; break;
+ case RES_POOLCOLL_BULLET_LEVEL3: nRet = 55; break;
+ case RES_POOLCOLL_BULLET_LEVEL4: nRet = 56; break;
+ case RES_POOLCOLL_BULLET_LEVEL5: nRet = 57; break;
case RES_POOLCOLL_NUM_LEVEL2: nRet = 58; break;
case RES_POOLCOLL_NUM_LEVEL3: nRet = 59; break;
case RES_POOLCOLL_NUM_LEVEL4: nRet = 60; break;
@@ -259,11 +259,11 @@ sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat
)
case RES_POOLCOLL_SIGNATURE: nRet = 64; break;
case RES_POOLCOLL_TEXT: nRet = 66; break;
case RES_POOLCOLL_TEXT_MOVE: nRet = 67; break;
- case RES_POOLCOLL_BUL_NONUM1: nRet = 68; break;
- case RES_POOLCOLL_BUL_NONUM2: nRet = 69; break;
- case RES_POOLCOLL_BUL_NONUM3: nRet = 70; break;
- case RES_POOLCOLL_BUL_NONUM4: nRet = 71; break;
- case RES_POOLCOLL_BUL_NONUM5: nRet = 72; break;
+ case RES_POOLCOLL_BULLET_NONUM1: nRet = 68; break;
+ case RES_POOLCOLL_BULLET_NONUM2: nRet = 69; break;
+ case RES_POOLCOLL_BULLET_NONUM3: nRet = 70; break;
+ case RES_POOLCOLL_BULLET_NONUM4: nRet = 71; break;
+ case RES_POOLCOLL_BULLET_NONUM5: nRet = 72; break;
case RES_POOLCOLL_DOC_SUBTITEL: nRet = 74; break;
case RES_POOLCOLL_GREETING: nRet = 75; break;
case RES_POOLCOLL_TEXT_IDENT: nRet = 77; break;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 800fbb887fc4..7f601ceabc8f 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -674,12 +674,12 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
}
if(sList != m_sShellList && (!m_bListDefault || !m_bSetListDefault ))
{
- lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBUL_BASE, pPrinter,
sList, nFontWhich);
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBER_BULLET_BASE,
pPrinter, sList, nFontWhich);
bMod = true;
}
if(bListHeightChanged)
{
- lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBUL_BASE,
+ lcl_SetColl(m_pWrtShell, RES_POOLCOLL_NUMBER_BULLET_BASE,
sal::static_int_cast< sal_uInt16, sal_Int64
>(m_xListHeightLB->get_value()), nFontHeightWhich);
bMod = true;
}
@@ -838,7 +838,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
const sal_uInt16 nFontWhich =
m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT :
FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONT :
RES_CHRATR_CTL_FONT;
- pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_NUMBUL_BASE);
+ pColl =
m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_NUMBER_BULLET_BASE);
const SvxFontItem& rFontLS = !m_nFontGroup ? pColl->GetFont() :
FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() :
pColl->GetCTLFont();
m_bListDefault = SfxItemState::DEFAULT ==
pColl->GetAttrSet().GetItemState(nFontWhich, false);
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 41f8d0948d6e..65d7f278ff12 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -270,7 +270,7 @@ void SwTemplateDlgController::PageCreated(const OString&
rId, SfxTabPage &rPage
// set style's and metric's names
OUString sNumCharFormat, sBulletCharFormat;
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFormat);
- SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFormat);
+ SwStyleNameMapper::FillUIName( RES_POOLCHR_BULLET_LEVEL,
sBulletCharFormat);
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rId == "font")
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 603e05bebb3e..970c61157307 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -908,7 +908,7 @@ void SwSvxNumBulletTabDialog::PageCreated(const OString&
rPageId, SfxTabPage& rP
// set styles' names and metric
OUString sNumCharFormat, sBulletCharFormat;
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFormat );
- SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFormat );
+ SwStyleNameMapper::FillUIName( RES_POOLCHR_BULLET_LEVEL, sBulletCharFormat
);
if (rPageId == "singlenum")
{
diff --git a/sw/source/uibase/app/docshini.cxx
b/sw/source/uibase/app/docshini.cxx
index 9018deba6bdd..45103144355d 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -236,15 +236,15 @@ bool SwDocShell::InitNew( const uno::Reference <
embed::XStorage >& xStor )
sal_uInt16 aFontIdPoolId[] =
{
FONT_OUTLINE, RES_POOLCOLL_HEADLINE_BASE,
- FONT_LIST, RES_POOLCOLL_NUMBUL_BASE,
+ FONT_LIST, RES_POOLCOLL_NUMBER_BULLET_BASE,
FONT_CAPTION, RES_POOLCOLL_LABEL,
FONT_INDEX, RES_POOLCOLL_REGISTER_BASE,
FONT_OUTLINE_CJK, RES_POOLCOLL_HEADLINE_BASE,
- FONT_LIST_CJK, RES_POOLCOLL_NUMBUL_BASE,
+ FONT_LIST_CJK, RES_POOLCOLL_NUMBER_BULLET_BASE,
FONT_CAPTION_CJK, RES_POOLCOLL_LABEL,
FONT_INDEX_CJK, RES_POOLCOLL_REGISTER_BASE,
FONT_OUTLINE_CTL, RES_POOLCOLL_HEADLINE_BASE,
- FONT_LIST_CTL, RES_POOLCOLL_NUMBUL_BASE,
+ FONT_LIST_CTL, RES_POOLCOLL_NUMBER_BULLET_BASE,
FONT_CAPTION_CTL, RES_POOLCOLL_LABEL,
FONT_INDEX_CTL, RES_POOLCOLL_REGISTER_BASE
};
diff --git a/sw/source/uibase/shells/txtnum.cxx
b/sw/source/uibase/shells/txtnum.cxx
index 92b9a542aa7b..91efc3e2b8bc 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -286,7 +286,7 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
OUString aNumCharFormat, aBulletCharFormat;
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL,
aNumCharFormat );
- SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL,
aBulletCharFormat );
+ SwStyleNameMapper::FillUIName( RES_POOLCHR_BULLET_LEVEL,
aBulletCharFormat );
SfxAllItemSet aSet( GetPool() );
aSet.Put( SfxStringItem( SID_NUM_CHAR_FMT, aNumCharFormat
) );
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 3516b8102096..ff196a84aa40 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1250,7 +1250,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
}
else
{
- pChrFormat = GetCharFormatFromPool( RES_POOLCHR_BUL_LEVEL );
+ pChrFormat = GetCharFormatFromPool( RES_POOLCHR_BULLET_LEVEL );
}
const SwTextNode *const pTextNode = sw::GetParaPropsNode(*GetLayout(),
commit e21c3bec9de9d0a9b03aef330e48dcf5070ba73b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Dec 11 10:43:03 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 11 15:45:17 2019 +0100
convert FrameControlType to scoped enum
Change-Id: Ic74fcf0c8f7c671de5187bdee284bb43c7299d1f
Reviewed-on: https://gerrit.libreoffice.org/84923
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 1bb96fb329e9..fe22c3d5cab2 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -243,7 +243,7 @@ enum PrepareHint
PREP_ERGOSUM, // Needed because of movement in FootnoteFrames.
Check QuoVadis/ErgoSum.
};
-enum FrameControlType
+enum class FrameControlType
{
PageBreak,
Header,
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index dc6472b060cd..cae19ebda3f6 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -563,7 +563,7 @@ public:
void ToggleHeaderFooterEdit();
/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
bool IsHeaderFooterEdit() const { return mbHeaderFooterEdit; }
- bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return
(eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
+ bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return
(eControl == FrameControlType::Header)? mbShowHeaderSeparator:
mbShowFooterSeparator; }
virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool
bShow );
bool IsSelectAll() const { return mbSelectAll; }
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 76ef0c3f7465..57b09946966b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1857,7 +1857,7 @@ void SwFlyFrame::ActiveUnfloatButton(SwWrtShell* pWrtSh)
{
SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
SwFrameControlsManager& rMngr = rEditWin.GetFrameControlsManager();
- SwFrameControlPtr pControl = rMngr.GetControl(FloatingTable, this);
+ SwFrameControlPtr pControl =
rMngr.GetControl(FrameControlType::FloatingTable, this);
if (pControl.get() || pControl->GetWindow())
{
pControl->GetWindow()->MouseButtonDown(MouseEvent());
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index c31911594ecb..8a9333188ad0 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2461,7 +2461,7 @@ bool SwPageFrame::IsOverHeaderFooterArea( const Point&
rPt, FrameControlType &rC
{
if (!bHideWhitespaceMode || static_cast<const
SwFrameFormat*>(GetDep())->GetHeader().IsActive())
{
- rControl = Header;
+ rControl = FrameControlType::Header;
return true;
}
}
@@ -2473,7 +2473,7 @@ bool SwPageFrame::IsOverHeaderFooterArea( const Point&
rPt, FrameControlType &rC
if ( aFooterArea.IsInside( rPt ) &&
(!bHideWhitespaceMode || static_cast<const
SwFrameFormat*>(GetDep())->GetFooter().IsActive()) )
{
- rControl = Footer;
+ rControl = FrameControlType::Footer;
return true;
}
}
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 8c3fe341def1..8135fa1c3a63 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3048,7 +3048,7 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext&
rRenderContext, SwRect const&
while ( pHiddenPage->GetPrev() != nullptr )
{
pHiddenPage = static_cast< const SwPageFrame* >(
pHiddenPage->GetPrev() );
- SwFrameControlPtr pControl = rMngr.GetControl( PageBreak,
pHiddenPage );
+ SwFrameControlPtr pControl = rMngr.GetControl(
FrameControlType::PageBreak, pHiddenPage );
if ( pControl.get() )
pControl->ShowAll( false );
}
@@ -3573,7 +3573,7 @@ void SwPageFrame::PaintBreak( ) const
if ( pFlowFrame && pFlowFrame->IsPageBreak( true ) )
rMngr.SetPageBreakControl( this );
else
- rMngr.RemoveControlsByType( PageBreak, this );
+ rMngr.RemoveControlsByType( FrameControlType::PageBreak,
this );
}
}
SwLayoutFrame::PaintBreak( );
@@ -3601,8 +3601,8 @@ void SwColumnFrame::PaintBreak( ) const
// header/footer marker
// * Non-printing characters are shown, as this is more
consistent
// with other formatting marks
- if ( !gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Header
) &&
- !gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer
) &&
+ if ( !gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Header ) &&
+ !gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Footer ) &&
gProp.pSGlobalShell->GetViewOptions()->IsLineBreak() )
{
SwRect aRect( pCnt->getFramePrintArea() );
@@ -3694,8 +3694,8 @@ void SwPageFrame::PaintDecorators( ) const
!gProp.pSGlobalShell->IsPreview() &&
!gProp.pSGlobalShell->GetViewOptions()->IsReadonly() &&
!gProp.pSGlobalShell->GetViewOptions()->getBrowseMode() &&
- ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Header )
||
- gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer )
) )
+ ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Header ) ||
+ gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Footer ) ) )
{
bool bRtl = AllSettings::GetLayoutRTL();
const SwRect& rVisArea = gProp.pSGlobalShell->VisArea();
@@ -3704,7 +3704,7 @@ void SwPageFrame::PaintDecorators( ) const
nXOff = std::max( aBodyRect.Left(), rVisArea.Left() );
// Header
- if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Header
) )
+ if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Header ) )
{
const SwFrame* pHeaderFrame = Lower();
if ( !pHeaderFrame->IsHeaderFrame() )
@@ -3712,11 +3712,11 @@ void SwPageFrame::PaintDecorators( ) const
long nHeaderYOff = aBodyRect.Top();
Point nOutputOff = rEditWin.LogicToPixel( Point( nXOff,
nHeaderYOff ) );
- rEditWin.GetFrameControlsManager().SetHeaderFooterControl(
this, Header, nOutputOff );
+ rEditWin.GetFrameControlsManager().SetHeaderFooterControl(
this, FrameControlType::Header, nOutputOff );
}
// Footer
- if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer
) )
+ if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator(
FrameControlType::Footer ) )
{
const SwFrame* pFootnoteContFrame = Lower();
while ( pFootnoteContFrame )
@@ -3728,7 +3728,7 @@ void SwPageFrame::PaintDecorators( ) const
long nFooterYOff = aBodyRect.Bottom();
Point nOutputOff = rEditWin.LogicToPixel( Point( nXOff,
nFooterYOff ) );
- rEditWin.GetFrameControlsManager().SetHeaderFooterControl(
this, Footer, nOutputOff );
+ rEditWin.GetFrameControlsManager().SetHeaderFooterControl(
this, FrameControlType::Footer, nOutputOff );
}
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index f3b419a1cab5..d2ae3da70e6b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -94,7 +94,7 @@ void SwViewShell::SetShowHeaderFooterSeparator(
FrameControlType eControl, bool
if ( bShow )
bShow = GetViewOptions()->IsUseHeaderFooterMenu();
- if ( eControl == Header )
+ if ( eControl == FrameControlType::Header )
mbShowHeaderSeparator = bShow;
else
mbShowFooterSeparator = bShow;
@@ -105,14 +105,14 @@ void SwViewShell::ToggleHeaderFooterEdit()
mbHeaderFooterEdit = !mbHeaderFooterEdit;
if ( !mbHeaderFooterEdit )
{
- SetShowHeaderFooterSeparator( Header, false );
- SetShowHeaderFooterSeparator( Footer, false );
+ SetShowHeaderFooterSeparator( FrameControlType::Header, false );
+ SetShowHeaderFooterSeparator( FrameControlType::Footer, false );
}
// Avoid corner case
if ( ( GetViewOptions()->IsUseHeaderFooterMenu() ) &&
- ( !IsShowHeaderFooterSeparator( Header ) &&
- !IsShowHeaderFooterSeparator( Footer ) ) )
+ ( !IsShowHeaderFooterSeparator( FrameControlType::Header ) &&
+ !IsShowHeaderFooterSeparator( FrameControlType::Footer ) ) )
{
mbHeaderFooterEdit = false;
}
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 2b7eb90c66dc..14808d2efe33 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -77,11 +77,11 @@ void SwFrameControlsManager::SetReadonlyControls( bool
bReadonly )
void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame*
pPageFrame, FrameControlType eType, Point aOffset )
{
- assert( eType == Header || eType == Footer );
+ assert( eType == FrameControlType::Header || eType ==
FrameControlType::Footer );
// Check if we already have the control
SwFrameControlPtr pControl;
- const bool bHeader = ( eType == Header );
+ const bool bHeader = ( eType == FrameControlType::Header );
SwFrameControlPtrMap& rControls = m_aControls[eType];
@@ -115,7 +115,7 @@ void SwFrameControlsManager::SetPageBreakControl( const
SwPageFrame* pPageFrame
// Check if we already have the control
SwFrameControlPtr pControl;
- SwFrameControlPtrMap& rControls = m_aControls[PageBreak];
+ SwFrameControlPtrMap& rControls = m_aControls[FrameControlType::PageBreak];
SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pPageFrame);
if (lb != rControls.end() && !(rControls.key_comp()(pPageFrame,
lb->first)))
@@ -147,7 +147,7 @@ void SwFrameControlsManager::SetUnfloatTableButton( const
SwFlyFrame* pFlyFrame,
// Check if we already have the control
SwFrameControlPtr pControl;
- SwFrameControlPtrMap& rControls = m_aControls[FloatingTable];
+ SwFrameControlPtrMap& rControls =
m_aControls[FrameControlType::FloatingTable];
SwFrameControlPtrMap::iterator lb = rControls.lower_bound(pFlyFrame);
if (lb != rControls.end() && !(rControls.key_comp()(pFlyFrame, lb->first)))
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx
b/sw/source/uibase/docvw/PageBreakWin.cxx
index a23ef76299b0..9a58ee1aa954 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -219,7 +219,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext&
rRenderContext, const ::tools::Re
void SwPageBreakWin::Select()
{
- SwFrameControlPtr pThis = GetEditWin()->GetFrameControlsManager(
).GetControl( PageBreak, GetFrame() );
+ SwFrameControlPtr pThis = GetEditWin()->GetFrameControlsManager(
).GetControl( FrameControlType::PageBreak, GetFrame() );
OString sIdent = GetCurItemIdent();
if (sIdent == "edit")
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 9ae217cafc09..02eece5882fc 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2813,7 +2813,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( pFormat )
{
- if ( eControl == Header )
+ if ( eControl == FrameControlType::Header )
bActive = pFormat->GetHeader().IsActive();
else
bActive = pFormat->GetFooter().IsActive();
@@ -2834,8 +2834,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// keep consistent behaviour due to header edit mode (and the
same for the footer as well).
// Otherwise, we hide the header/footer control if a separator
is shown, and vice versa.
- if (!(bWasInHeader && eControl == Header) &&
- !(bWasInFooter && eControl == Footer))
+ if (!(bWasInHeader && eControl == FrameControlType::Header) &&
+ !(bWasInFooter && eControl == FrameControlType::Footer))
{
const bool bSeparatorWasVisible =
rSh.IsShowHeaderFooterSeparator(eControl);
rSh.SetShowHeaderFooterSeparator(eControl,
!bSeparatorWasVisible);
@@ -2855,8 +2855,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
// Make sure we have the proper Header/Footer separators shown
// as these may be changed if clicking on an empty Header/Footer
- rSh.SetShowHeaderFooterSeparator( Header, eControl == Header );
- rSh.SetShowHeaderFooterSeparator( Footer, eControl == Footer );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Header,
eControl == FrameControlType::Header );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Footer,
eControl == FrameControlType::Footer );
if ( !rSh.IsHeaderFooterEdit() )
{
@@ -2874,8 +2874,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
else
{
// Make sure that the separators are hidden
- rSh.SetShowHeaderFooterSeparator( Header, false );
- rSh.SetShowHeaderFooterSeparator( Footer, false );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Header, false
);
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Footer, false
);
// Repaint everything
// FIXME fdo#67358 for unknown reasons this causes painting
@@ -6199,27 +6199,27 @@ bool SwEditWin::IsInHeaderFooter( const Point &rDocPt,
FrameControlType &rContro
if ( pPageFrame && pPageFrame->IsOverHeaderFooterArea( rDocPt, rControl ) )
return true;
- if ( rSh.IsShowHeaderFooterSeparator( Header ) ||
rSh.IsShowHeaderFooterSeparator( Footer ) )
+ if ( rSh.IsShowHeaderFooterSeparator( FrameControlType::Header ) ||
rSh.IsShowHeaderFooterSeparator( FrameControlType::Footer ) )
{
SwFrameControlsManager &rMgr =
rSh.GetView().GetEditWin().GetFrameControlsManager();
Point aPoint( LogicToPixel( rDocPt ) );
- if ( rSh.IsShowHeaderFooterSeparator( Header ) )
+ if ( rSh.IsShowHeaderFooterSeparator( FrameControlType::Header ) )
{
- SwFrameControlPtr pControl = rMgr.GetControl( Header, pPageFrame );
+ SwFrameControlPtr pControl = rMgr.GetControl(
FrameControlType::Header, pPageFrame );
if ( pControl.get() && pControl->Contains( aPoint ) )
{
- rControl = Header;
+ rControl = FrameControlType::Header;
return true;
}
}
- if ( rSh.IsShowHeaderFooterSeparator( Footer ) )
+ if ( rSh.IsShowHeaderFooterSeparator( FrameControlType::Footer ) )
{
- SwFrameControlPtr pControl = rMgr.GetControl( Footer, pPageFrame );
+ SwFrameControlPtr pControl = rMgr.GetControl(
FrameControlType::Footer, pPageFrame );
if ( pControl.get() && pControl->Contains( aPoint ) )
{
- rControl = Footer;
+ rControl = FrameControlType::Footer;
return true;
}
}
@@ -6251,9 +6251,9 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point&
rDocPos, FrameControlType& r
bRet = bInHeader || bInFooter;
if ( bInHeader )
- rControl = Header;
+ rControl = FrameControlType::Header;
else if ( bInFooter )
- rControl = Footer;
+ rControl = FrameControlType::Footer;
}
else
bPageAnchored = pFlyFormat->GetAnchor( ).GetAnchorId( ) ==
RndStdIds::FLY_AT_PAGE;
diff --git a/sw/source/uibase/shells/txtcrsr.cxx
b/sw/source/uibase/shells/txtcrsr.cxx
index 2e4656162201..17f8d74c6042 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -445,13 +445,13 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
{
if ( !bInHeader )
{
- rSh.SetShowHeaderFooterSeparator( Footer, true );
- rSh.SetShowHeaderFooterSeparator( Header, false );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Footer, true );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Header, false
);
}
else
{
- rSh.SetShowHeaderFooterSeparator( Header, true );
- rSh.SetShowHeaderFooterSeparator( Footer, false );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Header, true );
+ rSh.SetShowHeaderFooterSeparator( FrameControlType::Footer, false
);
}
// Force repaint
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ec013052dc75..58c7d77349b3 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1437,13 +1437,13 @@ void SwView::ReadUserDataSequence ( const uno::Sequence
< beans::PropertyValue >
{
if ( !bInHeader )
{
- m_pWrtShell->SetShowHeaderFooterSeparator( Footer,
true );
- m_pWrtShell->SetShowHeaderFooterSeparator( Header,
false );
+ m_pWrtShell->SetShowHeaderFooterSeparator(
FrameControlType::Footer, true );
+ m_pWrtShell->SetShowHeaderFooterSeparator(
FrameControlType::Header, false );
}
else
{
- m_pWrtShell->SetShowHeaderFooterSeparator( Header,
true );
- m_pWrtShell->SetShowHeaderFooterSeparator( Footer,
false );
+ m_pWrtShell->SetShowHeaderFooterSeparator(
FrameControlType::Header, true );
+ m_pWrtShell->SetShowHeaderFooterSeparator(
FrameControlType::Footer, false );
}
// Force repaint
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
