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.grandin@collabora.co.uk>

14 files changed, 74 insertions, 74 deletions

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;