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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 90 insertions, 55 deletions

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index f5956ddee4cf..caad404b50ab 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1530,14 +1530,24 @@ Link<EditStatus&, void> EditEngine::GetStatusEventHdl() const
     return pImpEditEngine->GetStatusEventHdl();
 }
 
-void EditEngine::SetImportHdl( const Link<ImportInfo&,void>& rLink )
+void EditEngine::SetHtmlImportHdl( const Link<HtmlImportInfo&,void>& rLink )
 {
-    pImpEditEngine->aImportHdl = rLink;
+    pImpEditEngine->aHtmlImportHdl = rLink;
 }
 
-const Link<ImportInfo&,void>& EditEngine::GetImportHdl() const
+const Link<HtmlImportInfo&,void>& EditEngine::GetHtmlImportHdl() const
 {
-    return pImpEditEngine->aImportHdl;
+    return pImpEditEngine->aHtmlImportHdl;
+}
+
+void EditEngine::SetRtfImportHdl( const Link<RtfImportInfo&,void>& rLink )
+{
+    pImpEditEngine->aRtfImportHdl = rLink;
+}
+
+const Link<RtfImportInfo&,void>& EditEngine::GetRtfImportHdl() const
+{
+    return pImpEditEngine->aRtfImportHdl;
 }
 
 void EditEngine::SetBeginMovingParagraphsHdl( const Link<MoveParagraphsInfo&,void>& rLink )
@@ -2727,9 +2737,14 @@ void EditEngine::SetReplaceLeadingSingleQuotationMark( bool bReplace )
     pImpEditEngine->SetReplaceLeadingSingleQuotationMark( bReplace );
 }
 
-bool EditEngine::IsImportHandlerSet() const
+bool EditEngine::IsHtmlImportHandlerSet() const
 {
-    return pImpEditEngine->aImportHdl.IsSet();
+    return pImpEditEngine->aHtmlImportHdl.IsSet();
+}
+
+bool EditEngine::IsRtfImportHandlerSet() const
+{
+    return pImpEditEngine->aRtfImportHdl.IsSet();
 }
 
 bool EditEngine::IsImportRTFStyleSheetsSet() const
@@ -2737,9 +2752,14 @@ bool EditEngine::IsImportRTFStyleSheetsSet() const
     return pImpEditEngine->GetStatus().DoImportRTFStyleSheets();
 }
 
-void EditEngine::CallImportHandler(ImportInfo& rInfo)
+void EditEngine::CallHtmlImportHandler(HtmlImportInfo& rInfo)
+{
+    pImpEditEngine->aHtmlImportHdl.Call(rInfo);
+}
+
+void EditEngine::CallRtfImportHandler(RtfImportInfo& rInfo)
 {
-    pImpEditEngine->aImportHdl.Call(rInfo);
+    pImpEditEngine->aRtfImportHdl.Call(rInfo);
 }
 
 EditPaM EditEngine::InsertParaBreak(const EditSelection& rEditSelection)
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 965a18a1902d..1d8c87c59598 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -79,19 +79,19 @@ SvParserState EditHTMLParser::CallParser(EditEngine* pEE, const EditPaM& rPaM)
         // Build in wrap mimic in RTF import?
         aCurSel = EditSelection( rPaM, rPaM );
 
-        if (mpEditEngine->IsImportHandlerSet())
+        if (mpEditEngine->IsHtmlImportHandlerSet())
         {
-            ImportInfo aImportInfo(HTMLIMP_START, this, mpEditEngine->CreateESelection(aCurSel));
-            mpEditEngine->CallImportHandler(aImportInfo);
+            HtmlImportInfo aImportInfo(HtmlImportState::Start, this, mpEditEngine->CreateESelection(aCurSel));
+            mpEditEngine->CallHtmlImportHandler(aImportInfo);
         }
 
         ImpSetStyleSheet( 0 );
         _eState = HTMLParser::CallParser();
 
-        if (mpEditEngine->IsImportHandlerSet())
+        if (mpEditEngine->IsHtmlImportHandlerSet())
         {
-            ImportInfo aImportInfo(HTMLIMP_END, this, mpEditEngine->CreateESelection(aCurSel));
-            mpEditEngine->CallImportHandler(aImportInfo);
+            HtmlImportInfo aImportInfo(HtmlImportState::End, this, mpEditEngine->CreateESelection(aCurSel));
+            mpEditEngine->CallHtmlImportHandler(aImportInfo);
         }
 
         if ( bFieldsInserted )
@@ -491,26 +491,26 @@ void EditHTMLParser::NextToken( int nToken )
     }
     }   // SWITCH
 
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsHtmlImportHandlerSet())
     {
-        ImportInfo aImportInfo(HTMLIMP_NEXTTOKEN, this, mpEditEngine->CreateESelection(aCurSel));
+        HtmlImportInfo aImportInfo(HtmlImportState::NextToken, this, mpEditEngine->CreateESelection(aCurSel));
         aImportInfo.nToken = nToken;
         aImportInfo.nTokenValue = (short)nTokenValue;
         if ( nToken == HTML_TEXTTOKEN )
             aImportInfo.aText = aToken;
         else if (nToken == HTML_STYLE_OFF)
             aImportInfo.aText = maStyleSource.makeStringAndClear();
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallHtmlImportHandler(aImportInfo);
     }
 
 }
 
 void EditHTMLParser::ImpInsertParaBreak()
 {
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsHtmlImportHandlerSet())
     {
-        ImportInfo aImportInfo(HTMLIMP_INSERTPARA, this, mpEditEngine->CreateESelection(aCurSel));
-        mpEditEngine->CallImportHandler(aImportInfo);
+        HtmlImportInfo aImportInfo(HtmlImportState::InsertPara, this, mpEditEngine->CreateESelection(aCurSel));
+        mpEditEngine->CallHtmlImportHandler(aImportInfo);
     }
     aCurSel = mpEditEngine->InsertParaBreak(aCurSel);
 }
@@ -527,12 +527,12 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems )
     aStartPaM.SetIndex( 0 );
     aEndPaM.SetIndex( aEndPaM.GetNode()->Len() );
 
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsHtmlImportHandlerSet())
     {
         EditSelection aSel( aStartPaM, aEndPaM );
-        ImportInfo aImportInfo(HTMLIMP_SETATTR, this, mpEditEngine->CreateESelection(aSel));
+        HtmlImportInfo aImportInfo(HtmlImportState::SetAttr, this, mpEditEngine->CreateESelection(aSel));
         aImportInfo.pAttrs = const_cast<SfxItemSet *>(&rItems);
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallHtmlImportHandler(aImportInfo);
     }
 
     ContentNode* pSN = aStartPaM.GetNode();
@@ -659,11 +659,11 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
 
 void EditHTMLParser::ImpInsertText( const OUString& rText )
 {
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsHtmlImportHandlerSet())
     {
-        ImportInfo aImportInfo(HTMLIMP_INSERTTEXT, this, mpEditEngine->CreateESelection(aCurSel));
+        HtmlImportInfo aImportInfo(HtmlImportState::InsertText, this, mpEditEngine->CreateESelection(aCurSel));
         aImportInfo.aText = rText;
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallHtmlImportHandler(aImportInfo);
     }
 
     aCurSel = mpEditEngine->InsertText(aCurSel, rText);
@@ -795,10 +795,10 @@ void EditHTMLParser::AnchorEnd()
         bFieldsInserted = true;
         pCurAnchor.reset();
 
-        if (mpEditEngine->IsImportHandlerSet())
+        if (mpEditEngine->IsHtmlImportHandlerSet())
         {
-            ImportInfo aImportInfo(HTMLIMP_INSERTFIELD, this, mpEditEngine->CreateESelection(aCurSel));
-            mpEditEngine->CallImportHandler(aImportInfo);
+            HtmlImportInfo aImportInfo(HtmlImportState::InsertField, this, mpEditEngine->CreateESelection(aCurSel));
+            mpEditEngine->CallHtmlImportHandler(aImportInfo);
         }
     }
 }
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 22ca573a5588..e6c185273fe2 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -36,7 +36,7 @@
 
 using namespace com::sun::star;
 
-ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
+HtmlImportInfo::HtmlImportInfo( HtmlImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
     : aSelection( rSel )
 {
     pParser     = pPrsrs;
@@ -46,7 +46,21 @@ ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSe
     pAttrs      = nullptr;
 }
 
-ImportInfo::~ImportInfo()
+HtmlImportInfo::~HtmlImportInfo()
+{
+}
+
+RtfImportInfo::RtfImportInfo( RtfImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
+    : aSelection( rSel )
+{
+    pParser     = pPrsrs;
+    eState      = eSt;
+    nToken      = 0;
+    nTokenValue = 0;
+    pAttrs      = nullptr;
+}
+
+RtfImportInfo::~RtfImportInfo()
 {
 }
 
@@ -91,18 +105,18 @@ SvParserState EditRTFParser::CallParser()
     EditPaM aEnd1PaM = mpEditEngine->InsertParaBreak(aCurSel.Max());
     // aCurCel now points to the gap
 
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_START, this, mpEditEngine->CreateESelection(aCurSel));
-        mpEditEngine->CallImportHandler(aImportInfo);
+        RtfImportInfo aImportInfo(RtfImportState::Start, this, mpEditEngine->CreateESelection(aCurSel));
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
 
     SvParserState _eState = SvxRTFParser::CallParser();
 
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_END, this, mpEditEngine->CreateESelection(aCurSel));
-        mpEditEngine->CallImportHandler(aImportInfo);
+        RtfImportInfo aImportInfo(RtfImportState::End, this, mpEditEngine->CreateESelection(aCurSel));
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
 
     if (bLastActionInsertParaBreak)
@@ -214,12 +228,12 @@ void EditRTFParser::NextToken( int nToken )
         }
         break;
     }
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_NEXTTOKEN, this, mpEditEngine->CreateESelection(aCurSel));
+        RtfImportInfo aImportInfo(RtfImportState::NextToken, this, mpEditEngine->CreateESelection(aCurSel));
         aImportInfo.nToken = nToken;
         aImportInfo.nTokenValue = short(nTokenValue);
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
 }
 
@@ -227,23 +241,23 @@ void EditRTFParser::UnknownAttrToken( int nToken, SfxItemSet* )
 {
     // for Tokens which are not evaluated in ReadAttr
     // Actually, only for Calc (RTFTokenHdl), so that RTF_INTBL
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_UNKNOWNATTR, this, mpEditEngine->CreateESelection(aCurSel));
+        RtfImportInfo aImportInfo(RtfImportState::UnknownAttr, this, mpEditEngine->CreateESelection(aCurSel));
         aImportInfo.nToken = nToken;
         aImportInfo.nTokenValue = short(nTokenValue);
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
 }
 
 void EditRTFParser::InsertText()
 {
     OUString aText( aToken );
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_INSERTTEXT, this, mpEditEngine->CreateESelection(aCurSel));
+        RtfImportInfo aImportInfo(RtfImportState::InsertText, this, mpEditEngine->CreateESelection(aCurSel));
         aImportInfo.aText = aText;
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
     aCurSel = mpEditEngine->InsertText(aCurSel, aText);
     bLastActionInsertParaBreak = false;
@@ -251,10 +265,10 @@ void EditRTFParser::InsertText()
 
 void EditRTFParser::InsertPara()
 {
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
-        ImportInfo aImportInfo(RTFIMP_INSERTPARA, this, mpEditEngine->CreateESelection(aCurSel));
-        mpEditEngine->CallImportHandler(aImportInfo);
+        RtfImportInfo aImportInfo(RtfImportState::InsertPara, this, mpEditEngine->CreateESelection(aCurSel));
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
     aCurSel = mpEditEngine->InsertParaBreak(aCurSel);
     bLastActionInsertParaBreak = true;
@@ -344,12 +358,12 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
         }
     }
 
-    if (mpEditEngine->IsImportHandlerSet())
+    if (mpEditEngine->IsRtfImportHandlerSet())
     {
         EditSelection aSel( aStartPaM, aEndPaM );
-        ImportInfo aImportInfo(RTFIMP_SETATTR, this, mpEditEngine->CreateESelection(aSel));
+        RtfImportInfo aImportInfo(RtfImportState::SetAttr, this, mpEditEngine->CreateESelection(aSel));
         aImportInfo.pAttrs = &rSet;
-        mpEditEngine->CallImportHandler(aImportInfo);
+        mpEditEngine->CallRtfImportHandler(aImportInfo);
     }
 
     ContentNode* pSN = aStartPaM.GetNode();
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 644f4b2b88e6..e3a0d8046c5e 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -487,9 +487,10 @@ private:
     // If it is detected at one point that the StatusHdl has to be called, but
     // this should not happen immediately (critical section):
     Timer               aStatusTimer;
-    Link<EditStatus&,void>  aStatusHdlLink;
-    Link<EENotify&,void>    aNotifyHdl;
-    Link<ImportInfo&,void>  aImportHdl;
+    Link<EditStatus&,void>         aStatusHdlLink;
+    Link<EENotify&,void>           aNotifyHdl;
+    Link<HtmlImportInfo&,void>     aHtmlImportHdl;
+    Link<RtfImportInfo&,void>      aRtfImportHdl;
     Link<MoveParagraphsInfo&,void> aBeginMovingParagraphsHdl;
     Link<MoveParagraphsInfo&,void> aEndMovingParagraphsHdl;
     Link<PasteOrDropInfos&,void>   aBeginPasteOrDropHdl;