From bfde4866e07746eafa2f0d6173c29d805cc35ad0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Dec 2016 08:47:18 +0200 Subject: convert DecodeMechanism to scoped enum Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547 --- sd/source/filter/cgm/sdcgmfilter.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 4 ++-- sd/source/filter/grf/sdgrffilter.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 4 ++-- sd/source/filter/html/pubdlg.cxx | 8 ++++---- sd/source/filter/ppt/pptin.cxx | 10 +++++----- sd/source/ui/app/sdmod.cxx | 2 +- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 6 +++--- sd/source/ui/dlg/navigatr.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/dlg/tpaction.cxx | 4 ++-- sd/source/ui/func/fudraw.cxx | 10 +++++----- sd/source/ui/func/fuinsert.cxx | 2 +- sd/source/ui/func/fusel.cxx | 4 ++-- sd/source/ui/func/futext.cxx | 2 +- sd/source/ui/sidebar/MasterPageDescriptor.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 4 ++-- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 +- sd/source/ui/view/drviews3.cxx | 2 +- sd/source/ui/view/drviewse.cxx | 2 +- sd/source/ui/view/sdview4.cxx | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) (limited to 'sd/source') diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 8384aa68533f..9c34f6286b53 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -75,7 +75,7 @@ bool SdCGMFilter::Import() #else ImportCGMPointer FncImportCGM = ImportCGM; #endif - OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); sal_uInt32 nRetValue; if( mrDocument.GetPageCount() == 0 ) diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 3112e651e5de..d1feda163db9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1131,13 +1131,13 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u else if ( INetProtocol::Smb == aUrl.GetProtocol() ) { // Convert smb notation to '\\' and skip the 'smb:' part - aFile = aUrl.GetMainURL(INetURLObject::NO_DECODE).copy(4); + aFile = aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE).copy(4); aFile = aFile.replaceAll( "/", "\\" ); aTarget = aFile; } else if ( pFieldEntry->aFieldUrl.startsWith("#") ) { - OUString aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, INetURLObject::DecodeMechanism::WithCharset ) ); aPage = aPage.copy( 1 ); std::vector::const_iterator pIter = std::find( diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 806e6b93f7c2..285b8b339a9a 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -169,7 +169,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n bool SdGRFFilter::Import() { Graphic aGraphic; - const OUString aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + const OUString aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); const sal_uInt16 nFilter = rGraphicFilter.GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); bool bRet = false; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 8bc792b3bfb4..bd30e1f719d9 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2869,7 +2869,7 @@ bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, con meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); sal_uLong nErr = 0; - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ); + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ); if( pIStm ) { @@ -3204,7 +3204,7 @@ sal_uLong EasyFile::createFileName( const OUString& rURL, OUString& rFileName ) aURL = INetURLObject( aURLStr ); } DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); - rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); + rFileName = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } return nErr; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index a203b0a0e56b..00878d6d8bf9 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -868,7 +868,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) INetURLObject::EncodeMechanism::All ); aValue.Name = "HomepageURL"; - aValue.Value <<= OUString( aHomeURL.GetMainURL( INetURLObject::NO_DECODE ) ); + aValue.Value <<= OUString( aHomeURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); aProps.push_back( aValue ); aValue.Name = "UserText"; @@ -1513,7 +1513,7 @@ void SdPublishingDlg::Load() // check if file exists, SfxMedium shows an errorbox else { - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ); + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ); bool bOk = pIStm && ( pIStm->GetError() == 0); @@ -1523,7 +1523,7 @@ void SdPublishingDlg::Load() return; } - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ | StreamMode::NOCREATE ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ | StreamMode::NOCREATE ); SvStream* pStream = aMedium.GetInStream(); @@ -1557,7 +1557,7 @@ bool SdPublishingDlg::Save() { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( "designs.sod" ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::WRITE | StreamMode::TRUNC ); SvStream* pStream = aMedium.GetOutStream(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 55279ace6cbe..c5304993dcc8 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -418,7 +418,7 @@ bool ImplSdPPTImport::Import() // Convert '\\' notation to 'smb://' INetURLObject aUrl( pHyperlink->aTarget, INetProtocol::File ); - pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::NO_DECODE ); + pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); if ( !aPropItem.Read( pHyperlink->aSubAdress ) ) break; @@ -1955,7 +1955,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const sal_uInt8* pBuf = new sal_uInt8[ nSoundDataLen ]; rStCtrl.ReadBytes(pBuf, nSoundDataLen); - SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ); + SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::WRITE | StreamMode::TRUNC ); if( pOStm ) { @@ -1963,8 +1963,8 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if( pOStm->GetError() == ERRCODE_NONE ) { - GalleryExplorer::InsertURL( GALLERY_THEME_USERSOUNDS, aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ) ); - aRetval = aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ); + GalleryExplorer::InsertURL( GALLERY_THEME_USERSOUNDS, aGalleryUserSound.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); + aRetval = aGalleryUserSound.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } delete pOStm; @@ -2031,7 +2031,7 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const if( osl::FileBase::getFileURLFromSystemPath( aStr, aRetVal ) == osl::FileBase::E_None ) { - aRetVal = INetURLObject( aRetVal ).GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + aRetVal = INetURLObject( aRetVal ).GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); }else{ aRetVal = aStr; } diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index d5cfa2a62fe0..18df03c9cd69 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -184,7 +184,7 @@ tools::SvRef SdModule::GetOptionStream( const OUString& rOptio aURL.Append( "drawing.cfg" ); - SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READWRITE ); + SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READWRITE ); if( pStm ) xOptionStorage = new SotStorage( pStm, true ); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 54c6be14b1bb..4f4011ef0da0 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -510,7 +510,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void) if (!sUrl.isEmpty()) aDlg.SetDisplayDirectory(sUrl); else - aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); + aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { @@ -530,8 +530,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void) { // Store full path, show filename only. Use INetURLObject to display spaces in filename correctly INetURLObject aUrl = INetURLObject(aFilesArr[i]); - sal_Int16 nPos = pImagesLst->InsertEntry( aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET) ); - pImagesLst->SetEntryData(nPos, new OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET))); + sal_Int16 nPos = pImagesLst->InsertEntry( aUrl.GetLastName(INetURLObject::DecodeMechanism::WithCharset) ); + pImagesLst->SetEntryData(nPos, new OUString(aUrl.GetMainURL(INetURLObject::DecodeMechanism::WithCharset))); } } } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 0f3c15fd9ace..c1e19adbd8c5 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -484,7 +484,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) } // get adjusted FileName - OUString aFileName( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aFileName( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); if (aFileName.isEmpty()) { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index d6a0434a9d39..c0be5330c245 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1165,7 +1165,7 @@ void SdPageObjsTLB::DoDrag() if( mpDropNavWin ) { ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); - OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::NO_DECODE ); + OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::DecodeMechanism::NONE ); NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); aURL += "#" + GetSelectEntry(); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 815fa6bbf207..0d917d66e906 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -304,7 +304,7 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) eCA == presentation::ClickAction_PROGRAM ) aFileName = ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aFileName, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, - INetURLObject::DECODE_UNAMBIGUOUS ); + INetURLObject::DecodeMechanism::Unambiguous ); rAttrs->Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); bModified = true; @@ -821,7 +821,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) aURL = INetURLObject( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aStr, URIHelper::GetMaybeFileHdl() ) ); // get adjusted file name - aStr = aURL.GetMainURL( INetURLObject::NO_DECODE ); + aStr = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); if( bFullDocDestination && eCA == presentation::ClickAction_DOCUMENT && diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 45c8dddbaaa2..c2929684422e 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -795,7 +795,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE if (aHelpText.isEmpty()) { // show url if no name is available - aHelpText = INetURLObject::decode( pIMapObj->GetURL(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText = INetURLObject::decode( pIMapObj->GetURL(), INetURLObject::DecodeMechanism::WithCharset ); } } } @@ -838,7 +838,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE // jump to object/page aHelpText = SD_RESSTR(STR_CLICK_ACTION_BOOKMARK); aHelpText += ": "; - aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset ); } break; @@ -847,7 +847,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE // jump to document (object/page) aHelpText = SD_RESSTR(STR_CLICK_ACTION_DOCUMENT); aHelpText += ": "; - aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset ); } break; @@ -856,7 +856,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE // execute program aHelpText = SD_RESSTR(STR_CLICK_ACTION_PROGRAM); aHelpText += ": "; - aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset ); } break; @@ -911,7 +911,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE /************************************************************** * URL-Field **************************************************************/ - aHelpText = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DecodeMechanism::WithCharset ); } if (!aHelpText.isEmpty()) diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f68e92bfa0ca..5edf2182b7ab 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -801,7 +801,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) if( aDlg.Execute() == ERRCODE_NONE ) { const INetURLObject aURL( aDlg.GetPath() ); - sURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + sURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ); } else if( !sURL.isEmpty() ) sURL.clear(); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 4a0acda8d055..90d2aa0d8d5b 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1365,11 +1365,11 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) OUString aBaseURL = GetDocSh()->GetMedium()->GetBaseURL(); INetURLObject aURL( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pInfo->GetBookmark(), URIHelper::GetMaybeFileHdl(), true, false, - INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DECODE_UNAMBIGUOUS ) ); + INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous ) ); if( INetProtocol::File == aURL.GetProtocol() ) { - SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 1657d2a39895..200c001daf07 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1187,7 +1187,7 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) if (pField && dynamic_cast< const SvxURLField *>( pField ) != nullptr) { // URL-Field - aHelpText = INetURLObject::decode( static_cast(pField)->GetURL(), INetURLObject::DECODE_WITH_CHARSET ); + aHelpText = INetURLObject::decode( static_cast(pField)->GetURL(), INetURLObject::DecodeMechanism::WithCharset ); } if (!aHelpText.isEmpty()) { diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index b60725562626..60e7931d5aec 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -38,7 +38,7 @@ MasterPageDescriptor::MasterPageDescriptor ( const std::shared_ptr& rpPreviewProvider) : maToken(MasterPageContainer::NIL_TOKEN), meOrigin(eOrigin), - msURL(INetURLObject(rsURL).GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS)), + msURL(INetURLObject(rsURL).GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)), msPageName(rsPageName), msStyleName(rsStyleName), mbIsPrecious(bIsPrecious), diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 4a71463d236b..140f0ac73cd0 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1535,11 +1535,11 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const css::awt::Mo INetURLObject(mpDocSh->GetMedium()->GetBaseURL()), pEvent->maStrBookmark, ::URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, - INetURLObject::DECODE_UNAMBIGUOUS ) ); + INetURLObject::DecodeMechanism::Unambiguous ) ); if( INetProtocol::File == aURL.GetProtocol() ) { - SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index c6aba162be0c..9b654caf04cb 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -969,7 +969,7 @@ void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue ) INetURLObject aPathURL( pList->GetPath() ); aPathURL.insertName( pList->GetName() ); aPathURL.setExtension( pList->GetDefaultExt() ); - OUString aPath( aPathURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aPath( aPathURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); *pValue <<= aPath; } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index d24e4cbeaefb..ea73c9427ab7 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -416,7 +416,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (pBookmark) { - OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), INetURLObject::DECODE_WITH_CHARSET)); + OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), INetURLObject::DecodeMechanism::WithCharset)); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if(xSlideshow.is() && xSlideshow->isRunning()) diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 704b8d9ff172..1e0d809efd68 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1474,7 +1474,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, - INetURLObject::DECODE_UNAMBIGUOUS ) ); + INetURLObject::DecodeMechanism::Unambiguous ) ); if (mpDrawView->GetMarkedObjectList().GetMarkCount() > 0) { SdrObject* pMarkedObj = mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 96a2ffc5363c..5fffe0460c1a 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -412,7 +412,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void) GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; - aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); + aCurrentDropFile = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); if( !::avmedia::MediaWindow::isMediaURL( aCurrentDropFile, ""/*TODO?*/ ) ) { -- cgit