commit 3565c3c94c6bdad5ab0913d979fd4e97547488e6
author Miklos Vajna <vmiklos@collabora.com> Fri Oct 14 17:22:14 2022 +0200
committer Miklos Vajna <vmiklos@collabora.com> Fri Oct 14 18:08:55 2022 +0200
tree 075a5f3453ca8b016bb85f9cbb96421445f03a9f
parent 2e49822ee7b3a77ac148997c7958cfa8d31090eb

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 <vmiklos@collabora.com>
Tested-by: Jenkins

sw/source/core/access/accportions.cxx

diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 084498e..7b00b56 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -262,7 +262,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:

sw/source/core/inc/txttypes.hxx

diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index d876b0f..6b3124f 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,

sw/source/core/text/EnhancedPDFExportHelper.cxx

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 29f60bd..f193aa3 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 :

sw/source/core/text/inftxt.cxx

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 1ca1046..bdb40ac 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1344,7 +1344,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:

sw/source/core/text/txttab.cxx

diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index aa0ac92..5855533 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 );
    }

sw/source/core/text/xmldump.cxx

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index c760303..4bb015c9 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";