pdf: change StructElement to enum class, move out of PDFWriter

Moves the StructElement out of PDFWriter and changes it to enum
class. This makes it mroe type safe, easier to search and more
clear what type we are using.

Change-Id: Icf469319a01f58397b131c3517bc75fba4072500
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179977
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 20 insertions, 20 deletions

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 417aa596b724..cc4a3bd6e2b4 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -298,13 +298,13 @@ void ScOutputData::SetSyntaxMode( bool bNewMode )
     }
 }
 
-bool ScOutputData::ReopenPDFStructureElement(vcl::PDFWriter::StructElement aType, SCROW nRow, SCCOL nCol)
+bool ScOutputData::ReopenPDFStructureElement(vcl::pdf::StructElement aType, SCROW nRow, SCCOL nCol)
 {
     bool bReopenTag = false;
     vcl::PDFExtOutDevData* pPDF = dynamic_cast<vcl::PDFExtOutDevData*>(mpDev->GetExtOutDevData());
     if (pPDF)
     {
-        if (aType == vcl::PDFWriter::Part) // Worksheet
+        if (aType == vcl::pdf::StructElement::Part) // Worksheet
         {
             if (pPDF->GetScPDFState()->m_WorksheetId != -1)
             {
@@ -313,7 +313,7 @@ bool ScOutputData::ReopenPDFStructureElement(vcl::PDFWriter::StructElement aType
                 bReopenTag = true;
             }
         }
-        else if (aType == vcl::PDFWriter::Table)
+        else if (aType == vcl::pdf::StructElement::Table)
         {
             if (pPDF->GetScPDFState()->m_TableId != -1)
             {
@@ -322,7 +322,7 @@ bool ScOutputData::ReopenPDFStructureElement(vcl::PDFWriter::StructElement aType
                 bReopenTag = true;
             }
         }
-        else if (aType == vcl::PDFWriter::TableRow)
+        else if (aType == vcl::pdf::StructElement::TableRow)
         {
             const auto aIter = pPDF->GetScPDFState()->m_TableRowMap.find(nRow);
             if (aIter != pPDF->GetScPDFState()->m_TableRowMap.end() && nRow == aIter->first)
@@ -332,7 +332,7 @@ bool ScOutputData::ReopenPDFStructureElement(vcl::PDFWriter::StructElement aType
                 bReopenTag = true;
             }
         }
-        else if (aType == vcl::PDFWriter::TableData)
+        else if (aType == vcl::pdf::StructElement::TableData)
         {
             const std::pair<SCROW, SCCOL> keyToFind = std::make_pair(nRow, nCol);
             const auto aIter = pPDF->GetScPDFState()->m_TableDataMap.find(keyToFind);
@@ -1128,7 +1128,7 @@ void ScOutputData::DrawBackground(vcl::RenderContext& rRenderContext)
             else
             {
                 if (bTaggedPDF)
-                    pPDF->WrapBeginStructureElement(vcl::PDFWriter::NonStructElement);
+                    pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::NonStructElement);
 
                 // scan for rows with the same background:
                 SCSIZE nSkip = 0;
@@ -1298,7 +1298,7 @@ void ScOutputData::DrawExtraShadow(bool bLeft, bool bTop, bool bRight, bool bBot
                     if ( pAttr && !bSkipX )
                     {
                         if (bTaggedPDF)
-                            pPDF->WrapBeginStructureElement(vcl::PDFWriter::NonStructElement);
+                            pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::NonStructElement);
 
                         ScShadowPart ePart = nPass ?
                                 pThisRowInfo->cellInfo(nCol).eVShadowPart :
@@ -1461,7 +1461,7 @@ void ScOutputData::DrawFrame(vcl::RenderContext& rRenderContext)
     vcl::PDFExtOutDevData* pPDF = dynamic_cast<vcl::PDFExtOutDevData*>(mpDev->GetExtOutDevData());
     bool bTaggedPDF = pPDF && pPDF->GetIsExportTaggedPDF();
     if (bTaggedPDF)
-        pPDF->WrapBeginStructureElement(vcl::PDFWriter::NonStructElement);
+        pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::NonStructElement);
 
     DrawModeFlags nOldDrawMode = rRenderContext.GetDrawMode();
 
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 421edaafcc5f..4a3bdc5535ba 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1493,11 +1493,11 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
     bool bTaggedPDF = pPDF && pPDF->GetIsExportTaggedPDF();
     if (bTaggedPDF)
     {
-        bool bReopenTag = ReopenPDFStructureElement(vcl::PDFWriter::Table);
+        bool bReopenTag = ReopenPDFStructureElement(vcl::pdf::StructElement::Table);
         if (!bReopenTag)
         {
             sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
-            pPDF->InitStructureElement(nId, vcl::PDFWriter::Table, u"Table"_ustr);
+            pPDF->InitStructureElement(nId, vcl::pdf::StructElement::Table, u"Table"_ustr);
             pPDF->BeginStructureElement(nId);
             pPDF->GetScPDFState()->m_TableId = nId;
         }
@@ -1571,12 +1571,12 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
                 if (nLoopStartX != 0)
                 {
                     bReopenTag
-                        = ReopenPDFStructureElement(vcl::PDFWriter::TableRow, nY);
+                        = ReopenPDFStructureElement(vcl::pdf::StructElement::TableRow, nY);
                 }
                 if (!bReopenTag)
                 {
                     sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
-                    pPDF->InitStructureElement(nId, vcl::PDFWriter::TableRow, u"TR"_ustr);
+                    pPDF->InitStructureElement(nId, vcl::pdf::StructElement::TableRow, u"TR"_ustr);
                     pPDF->BeginStructureElement(nId);
                     pPDF->GetScPDFState()->m_TableRowMap.emplace(nY, nId);
                 }
@@ -1588,7 +1588,7 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
             for (SCCOL nX=nLoopStartX; nX<=nX2; nX++)
             {
                 if (bTaggedPDF)
-                    pPDF->WrapBeginStructureElement(vcl::PDFWriter::TableData, u"TD"_ustr);
+                    pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::TableData, u"TD"_ustr);
 
                 bool bMergeEmpty = false;
                 const ScCellInfo* pInfo = &pThisRowInfo->cellInfo(nX);
@@ -2134,7 +2134,7 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
                         if (!aString.isEmpty())
                         {
                             if (bTaggedPDF)
-                                pPDF->WrapBeginStructureElement(vcl::PDFWriter::Paragraph, u"P"_ustr);
+                                pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::Paragraph, u"P"_ustr);
 
                             // If the string is clipped, make it shorter for
                             // better performance since drawing by HarfBuzz is
@@ -4492,7 +4492,7 @@ void ScOutputData::DrawEdit(bool bPixelToLogic)
 
                     bool bReopenTag = false;
                     if (bTaggedPDF)
-                        bReopenTag = ReopenPDFStructureElement(vcl::PDFWriter::TableData, nY, nX);
+                        bReopenTag = ReopenPDFStructureElement(vcl::pdf::StructElement::TableData, nY, nX);
 
                     SCCOL nCellX = nX;                  // position where the cell really starts
                     SCROW nCellY = nY;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index a8c3990b1288..07f5225b87f5 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -554,11 +554,11 @@ void ScPrintFunc::DrawToDev(ScDocument& rDoc, OutputDevice* pDev, double /* nPri
     bool bTaggedPDF = pPDF && pPDF->GetIsExportTaggedPDF();
     if (bTaggedPDF)
     {
-        bool bReopen = aOutputData.ReopenPDFStructureElement(vcl::PDFWriter::Part);
+        bool bReopen = aOutputData.ReopenPDFStructureElement(vcl::pdf::StructElement::Part);
         if (!bReopen)
         {
             sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
-            pPDF->InitStructureElement(nId, vcl::PDFWriter::Part, u"Worksheet"_ustr);
+            pPDF->InitStructureElement(nId, vcl::pdf::StructElement::Part, u"Worksheet"_ustr);
             pPDF->BeginStructureElement(nId);
             pPDF->GetScPDFState()->m_WorksheetId = nId;
         }
@@ -1624,11 +1624,11 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
     bool bTaggedPDF = pPDF && pPDF->GetIsExportTaggedPDF();
     if (bTaggedPDF)
     {
-        bool bReopen = aOutputData.ReopenPDFStructureElement(vcl::PDFWriter::Part);
+        bool bReopen = aOutputData.ReopenPDFStructureElement(vcl::pdf::StructElement::Part);
         if (!bReopen)
         {
             sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
-            pPDF->InitStructureElement(nId, vcl::PDFWriter::Part, u"Worksheet"_ustr);
+            pPDF->InitStructureElement(nId, vcl::pdf::StructElement::Part, u"Worksheet"_ustr);
             pPDF->BeginStructureElement(nId);
             pPDF->GetScPDFState()->m_WorksheetId = nId;
         }
@@ -1786,7 +1786,7 @@ void ScPrintFunc::PrintHF( tools::Long nPageNo, bool bHeader, tools::Long nStart
     vcl::PDFExtOutDevData* pPDF = dynamic_cast<vcl::PDFExtOutDevData*>(pDev->GetExtOutDevData());
     bool bTaggedPDF = pPDF && pPDF->GetIsExportTaggedPDF();
     if (bTaggedPDF)
-        pPDF->WrapBeginStructureElement(vcl::PDFWriter::NonStructElement);
+        pPDF->WrapBeginStructureElement(vcl::pdf::StructElement::NonStructElement);
 
     const ScPrintHFParam& rParam = bHeader ? aHdr : aFtr;