tag). */ - void TitleOn( const ImportInfo& rInfo ); + void TitleOn( const HtmlImportInfo& rInfo ); /** Closes the title of the HTML document (

From b6853991fce5b4129d0bedf4a7b74fd9e3898bc2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 29 Mar 2017 13:25:44 +0200 Subject: split ImportState enum into RtfImportState and HtmlImportState and convert to scoped enum Change-Id: I23e44e78ce96ed5fc19374e3e069e1cdc2166a35 Reviewed-on: https://gerrit.libreoffice.org/35840 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/filter/html/htmlpars.cxx | 144 ++++++++++++++++++------------------- sc/source/filter/inc/htmlpars.hxx | 102 +++++++++++++------------- sc/source/filter/inc/rtfparse.hxx | 8 +-- sc/source/filter/rtf/eeimpars.cxx | 2 +- sc/source/filter/rtf/rtfparse.cxx | 26 +++---- 5 files changed, 139 insertions(+), 143 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 9675a0676795..777137cb6471 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -258,8 +258,8 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser() sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) { - Link aOldLink = pEdit->GetImportHdl(); - pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) ); + Link aOldLink = pEdit->GetHtmlImportHdl(); + pEdit->SetHtmlImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) ); SfxObjectShell* pObjSh = mpDoc->GetDocumentShell(); bool bLoading = pObjSh && pObjSh->IsLoading(); @@ -286,7 +286,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes ); - pEdit->SetImportHdl( aOldLink ); + pEdit->SetHtmlImportHdl( aOldLink ); // Create column width Adjust(); OutputDevice* pDefaultDev = Application::GetDefaultDevice(); @@ -339,7 +339,7 @@ void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) } } -void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) +void ScHTMLLayoutParser::NextRow( HtmlImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); @@ -823,7 +823,7 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) nTableWidth = nColOffset - nColOffsetStart; } -void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) +void ScHTMLLayoutParser::CloseEntry( HtmlImportInfo* pInfo ) { bInCell = false; if ( bTabInTabCell ) @@ -874,19 +874,16 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) NewActEntry( pActEntry ); // New free flying pActEntry } -IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, HtmlImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { - case HTMLIMP_NEXTTOKEN: + case HtmlImportState::NextToken: ProcToken( &rInfo ); break; - case HTMLIMP_UNKNOWNATTR: - ProcToken( &rInfo ); - break; - case HTMLIMP_START: + case HtmlImportState::Start: break; - case HTMLIMP_END: + case HtmlImportState::End: if ( rInfo.aSelection.nEndPos ) { // If text remains: create paragraph, without calling CloseEntry(). @@ -901,18 +898,18 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo&, rInfo, void ) while ( nTableLevel > 0 ) TableOff( &rInfo ); // close tables, if missing break; - case HTMLIMP_SETATTR: + case HtmlImportState::SetAttr: break; - case HTMLIMP_INSERTTEXT: + case HtmlImportState::InsertText: break; - case HTMLIMP_INSERTPARA: + case HtmlImportState::InsertPara: if ( nTableLevel < 1 ) { CloseEntry( &rInfo ); NextRow( &rInfo ); } break; - case HTMLIMP_INSERTFIELD: + case HtmlImportState::InsertField: break; default: OSL_FAIL("HTMLImportHdl: unknown ImportInfo.eState"); @@ -944,7 +941,7 @@ static SCROW lcl_KGV( SCROW a, SCROW b ) return (b / lcl_GGT(a,b)) * a; } -void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableDataOn( HtmlImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); @@ -1036,25 +1033,25 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) SvxHorJustifyItem( SvxCellHorJustify::Center, ATTR_HOR_JUSTIFY) ); } -void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableRowOn( HtmlImportInfo* pInfo ) { if ( nColCnt > nColCntStart ) NextRow( pInfo ); // The optional TableRowOff wasn't there nColOffset = nColOffsetStart; } -void ScHTMLLayoutParser::TableRowOff( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableRowOff( HtmlImportInfo* pInfo ) { NextRow( pInfo ); } -void ScHTMLLayoutParser::TableDataOff( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableDataOff( HtmlImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); // Only if it really was one } -void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo ) { OUString aTabName; @@ -1163,7 +1160,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 ); } -void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) +void ScHTMLLayoutParser::TableOff( HtmlImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); @@ -1322,7 +1319,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) } } -void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) +void ScHTMLLayoutParser::Image( HtmlImportInfo* pInfo ) { pActEntry->maImageList.push_back( o3tl::make_unique() ); ScHTMLImage* pImage = pActEntry->maImageList.back().get(); @@ -1414,7 +1411,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) } } -void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::ColOn( HtmlImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast(pInfo->pParser)->GetOptions(); for (const auto & rOption : rOptions) @@ -1452,7 +1449,7 @@ sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption& rOption ) } } -void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::AnchorOn( HtmlImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast(pInfo->pParser)->GetOptions(); for (const auto & rOption : rOptions) @@ -1468,7 +1465,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) } } -bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) +bool ScHTMLLayoutParser::IsAtBeginningOfText( HtmlImportInfo* pInfo ) { ESelection& rSel = pActEntry->aSel; return rSel.nStartPara == rSel.nEndPara && @@ -1476,7 +1473,7 @@ bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) pEdit->GetTextLen( rSel.nStartPara ) == 0; } -void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) +void ScHTMLLayoutParser::FontOn( HtmlImportInfo* pInfo ) { if ( IsAtBeginningOfText( pInfo ) ) { // Only at the start of the text; applies to whole line @@ -1529,7 +1526,7 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) } } -void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) +void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo ) { bool bSetLastToken = true; switch ( pInfo->nToken ) @@ -1719,7 +1716,7 @@ bool ScHTMLEntry::HasContents() const return mbImportAlways || aSel.HasRange() || !aAltText.isEmpty() || IsTable(); } -void ScHTMLEntry::AdjustStart( const ImportInfo& rInfo ) +void ScHTMLEntry::AdjustStart( const HtmlImportInfo& rInfo ) { // set start position aSel.nStartPara = rInfo.aSelection.nStartPara; @@ -1732,7 +1729,7 @@ void ScHTMLEntry::AdjustStart( const ImportInfo& rInfo ) } } -void ScHTMLEntry::AdjustEnd( const ImportInfo& rInfo ) +void ScHTMLEntry::AdjustEnd( const HtmlImportInfo& rInfo ) { OSL_ENSURE( (aSel.nEndPara < rInfo.aSelection.nEndPara) || ((aSel.nEndPara == rInfo.aSelection.nEndPara) && (aSel.nEndPos <= rInfo.aSelection.nEndPos)), @@ -1793,7 +1790,7 @@ public: /** Inserts a new table into the container. This container owns the created table. @param bPreFormText true = New table is based on preformatted text (

 tag). */
-    ScHTMLTable*        CreateTable( const ImportInfo& rInfo, bool bPreFormText );
+    ScHTMLTable*        CreateTable( const HtmlImportInfo& rInfo, bool bPreFormText );
 
 private:
     /** Sets a working table with its index for search optimization. */
@@ -1828,7 +1825,7 @@ ScHTMLTable* ScHTMLTableMap::FindTable( ScHTMLTableId nTableId, bool bDeep ) con
     return pResult;
 }
 
-ScHTMLTable* ScHTMLTableMap::CreateTable( const ImportInfo& rInfo, bool bPreFormText )
+ScHTMLTable* ScHTMLTableMap::CreateTable( const HtmlImportInfo& rInfo, bool bPreFormText )
 {
     ScHTMLTable* pTable = new ScHTMLTable( mrParentTable, rInfo, bPreFormText );
     maTables[ pTable->GetTableId() ].reset( pTable );
@@ -1876,7 +1873,7 @@ ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) :
     ++mrnUnusedId;
 }
 
-ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bool bPreFormText ) :
+ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const HtmlImportInfo& rInfo, bool bPreFormText ) :
     mpParentTable( &rParentTable ),
     maTableId( rParentTable.maTableId.mrnUnusedId ),
     maTableItemSet( rParentTable.GetCurrItemSet() ),
@@ -1977,7 +1974,7 @@ void ScHTMLTable::PutItem( const SfxPoolItem& rItem )
         mxCurrEntry->GetItemSet().Put( rItem );
 }
 
-void ScHTMLTable::PutText( const ImportInfo& rInfo )
+void ScHTMLTable::PutText( const HtmlImportInfo& rInfo )
 {
     OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::PutText - no current entry" );
     if( mxCurrEntry.get() )
@@ -1989,7 +1986,7 @@ void ScHTMLTable::PutText( const ImportInfo& rInfo )
     }
 }
 
-void ScHTMLTable::InsertPara( const ImportInfo& rInfo )
+void ScHTMLTable::InsertPara( const HtmlImportInfo& rInfo )
 {
     if( mxCurrEntry.get() && mbDataOn && !IsEmptyCell() )
         mxCurrEntry->SetImportAlways();
@@ -2024,29 +2021,29 @@ void ScHTMLTable::AnchorOn()
         mxCurrEntry->SetImportAlways();
 }
 
-ScHTMLTable* ScHTMLTable::TableOn( const ImportInfo& rInfo )
+ScHTMLTable* ScHTMLTable::TableOn( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo );
     return InsertNestedTable( rInfo, false );
 }
 
-ScHTMLTable* ScHTMLTable::TableOff( const ImportInfo& rInfo )
+ScHTMLTable* ScHTMLTable::TableOff( const HtmlImportInfo& rInfo )
 {
     return mbPreFormText ? this : CloseTable( rInfo );
 }
 
-ScHTMLTable* ScHTMLTable::PreOn( const ImportInfo& rInfo )
+ScHTMLTable* ScHTMLTable::PreOn( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo );
     return InsertNestedTable( rInfo, true );
 }
 
-ScHTMLTable* ScHTMLTable::PreOff( const ImportInfo& rInfo )
+ScHTMLTable* ScHTMLTable::PreOff( const HtmlImportInfo& rInfo )
 {
     return mbPreFormText ? CloseTable( rInfo ) : this;
 }
 
-void ScHTMLTable::RowOn( const ImportInfo& rInfo )
+void ScHTMLTable::RowOn( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo, true );
     if( mpParentTable && !mbPreFormText )   // no rows allowed in global and preformatted tables
@@ -2057,7 +2054,7 @@ void ScHTMLTable::RowOn( const ImportInfo& rInfo )
     CreateNewEntry( rInfo );
 }
 
-void ScHTMLTable::RowOff( const ImportInfo& rInfo )
+void ScHTMLTable::RowOff( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo, true );
     if( mpParentTable && !mbPreFormText )   // no rows allowed in global and preformatted tables
@@ -2114,7 +2111,7 @@ OUString decodeNumberFormat(const OUString& rFmt)
 
 }
 
-void ScHTMLTable::DataOn( const ImportInfo& rInfo )
+void ScHTMLTable::DataOn( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo, true );
     if( mpParentTable && !mbPreFormText )   // no cells allowed in global and preformatted tables
@@ -2183,7 +2180,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
         CreateNewEntry( rInfo );
 }
 
-void ScHTMLTable::DataOff( const ImportInfo& rInfo )
+void ScHTMLTable::DataOff( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo, true );
     if( mpParentTable && !mbPreFormText )   // no cells allowed in global and preformatted tables
@@ -2191,7 +2188,7 @@ void ScHTMLTable::DataOff( const ImportInfo& rInfo )
     CreateNewEntry( rInfo );
 }
 
-void ScHTMLTable::BodyOn( const ImportInfo& rInfo )
+void ScHTMLTable::BodyOn( const HtmlImportInfo& rInfo )
 {
     bool bPushed = PushEntry( rInfo );
     if( !mpParentTable )
@@ -2206,7 +2203,7 @@ void ScHTMLTable::BodyOn( const ImportInfo& rInfo )
     CreateNewEntry( rInfo );
 }
 
-void ScHTMLTable::BodyOff( const ImportInfo& rInfo )
+void ScHTMLTable::BodyOff( const HtmlImportInfo& rInfo )
 {
     PushEntry( rInfo );
     if( !mpParentTable )
@@ -2217,7 +2214,7 @@ void ScHTMLTable::BodyOff( const ImportInfo& rInfo )
     CreateNewEntry( rInfo );
 }
 
-ScHTMLTable* ScHTMLTable::CloseTable( const ImportInfo& rInfo )
+ScHTMLTable* ScHTMLTable::CloseTable( const HtmlImportInfo& rInfo )
 {
     if( mpParentTable )     // not allowed to close global table
     {
@@ -2341,7 +2338,7 @@ bool ScHTMLTable::IsEmptyCell() const
     return mpCurrEntryList && mpCurrEntryList->empty();
 }
 
-bool ScHTMLTable::IsSpaceCharInfo( const ImportInfo& rInfo )
+bool ScHTMLTable::IsSpaceCharInfo( const HtmlImportInfo& rInfo )
 {
     return (rInfo.nToken == HTML_TEXTTOKEN) && (rInfo.aText.getLength() == 1) && (rInfo.aText[ 0 ] == ' ');
 }
@@ -2351,7 +2348,7 @@ ScHTMLTable::ScHTMLEntryPtr ScHTMLTable::CreateEntry() const
     return o3tl::make_unique( GetCurrItemSet() );
 }
 
-void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo )
+void ScHTMLTable::CreateNewEntry( const HtmlImportInfo& rInfo )
 {
     OSL_ENSURE( !mxCurrEntry.get(), "ScHTMLTable::CreateNewEntry - old entry still present" );
     mxCurrEntry = CreateEntry();
@@ -2394,7 +2391,7 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
     return bPushed;
 }
 
-bool ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell )
+bool ScHTMLTable::PushEntry( const HtmlImportInfo& rInfo, bool bLastInCell )
 {
     OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::PushEntry - no current entry" );
     bool bPushed = false;
@@ -2436,7 +2433,7 @@ ScHTMLTable* ScHTMLTable::GetExistingTable( ScHTMLTableId nTableId ) const
     return pTable;
 }
 
-ScHTMLTable* ScHTMLTable::InsertNestedTable( const ImportInfo& rInfo, bool bPreFormText )
+ScHTMLTable* ScHTMLTable::InsertNestedTable( const HtmlImportInfo& rInfo, bool bPreFormText )
 {
     if( !mxNestedTables.get() )
         mxNestedTables.reset( new ScHTMLTableMap( *this ) );
@@ -2536,7 +2533,7 @@ void ScHTMLTable::ImplDataOff()
     }
 }
 
-void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo )
+void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const HtmlImportInfo& rInfo )
 {
     // special handling for table header cells
     if( rInfo.nToken == HTML_TABLEHEADER_ON )
@@ -2861,10 +2858,10 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL  )
         }
     }
 
-    Link aOldLink = pEdit->GetImportHdl();
-    pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
+    Link aOldLink = pEdit->GetHtmlImportHdl();
+    pEdit->SetHtmlImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
     sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
-    pEdit->SetImportHdl( aOldLink );
+    pEdit->SetHtmlImportHdl( aOldLink );
 
     mxGlobTable->Recalc();
     nColMax = static_cast< SCCOL >( mxGlobTable->GetDocSize( tdCol ) - 1 );
@@ -2878,7 +2875,7 @@ const ScHTMLTable* ScHTMLQueryParser::GetGlobalTable() const
     return mxGlobTable.get();
 }
 
-void ScHTMLQueryParser::ProcessToken( const ImportInfo& rInfo )
+void ScHTMLQueryParser::ProcessToken( const HtmlImportInfo& rInfo )
 {
     switch( rInfo.nToken )
     {
@@ -2960,14 +2957,14 @@ void ScHTMLQueryParser::ProcessToken( const ImportInfo& rInfo )
     }
 }
 
-void ScHTMLQueryParser::InsertText( const ImportInfo& rInfo )
+void ScHTMLQueryParser::InsertText( const HtmlImportInfo& rInfo )
 {
     mpCurrTable->PutText( rInfo );
     if( mbTitleOn )
         maTitle.append(rInfo.aText);
 }
 
-void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo )
+void ScHTMLQueryParser::FontOn( const HtmlImportInfo& rInfo )
 {
     const HTMLOptions& rOptions = static_cast(rInfo.pParser)->GetOptions();
     HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end();
@@ -3009,7 +3006,7 @@ void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo )
     }
 }
 
-void ScHTMLQueryParser::MetaOn( const ImportInfo& rInfo )
+void ScHTMLQueryParser::MetaOn( const HtmlImportInfo& rInfo )
 {
     if( mpDoc->GetDocumentShell() )
     {
@@ -3023,13 +3020,13 @@ void ScHTMLQueryParser::MetaOn( const ImportInfo& rInfo )
     }
 }
 
-void ScHTMLQueryParser::TitleOn( const ImportInfo& /*rInfo*/ )
+void ScHTMLQueryParser::TitleOn( const HtmlImportInfo& /*rInfo*/ )
 {
     mbTitleOn = true;
     maTitle.setLength(0);
 }
 
-void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo )
+void ScHTMLQueryParser::TitleOff( const HtmlImportInfo& rInfo )
 {
     if( mbTitleOn )
     {
@@ -3046,27 +3043,27 @@ void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo )
     }
 }
 
-void ScHTMLQueryParser::TableOn( const ImportInfo& rInfo )
+void ScHTMLQueryParser::TableOn( const HtmlImportInfo& rInfo )
 {
     mpCurrTable = mpCurrTable->TableOn( rInfo );
 }
 
-void ScHTMLQueryParser::TableOff( const ImportInfo& rInfo )
+void ScHTMLQueryParser::TableOff( const HtmlImportInfo& rInfo )
 {
     mpCurrTable = mpCurrTable->TableOff( rInfo );
 }
 
-void ScHTMLQueryParser::PreOn( const ImportInfo& rInfo )
+void ScHTMLQueryParser::PreOn( const HtmlImportInfo& rInfo )
 {
     mpCurrTable = mpCurrTable->PreOn( rInfo );
 }
 
-void ScHTMLQueryParser::PreOff( const ImportInfo& rInfo )
+void ScHTMLQueryParser::PreOff( const HtmlImportInfo& rInfo )
 {
     mpCurrTable = mpCurrTable->PreOff( rInfo );
 }
 
-void ScHTMLQueryParser::CloseTable( const ImportInfo& rInfo )
+void ScHTMLQueryParser::CloseTable( const HtmlImportInfo& rInfo )
 {
     mpCurrTable = mpCurrTable->CloseTable( rInfo );
 }
@@ -3194,28 +3191,27 @@ void ScHTMLQueryParser::ParseStyle(const OUString& rStrm)
     }
 }
 
-IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, ImportInfo&, rInfo, void )
+IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, HtmlImportInfo&, rInfo, void )
 {
     switch( rInfo.eState )
     {
-        case HTMLIMP_START:
+        case HtmlImportState::Start:
         break;
 
-        case HTMLIMP_NEXTTOKEN:
-        case HTMLIMP_UNKNOWNATTR:
+        case HtmlImportState::NextToken:
             ProcessToken( rInfo );
         break;
 
-        case HTMLIMP_INSERTPARA:
+        case HtmlImportState::InsertPara:
             mpCurrTable->InsertPara( rInfo );
         break;
 
-        case HTMLIMP_SETATTR:
-        case HTMLIMP_INSERTTEXT:
-        case HTMLIMP_INSERTFIELD:
+        case HtmlImportState::SetAttr:
+        case HtmlImportState::InsertText:
+        case HtmlImportState::InsertField:
         break;
 
-        case HTMLIMP_END:
+        case HtmlImportState::End:
             while( mpCurrTable->GetTableId() != SC_HTML_GLOBAL_TABLE )
                 CloseTable( rInfo );
         break;
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index d36c70caf763..4c7ee1fca80c 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -175,12 +175,12 @@ private:
     bool                bInCell:1;
     bool                bInTitle:1;
 
-    DECL_LINK( HTMLImportHdl, ImportInfo&, void );
+    DECL_LINK( HTMLImportHdl, HtmlImportInfo&, void );
     void                NewActEntry( ScEEParseEntry* );
     static void         EntryEnd( ScEEParseEntry*, const ESelection& );
-    void                ProcToken( ImportInfo* );
-    void                CloseEntry( ImportInfo* );
-    void                NextRow(  ImportInfo*  );
+    void                ProcToken( HtmlImportInfo* );
+    void                CloseEntry( HtmlImportInfo* );
+    void                NextRow(  HtmlImportInfo*  );
     void                SkipLocked( ScEEParseEntry*, bool bJoin = true );
     static bool         SeekOffset( ScHTMLColOffset*, sal_uInt16 nOffset,
                                     SCCOL* pCol, sal_uInt16 nOffsetTol );
@@ -193,23 +193,23 @@ private:
     static void         ModifyOffset( ScHTMLColOffset*, sal_uInt16& nOldOffset,
                                     sal_uInt16& nNewOffset, sal_uInt16 nOffsetTol );
     void                Colonize( ScEEParseEntry* );
-    sal_uInt16              GetWidth( ScEEParseEntry* );
+    sal_uInt16          GetWidth( ScEEParseEntry* );
     void                SetWidths();
     void                Adjust();
 
-    sal_uInt16              GetWidthPixel( const HTMLOption& );
-    bool                IsAtBeginningOfText( ImportInfo* );
+    sal_uInt16          GetWidthPixel( const HTMLOption& );
+    bool                IsAtBeginningOfText( HtmlImportInfo* );
 
-    void                TableOn( ImportInfo* );
-    void                ColOn( ImportInfo* );
-    void                TableRowOn( ImportInfo* );
-    void                TableRowOff( ImportInfo* );
-    void                TableDataOn( ImportInfo* );
-    void                TableDataOff( ImportInfo* );
-    void                TableOff( ImportInfo* );
-    void                Image( ImportInfo* );
-    void                AnchorOn( ImportInfo* );
-    void                FontOn( ImportInfo* );
+    void                TableOn( HtmlImportInfo* );
+    void                ColOn( HtmlImportInfo* );
+    void                TableRowOn( HtmlImportInfo* );
+    void                TableRowOff( HtmlImportInfo* );
+    void                TableDataOn( HtmlImportInfo* );
+    void                TableDataOff( HtmlImportInfo* );
+    void                TableOff( HtmlImportInfo* );
+    void                Image( HtmlImportInfo* );
+    void                AnchorOn( HtmlImportInfo* );
+    void                FontOn( HtmlImportInfo* );
 
 public:
                         ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* );
@@ -288,9 +288,9 @@ public:
     /** Sets or cleares the import always state. */
     void         SetImportAlways() { mbImportAlways = true; }
     /** Sets start point of the entry selection to the start of the import info object. */
-    void                AdjustStart( const ImportInfo& rInfo );
+    void                AdjustStart( const HtmlImportInfo& rInfo );
     /** Sets end point of the entry selection to the end of the import info object. */
-    void                AdjustEnd( const ImportInfo& rInfo );
+    void                AdjustEnd( const HtmlImportInfo& rInfo );
     /** Deletes leading and trailing empty paragraphs from the entry. */
     void                Strip( const EditEngine& rEditEngine );
 
@@ -332,7 +332,7 @@ public:
         @param bPreFormText  true = Table is based on preformatted text ( tag). */
     explicit            ScHTMLTable(
                             ScHTMLTable& rParentTable,
-                            const ImportInfo& rInfo,
+                            const HtmlImportInfo& rInfo,
                             bool bPreFormText );
 
     virtual             ~ScHTMLTable();
@@ -351,9 +351,9 @@ public:
     /** Puts the item into the item set of the current entry. */
     void                PutItem( const SfxPoolItem& rItem );
     /** Inserts a text portion into current entry. */
-    void                PutText( const ImportInfo& rInfo );
+    void                PutText( const HtmlImportInfo& rInfo );
     /** Inserts a new line, if in preformatted text, else does nothing. */
-    void                InsertPara( const ImportInfo& rInfo );
+    void                InsertPara( const HtmlImportInfo& rInfo );
 
     /** Inserts a line break (
 tag).
         @descr  Inserts the current entry regardless if it is empty. */
@@ -365,38 +365,38 @@ public:
 
     /** Starts a *new* table nested in this table ( tag).
         @return  Pointer to the new table. */
-    ScHTMLTable*        TableOn( const ImportInfo& rInfo );
+    ScHTMLTable*        TableOn( const HtmlImportInfo& rInfo );
     /** Closes *this* table ( tag).
         @return  Pointer to the parent table. */
-    ScHTMLTable*        TableOff( const ImportInfo& rInfo );
+    ScHTMLTable*        TableOff( const HtmlImportInfo& rInfo );
     /** Starts a *new* table based on preformatted text ( tag).
         @return  Pointer to the new table. */
-    ScHTMLTable*        PreOn( const ImportInfo& rInfo );
+    ScHTMLTable*        PreOn( const HtmlImportInfo& rInfo );
     /** Closes *this* table based on preformatted text ( tag).
         @return  Pointer to the parent table. */
-    ScHTMLTable*        PreOff( const ImportInfo& rInfo );
+    ScHTMLTable*        PreOff( const HtmlImportInfo& rInfo );
 
     /** Starts next row ( tag).
         @descr  Cell address is invalid until first call of DataOn(). */
-    void                RowOn( const ImportInfo& rInfo );
+    void                RowOn( const HtmlImportInfo& rInfo );
     /** Closes the current row ( tag).
         @descr  Cell address is invalid until call of RowOn() and DataOn(). */
-    void                RowOff( const ImportInfo& rInfo );
+    void                RowOff( const HtmlImportInfo& rInfo );
     /** Starts the next cell ( or  tag). */
-    void                DataOn( const ImportInfo& rInfo );
+    void                DataOn( const HtmlImportInfo& rInfo );
     /** Closes the current cell ( or  tag).
         @descr  Cell address is invalid until next call of DataOn(). */
-    void                DataOff( const ImportInfo& rInfo );
+    void                DataOff( const HtmlImportInfo& rInfo );
 
     /** Starts the body of the HTML document ( tag). */
-    void                BodyOn( const ImportInfo& rInfo );
+    void                BodyOn( const HtmlImportInfo& rInfo );
     /** Closes the body of the HTML document ( tag). */
-    void                BodyOff( const ImportInfo& rInfo );
+    void                BodyOff( const HtmlImportInfo& rInfo );
 
     /** Closes *this* table ( tag) or preformatted text ( tag).
         @descr  Used to close this table object regardless on opening tag type.
         @return  Pointer to the parent table, or this, if no parent found. */
-    ScHTMLTable*        CloseTable( const ImportInfo& rInfo );
+    ScHTMLTable*        CloseTable( const HtmlImportInfo& rInfo );
 
     /** Returns the resulting document row/column count of the specified HTML row/column. */
     SCCOLROW            GetDocSize( ScHTMLOrient eOrient, SCCOLROW nCellPos ) const;
@@ -453,13 +453,13 @@ private:
     const SfxItemSet&   GetCurrItemSet() const;
 
     /** Returns true, if import info represents a space character. */
-    static bool         IsSpaceCharInfo( const ImportInfo& rInfo );
+    static bool         IsSpaceCharInfo( const HtmlImportInfo& rInfo );
 
     /** Creates and returns a new empty flying entry at position (0,0). */
     ScHTMLEntryPtr      CreateEntry() const;
     /** Creates a new flying entry.
         @param rInfo  Contains the initial edit engine selection for the entry. */
-    void                CreateNewEntry( const ImportInfo& rInfo );
+    void                CreateNewEntry( const HtmlImportInfo& rInfo );
 
     /** Inserts an empty line in front of the next entry. */
     void                InsertLeadingEmptyLine();
@@ -475,7 +475,7 @@ private:
         @param rInfo  The import info struct containing the end position of the current entry.
         @param bLastInCell  true = If cell is still empty, put this entry always.
         @return  true = Entry as been pushed into the current cell; false = Entry dropped. */
-    bool                PushEntry( const ImportInfo& rInfo, bool bLastInCell = false );
+    bool                PushEntry( const HtmlImportInfo& rInfo, bool bLastInCell = false );
     /** Pushes a new entry into current cell which references a nested table.*/
     void                PushTableEntry( ScHTMLTableId nTableId );
 
@@ -486,7 +486,7 @@ private:
     ScHTMLTable*        GetExistingTable( ScHTMLTableId nTableId ) const;
     /** Inserts a nested table in the current cell at the specified position.
         @param bPreFormText  true = New table is based on preformatted text ( tag). */
-    ScHTMLTable*        InsertNestedTable( const ImportInfo& rInfo, bool bPreFormText );
+    ScHTMLTable*        InsertNestedTable( const HtmlImportInfo& rInfo, bool bPreFormText );
 
     /** Inserts a new cell in an unused position, starting from current cell position. */
     void                InsertNewCell( const ScHTMLSize& rSpanSize );
@@ -501,7 +501,7 @@ private:
     void                ImplDataOff();
 
     /** Inserts additional formatting options from import info into the item set. */
-    static void         ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo );
+    static void         ProcessFormatOptions( SfxItemSet& rItemSet, const HtmlImportInfo& rInfo );
 
     /** Updates the document column/row size of the specified column or row.
         @descr  Only increases the present count, never decreases. */
@@ -577,39 +577,39 @@ public:
 
 private:
     /** Handles all possible tags in the HTML document. */
-    void                ProcessToken( const ImportInfo& rInfo );
+    void                ProcessToken( const HtmlImportInfo& rInfo );
     /** Inserts a text portion into current entry. */
-    void                InsertText( const ImportInfo& rInfo );
+    void                InsertText( const HtmlImportInfo& rInfo );
     /** Processes the  tag. */
-    void                FontOn( const ImportInfo& rInfo );
+    void                FontOn( const HtmlImportInfo& rInfo );
 
     /** Processes the  tag. */
-    void                MetaOn( const ImportInfo& rInfo );
+    void                MetaOn( const HtmlImportInfo& rInfo );
     /** Opens the title of the HTML document ( tag). */
-    void                TitleOn( const ImportInfo& rInfo );
+    void                TitleOn( const HtmlImportInfo& rInfo );
     /** Closes the title of the HTML document ( tag). */
-    void                TitleOff( const ImportInfo& rInfo );
+    void                TitleOff( const HtmlImportInfo& rInfo );
 
     /** Opens a new table at the current position. */
-    void                TableOn( const ImportInfo& rInfo );
+    void                TableOn( const HtmlImportInfo& rInfo );
     /** Closes the current table. */
-    void                TableOff( const ImportInfo& rInfo );
+    void                TableOff( const HtmlImportInfo& rInfo );
     /** Opens a new table based on preformatted text. */
-    void                PreOn( const ImportInfo& rInfo );
+    void                PreOn( const HtmlImportInfo& rInfo );
     /** Closes the current preformatted text table. */
-    void                PreOff( const ImportInfo& rInfo );
+    void                PreOff( const HtmlImportInfo& rInfo );
 
     /** Closes the current table, regardless on opening tag. */
-    void                CloseTable( const ImportInfo& rInfo );
+    void                CloseTable( const HtmlImportInfo& rInfo );
 
     void                ParseStyle(const OUString& rStrm);
 
-    DECL_LINK( HTMLImportHdl, ImportInfo&, void );
+    DECL_LINK( HTMLImportHdl, HtmlImportInfo&, void );
 
 private:
     typedef ::std::unique_ptr< ScHTMLGlobalTable >    ScHTMLGlobalTablePtr;
 
-    OUStringBuffer maTitle;            /// The title of the document.
+    OUStringBuffer      maTitle;            /// The title of the document.
     ScHTMLGlobalTablePtr mxGlobTable;       /// Contains the entire imported document.
     ScHTMLTable*        mpCurrTable;        /// Pointer to current table (performance).
     ScHTMLTableId       mnUnusedId;         /// First unused table identifier.
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index ccb79086fd39..ed627fcb6239 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -62,18 +62,18 @@ private:
     sal_uInt16          nLastWidth;
     bool                bNewDef;
 
-    DECL_LINK( RTFImportHdl, ImportInfo&, void );
+    DECL_LINK( RTFImportHdl, RtfImportInfo&, void );
     inline void         NextRow();
     void                EntryEnd( ScEEParseEntry*, const ESelection& );
-    void                ProcToken( ImportInfo* );
+    void                ProcToken( RtfImportInfo* );
     void                ColAdjust();
     bool                SeekTwips( sal_uInt16 nTwips, SCCOL* pCol );
-    void                NewCellRow( ImportInfo* );
+    void                NewCellRow( RtfImportInfo* );
 
 public:
                         ScRTFParser( EditEngine* );
     virtual             ~ScRTFParser() override;
-    virtual sal_uLong       Read( SvStream&, const OUString& rBaseURL ) override;
+    virtual sal_uLong   Read( SvStream&, const OUString& rBaseURL ) override;
 };
 
 #endif
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 15fce02a13c0..926efdd480c9 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -616,7 +616,7 @@ ScEEParser::ScEEParser( EditEngine* pEditP ) :
         nColMax(0),
         nRowMax(0)
 {
-    // pPool is foisted on SvxRTFParser at RTFIMP_START later on
+    // pPool is foisted on SvxRTFParser at RtfImportState::Start later on
     pPool->SetSecondaryPool( pDocPool );
     pPool->FreezeIdRanges();
     NewActEntry( nullptr );
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 5f9dbdfbe86c..87b2b5cac34a 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -56,8 +56,8 @@ ScRTFParser::~ScRTFParser()
 
 sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
 {
-    Link aOldLink = pEdit->GetImportHdl();
-    pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
+    Link aOldLink = pEdit->GetRtfImportHdl();
+    pEdit->SetRtfImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
     sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
     if ( nLastToken == RTF_PAR )
     {
@@ -81,7 +81,7 @@ sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
         }
     }
     ColAdjust();
-    pEdit->SetImportHdl( aOldLink );
+    pEdit->SetRtfImportHdl( aOldLink );
     return nErr;
 }
 
@@ -152,17 +152,17 @@ void ScRTFParser::ColAdjust()
     }
 }
 
-IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void )
+IMPL_LINK( ScRTFParser, RTFImportHdl, RtfImportInfo&, rInfo, void )
 {
     switch ( rInfo.eState )
     {
-        case RTFIMP_NEXTTOKEN:
+        case RtfImportState::NextToken:
             ProcToken( &rInfo );
             break;
-        case RTFIMP_UNKNOWNATTR:
+        case RtfImportState::UnknownAttr:
             ProcToken( &rInfo );
             break;
-        case RTFIMP_START:
+        case RtfImportState::Start:
         {
             SvxRTFParser* pParser = static_cast(rInfo.pParser);
             pParser->SetAttrPool( pPool );
@@ -172,7 +172,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void )
             rMap.nShadow = ATTR_SHADOW;
         }
             break;
-        case RTFIMP_END:
+        case RtfImportState::End:
             if ( rInfo.aSelection.nEndPos )
             {   // If still text: create last paragraph
                 pActDefault = nullptr;
@@ -183,11 +183,11 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void )
                 ProcToken( &rInfo );
             }
             break;
-        case RTFIMP_SETATTR:
+        case RtfImportState::SetAttr:
             break;
-        case RTFIMP_INSERTTEXT:
+        case RtfImportState::InsertText:
             break;
-        case RTFIMP_INSERTPARA:
+        case RtfImportState::InsertPara:
             break;
         default:
             OSL_FAIL("unknown ImportInfo.eState");
@@ -197,7 +197,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void )
 // Bad behavior:
 // For RTF_INTBL or respectively at the start of the first RTF_CELL
 // after RTF_CELLX if there was no RTF_INTBL
-void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ )
+void ScRTFParser::NewCellRow( RtfImportInfo* /*pInfo*/ )
 {
     if ( bNewDef )
     {
@@ -261,7 +261,7 @@ void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ )
 
  */
 
-void ScRTFParser::ProcToken( ImportInfo* pInfo )
+void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
 {
     switch ( pInfo->nToken )
     {
-- 
cgit