diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
commit | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch) | |
tree | be939a44eb70c7187fa5536089b782326b160013 /editeng | |
parent | 803215142efa6437515348f63bd70ffdcf5d45f1 (diff) |
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/eehtml.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/flditem.cxx | 8 | ||||
-rw-r--r-- | editeng/source/misc/acorrcfg.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/svxacorr.cxx | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 4f7f99bba563..44aabf82c9ed 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -778,7 +778,7 @@ void EditHTMLParser::AnchorStart() INetURLObject aTargetURL; INetURLObject aRootURL( aBaseURL ); aRootURL.GetNewAbsURL( aRef, &aTargetURL ); - aURL = aTargetURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); + aURL = aTargetURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } pCurAnchor = new AnchorInfo; pCurAnchor->aHRef = aURL; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 30e742b0a79d..f235b5ea8f6e 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -996,11 +996,11 @@ OUString SvxExtFileField::GetFormatted() const break; case SVXFILEFORMAT_NAME: - aString = aURLObj.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_UNAMBIGUOUS); + aString = aURLObj.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DecodeMechanism::Unambiguous); break; case SVXFILEFORMAT_NAME_EXT: - aString = aURLObj.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_UNAMBIGUOUS); + aString = aURLObj.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DecodeMechanism::Unambiguous); break; } } @@ -1009,14 +1009,14 @@ OUString SvxExtFileField::GetFormatted() const switch( eFormat ) { case SVXFILEFORMAT_FULLPATH: - aString = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + aString = aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); break; case SVXFILEFORMAT_PATH: aURLObj.removeSegment(INetURLObject::LAST_SEGMENT, false); // #101742# Leave trailing slash at the pathname aURLObj.setFinalSlash(); - aString = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + aString = aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); break; case SVXFILEFORMAT_NAME: diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index a07187d55bcb..fd227fc171ea 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -64,7 +64,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : { INetURLObject aPath( *pS ); aPath.insertName("acor"); - *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI); + *pS = aPath.GetMainURL(INetURLObject::DecodeMechanism::ToIUri); } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cb64cbb47974..03e90b37eb60 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2369,7 +2369,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { try { - OUString sMain(aDest.GetMainURL( INetURLObject::DECODE_TO_IURI )); + OUString sMain(aDest.GetMainURL( INetURLObject::DecodeMechanism::ToIUri )); sal_Unicode cSlash = '/'; sal_Int32 nSlashPos = sMain.lastIndexOf(cSlash); sMain = sMain.copy(0, nSlashPos); @@ -2377,7 +2377,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() TransferInfo aInfo; aInfo.NameClash = NameClash::OVERWRITE; aInfo.NewTitle = aDest.GetName(); - aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI ); + aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); aInfo.MoveData = false; aNewContent.executeCommand( "transfer", Any(aInfo)); } @@ -2388,7 +2388,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() } if (bConvert && !bError) { - tools::SvRef<SotStorage> xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), StreamMode::READ ); + tools::SvRef<SotStorage> xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ), StreamMode::READ ); tools::SvRef<SotStorage> xDstStg = new SotStorage( sUserAutoCorrFile, StreamMode::WRITE ); if( xSrcStg.Is() && xDstStg.Is() ) @@ -2423,7 +2423,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() xDstStg = nullptr; try { - ::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + ::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aContent.executeCommand ( "delete", makeAny ( true ) ); } catch (...) |