From 882cadaac40226ea9b5dbbceb7e82328d5a935ee Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 15 Dec 2017 16:10:33 +0200 Subject: convert EETextFormat to scoped enum and drop unused BIN constant Change-Id: I4ecda96f39147f7e9bceb11ecdb4f0ffe42d2053 Reviewed-on: https://gerrit.libreoffice.org/46589 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/filter/html/htmlpars.cxx | 4 ++-- sc/source/filter/rtf/rtfparse.cxx | 2 +- sc/source/ui/app/transobj.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sc') 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 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 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& rxOStm, void* p ScTabEditEngine* pEngine = static_cast(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& rxOStm, void* p ScTabEditEngine* pEngine = static_cast(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 ); } } -- cgit