convert EETextFormat to scoped enum

and drop unused BIN constant

Change-Id: I4ecda96f39147f7e9bceb11ecdb4f0ffe42d2053
Reviewed-on: https://gerrit.libreoffice.org/46589
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

19 files changed, 47 insertions, 68 deletions

diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index acd94199875e..1597764a4927 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3528,7 +3528,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference< datatransfer::XTransfera
                 aData >>= aSeq;
                 {
                     SvMemoryStream aODFStream( aSeq.getArray(), aSeq.getLength(), StreamMode::READ );
-                    aNewSelection = Read( aODFStream, rBaseURL, EE_FORMAT_XML, rPaM );
+                    aNewSelection = Read( aODFStream, rBaseURL, EETextFormat::Xml, rPaM );
                 }
                 bDone = true;
             }
@@ -3560,7 +3560,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference< datatransfer::XTransfera
                     aData >>= aSeq;
                     {
                         SvMemoryStream aRTFStream( aSeq.getArray(), aSeq.getLength(), StreamMode::READ );
-                        aNewSelection = Read( aRTFStream, rBaseURL, EE_FORMAT_RTF, rPaM );
+                        aNewSelection = Read( aRTFStream, rBaseURL, EETextFormat::Rtf, rPaM );
                     }
                     bDone = true;
                 }
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 684cb969b04b..8a1e7a67d520 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -88,13 +88,13 @@ EditPaM ImpEditEngine::Read(SvStream& rInput, const OUString& rBaseURL, EETextFo
     bool _bUpdate = GetUpdateMode();
     SetUpdateMode( false );
     EditPaM aPaM;
-    if ( eFormat == EE_FORMAT_TEXT )
+    if ( eFormat == EETextFormat::Text )
         aPaM = ReadText( rInput, rSel );
-    else if ( eFormat == EE_FORMAT_RTF )
+    else if ( eFormat == EETextFormat::Rtf )
         aPaM = ReadRTF( rInput, rSel );
-    else if ( eFormat == EE_FORMAT_XML )
+    else if ( eFormat == EETextFormat::Xml )
         aPaM = ReadXML( rInput, rSel );
-    else if ( eFormat == EE_FORMAT_HTML )
+    else if ( eFormat == EETextFormat::Html )
         aPaM = ReadHTML( rInput, rBaseURL, rSel, pHTTPHeaderAttrs );
     else
     {
@@ -189,13 +189,13 @@ void ImpEditEngine::Write(SvStream& rOutput, EETextFormat eFormat, const EditSel
 
     if ( !rOutput.GetError() )
     {
-        if ( eFormat == EE_FORMAT_TEXT )
+        if ( eFormat == EETextFormat::Text )
             WriteText( rOutput, rSel );
-        else if ( eFormat == EE_FORMAT_RTF )
+        else if ( eFormat == EETextFormat::Rtf )
             WriteRTF( rOutput, rSel );
-        else if ( eFormat == EE_FORMAT_XML )
+        else if ( eFormat == EETextFormat::Xml )
             WriteXML( rOutput, rSel );
-        else if ( eFormat == EE_FORMAT_HTML )
+        else if ( eFormat == EETextFormat::Html )
             ;
         else
         {
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d9985a5479ab..2e8d4aa9d7b3 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1081,7 +1081,7 @@ void Outliner::InvalidateBullet(sal_Int32 nPara)
     }
 }
 
-ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
 
     bool bOldUndo = pEditEngine->IsUndoEnabled();
@@ -1093,7 +1093,7 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 e
     Clear();
 
     ImplBlockInsertionCallbacks( true );
-    ErrCode nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
+    ErrCode nRet = pEditEngine->Read( rInput, rBaseURL, eFormat, pHTTPHeaderAttrs );
 
     bFirstParaIsEmpty = false;
 
@@ -1103,20 +1103,9 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 e
     {
         Paragraph* pPara = new Paragraph( 0 );
         pParaList->Append(pPara);
-
-        if ( eFormat == EE_FORMAT_BIN )
-        {
-            const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n );
-            const SfxInt16Item& rLevel = rAttrs.Get( EE_PARA_OUTLLEVEL );
-            sal_Int16 nDepth = rLevel.GetValue();
-            ImplInitDepth( n, nDepth, false );
-        }
     }
 
-    if ( eFormat != EE_FORMAT_BIN )
-    {
-        ImpFilterIndents( 0, nParas-1 );
-    }
+    ImpFilterIndents( 0, nParas-1 );
 
     ImplBlockInsertionCallbacks( false );
     pEditEngine->SetUpdateMode( bUpdate );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 22299ee40f42..d10a0c6db0ee 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1388,22 +1388,11 @@ void OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueItera
 
     for ( sal_Int32 n = nChangesStart; n <= nChangesEnd; n++ )
     {
-        if ( eFormat == EE_FORMAT_BIN )
-        {
-            const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n );
-            const SfxInt16Item& rLevel = rAttrs.Get( EE_PARA_OUTLLEVEL );
-            sal_uInt16 nDepth = rLevel.GetValue();
-            pOwner->ImplInitDepth( n, nDepth, false );
-        }
-
         if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject )
             pOwner->ImplSetLevelDependentStyleSheet( n );
     }
 
-    if ( eFormat != EE_FORMAT_BIN )
-    {
-        pOwner->ImpFilterIndents( nChangesStart, nChangesEnd );
-    }
+    pOwner->ImpFilterIndents( nChangesStart, nChangesEnd );
 }
 
 void OutlinerView::SetBackgroundColor( const Color& rColor )
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index bfa4be78ca9a..f4819b9a9d0c 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -229,10 +229,10 @@ namespace frm
                         EETextFormat    eFormat;
                     } aExportFormats[] =
                     {
-                        { "OASIS OpenDocument (*.xml)", "*.xml", EE_FORMAT_XML },
-                        { "HyperText Markup Language (*.html)", "*.html", EE_FORMAT_HTML },
-                        { "Rich Text format (*.rtf)", "*.rtf", EE_FORMAT_RTF },
-                        { "Text (*.txt)", "*.txt", EE_FORMAT_TEXT }
+                        { "OASIS OpenDocument (*.xml)", "*.xml", EETextFormat::Xml },
+                        { "HyperText Markup Language (*.html)", "*.html", EETextFormat::Html },
+                        { "Rich Text format (*.rtf)", "*.rtf", EETextFormat::Rtf },
+                        { "Text (*.txt)", "*.txt", EETextFormat::Text }
                     };
 
                     ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, this );
@@ -252,7 +252,7 @@ namespace frm
                         );
                         if ( pStream )
                         {
-                            EETextFormat eFormat = EE_FORMAT_XML;
+                            EETextFormat eFormat = EETextFormat::Xml;
                             OUString sFilter = aFP.GetCurrentFilter();
                             for (auto & aExportFormat : aExportFormats)
                             {
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 9dc75ce0bed3..eef5770900a1 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -33,7 +33,7 @@ class SvxFieldItem;
 class SvxRTFItemStackType;
 enum class HtmlTokenId : sal_Int16;
 
-enum EETextFormat       { EE_FORMAT_TEXT = 0x20, EE_FORMAT_RTF, EE_FORMAT_BIN = 0x31, EE_FORMAT_HTML, EE_FORMAT_XML };
+enum class EETextFormat { Text = 0x20, Rtf, Html = 0x32, Xml };
 enum EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R, EE_HTEXTDIR_R2L };
 enum class EESelectionMode  { Std, TxtOnly, Hidden };
     // EE_SELMODE_HIDDEN can be used to completely hide the selection. This is useful e.g. when you want show the selection
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 1cc38d50263e..0ae54025809a 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -886,7 +886,7 @@ public:
     sal_Int32           GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const;
     sal_uLong           GetLineHeight( sal_Int32 nParagraph );
 
-    ErrCode             Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
+    ErrCode             Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
 
     ::svl::IUndoManager& GetUndoManager();
     ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index a2860906481f..25b1e9095c6d 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -49,6 +49,7 @@ class EditStatus;
 class TextChain;
 class TextChainFlow;
 enum class EEAnchorMode;
+enum class EETextFormat;
 
 namespace sdr { namespace properties {
     class TextProperties;
@@ -377,8 +378,8 @@ public:
     void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; }
     void NbcSetText(const OUString& rStr);
     void SetText(const OUString& rStr);
-    void NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
-    void SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
+    void NbcSetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat);
+    void SetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat);
 
     // FitToSize and Fontwork are not taken into account in GetTextSize()!
     virtual const Size& GetTextSize() const;
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index fe37cdaca05b..8c4deca123b9 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -110,7 +110,7 @@ public:
         const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
 
     bool            Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
-    bool            Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
+    bool            Paste(SvStream& rInput, EETextFormat eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions);
 };
 
 #endif // INCLUDED_SVX_SVDXCGV_HXX
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 33ad390b1c0b..e73739c84b59 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -270,7 +270,7 @@ ErrCode ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
         }
     }
 
-    ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
+    ErrCode nErr = pEdit->Read( rStream, rBaseURL, EETextFormat::Html, pAttributes );
 
     pEdit->SetHtmlImportHdl( aOldLink );
     // Create column width
@@ -2820,7 +2820,7 @@ ErrCode ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL  )
 
     Link<HtmlImportInfo&,void> aOldLink = pEdit->GetHtmlImportHdl();
     pEdit->SetHtmlImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
-    ErrCode nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
+    ErrCode nErr = pEdit->Read( rStrm, rBaseURL, EETextFormat::Html, pAttributes );
     pEdit->SetHtmlImportHdl( aOldLink );
 
     mxGlobTable->Recalc();
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 3d0297f73f68..57bf009e89e4 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -60,7 +60,7 @@ ErrCode ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
 {
     Link<RtfImportInfo&,void> aOldLink = pEdit->GetRtfImportHdl();
     pEdit->SetRtfImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
-    ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
+    ErrCode nErr = pEdit->Read( rStream, rBaseURL, EETextFormat::Rtf );
     if ( nRtfLastToken == RTF_PAR )
     {
         if ( !maList.empty() )
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 69e1c442846b..77e528a0dff0 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -437,7 +437,7 @@ bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* p
                 ScTabEditEngine* pEngine = static_cast<ScTabEditEngine*>(pUserObject);
                 if ( nUserObjectId == SCTRANS_TYPE_EDIT_RTF )
                 {
-                    pEngine->Write( *rxOStm, EE_FORMAT_RTF );
+                    pEngine->Write( *rxOStm, EETextFormat::Rtf );
                     bRet = ( rxOStm->GetError() == ERRCODE_NONE );
                 }
                 else
@@ -464,7 +464,7 @@ bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* p
                 ScTabEditEngine* pEngine = static_cast<ScTabEditEngine*>(pUserObject);
                 if ( nUserObjectId == SCTRANS_TYPE_EDIT_ODF_TEXT_FLAT )
                 {
-                    pEngine->Write( *rxOStm, EE_FORMAT_XML );
+                    pEngine->Write( *rxOStm, EETextFormat::Xml );
                     bRet = ( rxOStm->GetError() == ERRCODE_NONE );
                 }
             }
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 279f7f3acb0e..9c0fd2c6d172 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -426,12 +426,12 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
     if( nRet == RET_OK )
     {
         // selected file format: text, RTF or HTML (default is text)
-        sal_uInt16 nFormat = EE_FORMAT_TEXT;
+        EETextFormat nFormat = EETextFormat::Text;
 
         if( aFilterName.indexOf( "Rich") != -1 )
-            nFormat = EE_FORMAT_RTF;
+            nFormat = EETextFormat::Rtf;
         else if( aFilterName.indexOf( "HTML" ) != -1 )
-            nFormat = EE_FORMAT_HTML;
+            nFormat = EETextFormat::Html;
 
         /* create our own outline since:
            - it is possible that the document outliner is actually used in the
@@ -547,12 +547,12 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 {
     // selected file format: text, RTF or HTML (default is text)
-    sal_uInt16 nFormat = EE_FORMAT_TEXT;
+    EETextFormat nFormat = EETextFormat::Text;
 
     if( aFilterName.indexOf( "Rich") != -1 )
-        nFormat = EE_FORMAT_RTF;
+        nFormat = EETextFormat::Rtf;
     else if( aFilterName.indexOf( "HTML" ) != -1 )
-        nFormat = EE_FORMAT_HTML;
+        nFormat = EETextFormat::Html;
 
     ::Outliner&    rDocliner = static_cast<OutlineView*>(mpView)->GetOutliner();
 
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6b53701739b8..ea3dfe5689f2 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1760,7 +1760,7 @@ ErrCode OutlineViewShell::ReadRtf(SvStream& rInput)
     OutlineViewPageChangesGuard aGuard( pOlView );
     OutlineViewModelChangeGuard aGuard2( *pOlView );
 
-    bRet = rOutl.Read( rInput, OUString(), EE_FORMAT_RTF, GetDocSh()->GetHeaderAttributes() );
+    bRet = rOutl.Read( rInput, OUString(), EETextFormat::Rtf, GetDocSh()->GetHeaderAttributes() );
 
     SdPage* pPage = GetDoc()->GetSdPage( GetDoc()->GetSdPageCount(PageKind::Standard) - 1, PageKind::Standard );
     SfxStyleSheet* pTitleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3545a22bb155..dd41e3a505f4 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1388,7 +1388,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
         {
             xStm->Seek( 0 );
             // mba: clipboard always must contain absolute URLs (could be from alien source)
-            bReturn = SdrView::Paste( *xStm, EE_FORMAT_HTML, maDropPos, pPage, nPasteOptions );
+            bReturn = SdrView::Paste( *xStm, EETextFormat::Html, maDropPos, pPage, nPasteOptions );
         }
     }
 
@@ -1409,14 +1409,14 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                 if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
                 {
                     // mba: clipboard always must contain absolute URLs (could be from alien source)
-                    pOLV->Read( *xStm, EE_FORMAT_XML, mpDocSh->GetHeaderAttributes() );
+                    pOLV->Read( *xStm, EETextFormat::Xml, mpDocSh->GetHeaderAttributes() );
                     bReturn = true;
                 }
             }
 
             if( !bReturn )
                 // mba: clipboard always must contain absolute URLs (could be from alien source)
-                bReturn = SdrView::Paste( *xStm, EE_FORMAT_XML, maDropPos, pPage, nPasteOptions );
+                bReturn = SdrView::Paste( *xStm, EETextFormat::Xml, maDropPos, pPage, nPasteOptions );
         }
     }
 
@@ -1445,14 +1445,14 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                     if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
                     {
                         // mba: clipboard always must contain absolute URLs (could be from alien source)
-                        pOLV->Read( *xStm, EE_FORMAT_RTF, mpDocSh->GetHeaderAttributes() );
+                        pOLV->Read( *xStm, EETextFormat::Rtf, mpDocSh->GetHeaderAttributes() );
                         bReturn = true;
                     }
                 }
 
                 if( !bReturn )
                     // mba: clipboard always must contain absolute URLs (could be from alien source)
-                    bReturn = SdrView::Paste( *xStm, EE_FORMAT_RTF, maDropPos, pPage, nPasteOptions );
+                    bReturn = SdrView::Paste( *xStm, EETextFormat::Rtf, maDropPos, pPage, nPasteOptions );
             }
         }
     }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4662f70df497..1063eb5f53a5 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -232,7 +232,7 @@ void SdrTextObj::SetText(const OUString& rStr)
     SendUserCall(SdrUserCallType::Resize,aBoundRect0);
 }
 
-void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
+void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
@@ -246,7 +246,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt
     bTextSizeDirty=false;
 }
 
-void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
+void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat)
 {
     tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
     NbcSetText(rInput,rBaseURL,eFormat);
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 0f28c039e00b..75964d95d60b 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -228,7 +228,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, rtl_TextEncoding eCharSet)
 
         if( !pIStm->GetError() )
         {
-            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
+            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), bRTF ? EETextFormat::Rtf : EETextFormat::Text );
             bRet = true;
         }
     }
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 6be43e323202..865ff1d0b8d2 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -165,7 +165,7 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList*
     return true;
 }
 
-bool SdrExchangeView::Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions)
+bool SdrExchangeView::Paste(SvStream& rInput, EETextFormat eFormat, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index eb09145f52db..07c2e0395600 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -163,7 +163,7 @@ void SdrTableRTFParser::Read( SvStream& rStream )
 
     Link<RtfImportInfo&,void> aOldLink( rEdit.GetRtfImportHdl() );
     rEdit.SetRtfImportHdl( LINK( this, SdrTableRTFParser, RTFImportHdl ) );
-    mpOutliner->Read( rStream, OUString(), EE_FORMAT_RTF );
+    mpOutliner->Read( rStream, OUString(), EETextFormat::Rtf );
     rEdit.SetRtfImportHdl( aOldLink );
 
     FillTable();