[Libreoffice-commits] core.git: sw/inc sw/source

[Vasily Melenchuk (via logerrit)]

 sw/inc/editsh.hxx                 |    3 +--
 sw/inc/swtypes.hxx                |    2 --
 sw/source/core/doc/docnum.cxx     |    1 -
 sw/source/filter/ww8/wrtw8nds.cxx |    6 +++---
 sw/source/filter/ww8/ww8atr.cxx   |    5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 29e5fad7ed64459d04df61b57ecd8eaba6d8bfae
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Fri Aug 6 13:39:46 2021 +0300
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Tue Aug 10 08:56:00 2021 +0200

    sw: removed unused NO_NUMLEVEL
    
    NO_NUMLEVEL is not used in code for a while.
    
    Change-Id: Ia39879723455dbe5cc13b20042e930088618588d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120113
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index ca2c2efcb0ab..cea1eab10691 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -539,8 +539,7 @@ public:
     bool IsNoNum( bool bChkStart = true ) const;
 
     /** @return Num-Level of the node in which point of cursor is.
-     @return values can be: NO_NUMBERING,
-     0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1 */
+     @return values can be: NO_NUMBERING, 0..MAXLEVEL-1 */
     sal_uInt8 GetNumLevel() const;
 
     /// Detect highest and lowest level to check moving of outline levels.
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index ff79edb47d02..a091a538d9a9 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -91,8 +91,6 @@ enum class SwLabelType
 
 constexpr sal_uInt8 MAXLEVEL = 10;
 
-constexpr sal_uInt8 NO_NUMLEVEL = 0x20;    // "or" with the levels.
-
 //  Values for indents at numbering and bullet lists.
 //  (For more levels the values have to be multiplied with the levels+1;
 //  levels 0 ..4!)
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 430d19220329..b931646aaa2c 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1515,7 +1515,6 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
     SwNodeIndex aIdx( rPos.nNode );
     if( ! pNd->IsCountedInList() )
     {
-        // If NO_NUMLEVEL is switched on, we search the preceding Node with Numbering
         bool bError = false;
         do {
             sw::GotoPrevLayoutTextFrame(aIdx, pLayout);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 5eeb9f6001f5..979300ff5ff2 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2969,12 +2969,12 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
             // isn't exported as numbered, but not counted, if no other attribute
             // is found in <pTmpSet>
             // #i44815# adjust numbering/indents for numbered paragraphs
-            //          without number (NO_NUMLEVEL)
+            //          without number
             // #i47013# need to check rNode.GetNumRule()!=NULL as well.
             if ( ! rNode.IsCountedInList() && rNode.GetNumRule()!=nullptr )
             {
                 // WW8 does not know numbered paragraphs without number
-                // (NO_NUMLEVEL). In WW8AttributeOutput::ParaNumRule(), we will export
+                // In WW8AttributeOutput::ParaNumRule(), we will export
                 // the RES_PARATR_NUMRULE as list-id 0, which in WW8 means
                 // no numbering. Here, we will adjust the indents to match
                 // visually.
@@ -3014,7 +3014,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
                 }
 
                 // new first line indent = 0
-                // (first line indent is ignored for NO_NUMLEVEL)
+                // (first line indent is ignored)
                 if (!bParaRTL)
                     aLRSpace.SetTextFirstLineOffset( 0 );
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7fe5a330a37b..825e70cd4356 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3735,9 +3735,8 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
         else
         {
             // #i44815# adjust numbering for numbered paragraphs
-            // without number (NO_NUMLEVEL). These paragraphs
-            // will receive a list id 0, which WW interprets as
-            // 'no number'.
+            // without number. These paragraphs will receive a
+            // list id 0, which WW interprets as 'no number'.
             nNumId = 0;
         }
     }