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>

3 files changed, 12 insertions, 12 deletions

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 );
             }
         }
     }