[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/access/accportions.cxx           |    2 +-
 sw/source/core/inc/txttypes.hxx                 |    3 ++-
 sw/source/core/text/EnhancedPDFExportHelper.cxx |    2 +-
 sw/source/core/text/inftxt.cxx                  |    2 +-
 sw/source/core/text/txttab.cxx                  |    4 ++--
 sw/source/core/text/xmldump.cxx                 |    4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit b00adbf04d0469a4a9606025ba99ba2a1e26cbf5
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Oct 14 17:22:14 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Oct 19 08:32:19 2022 +0200

    sw: tables have frames, not portions
    
    Went wrong in commit 60b0526ea4929ce273de499f552a4d478a973d10 (convert
    POR constants to scoped enum, 2019-01-17), which changed POR_TAB to
    PortionType::Table.
    
    Change-Id: I27131f2ab42f7c53310ee8e61b8481e07ed77da7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141379
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 3565c3c94c6bdad5ab0913d979fd4e97547488e6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141404
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/access/accportions.cxx 
b/sw/source/core/access/accportions.cxx
index 9f43435a7dc4..186e6112494d 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -261,7 +261,7 @@ bool SwAccessiblePortionData::IsGrayPortionType( 
PortionType nType ) const
             bGray = !m_pViewOptions->IsPagePreview() &&
                 !m_pViewOptions->IsReadonly() && 
SwViewOption::IsFieldShadings();
             break;
-        case PortionType::Table:       bGray = m_pViewOptions->IsTab();        
  break;
+        case PortionType::Tab:       bGray = m_pViewOptions->IsTab();          
break;
         case PortionType::SoftHyphen:  bGray = m_pViewOptions->IsSoftHyph();   
  break;
         case PortionType::Blank:     bGray = m_pViewOptions->IsHardBlank();    
break;
         default:
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index d876b0f8e037..6b3124fb8bc6 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -80,7 +80,8 @@ enum class PortionType
     Fix         = 0x06c0,
     Fly         = 0x06c1,
 
-    Table       = 0x0750,
+    // Tabulator, not table
+    Tab         = 0x0750,
 
     TabRight    = 0x07d0,
     TabCenter   = 0x07d1,
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 1e9e74e33736..30c1db446868 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1429,7 +1429,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
             }
             break;
 
-        case PortionType::Table :
+        case PortionType::Tab :
         case PortionType::TabRight :
         case PortionType::TabCenter :
         case PortionType::TabDecimal :
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index c3a5068b3cf9..38f665d687ca 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1340,7 +1340,7 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion 
&rPor,
             bDraw = true;
         }
         break;
-    case PortionType::Table:
+    case PortionType::Tab:
         if ( GetOpt().IsTab() )     bDraw = true;
         break;
     case PortionType::SoftHyphen:
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 82f8e3129c97..afcd31217ea0 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -332,7 +332,7 @@ SwTabPortion::SwTabPortion( const sal_uInt16 nTabPosition, 
const sal_Unicode cFi
 {
     mnLineLength = TextFrameIndex(1);
     OSL_ENSURE(!IsFilled() || ' ' != m_cFill, "SwTabPortion::CTOR: blanks ?!");
-    SetWhichPor( PortionType::Table );
+    SetWhichPor( PortionType::Tab );
 }
 
 bool SwTabPortion::Format( SwTextFormatInfo &rInf )
@@ -604,7 +604,7 @@ void SwTabPortion::Paint( const SwTextPaintInfo &rInf ) 
const
     {
         // filled tabs are shaded in gray
         if( IsFilled() )
-            rInf.DrawViewOpt( *this, PortionType::Table );
+            rInf.DrawViewOpt( *this, PortionType::Tab );
         else
             rInf.DrawTab( *this );
     }
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index fb45c0920f17..966ee8ac1eee 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -139,8 +139,8 @@ const char* sw::PortionTypeToString(PortionType nType)
         case PortionType::Fly:
             return "PortionType::Fly";
 
-        case PortionType::Table:
-            return "PortionType::Table";
+        case PortionType::Tab:
+            return "PortionType::Tab";
 
         case PortionType::TabRight:
             return "PortionType::TabRight";