diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 20:21:21 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 20:21:21 +0200 |
commit | 5ba54aacd5318fbf9b9f0589a090f717c53833c7 (patch) | |
tree | 6028b817c850a5e1e178c0def4d4e61e949409b7 /sw | |
parent | 2a4753b9a36bb136945857c3b882b00ad2b4486d (diff) |
Remove dead INetProtocol::Vim
...which removes the need to abstract over the standard URI '%' escape prefix
vs. the silly vim '=' special case invention.
Change-Id: I54a52dd912c3aafc38275a0ac2466a6daeec328f
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/EnhancedPDFExportHelper.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/shells/grfsh.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 4 |
12 files changed, 9 insertions, 18 deletions
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index b542395e5463..ccd7b3cbd996 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -431,7 +431,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, rpPam = 0; rpRange = 0; - OUString sItem( INetURLObject::decode( rStr, '%', + OUString sItem( INetURLObject::decode( rStr, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index b16697d3cfbd..7a08004e1095 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1647,7 +1647,6 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // than one link to this destination: OUString aURL( INetURLObject::decode( p->rINetAttr.GetINetFmt().GetValue(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index acb05069bc36..5e56daac17a5 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1162,7 +1162,7 @@ ANCHOR_SETEVENT: // wir hier ganz rigoros raus. if( !aName.isEmpty() ) { - OUString sDecoded( INetURLObject::decode( aName, '%', + OUString sDecoded( INetURLObject::decode( aName, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); sal_Int32 nPos = sDecoded.lastIndexOf( cMarkSeparator ); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index f477ff4613e8..340613ac29c8 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1085,14 +1085,14 @@ bool WW8AttributeOutput::EndURL(bool const) OUString BookmarkToWord(const OUString &rBookmark) { OUString sRet(INetURLObject::encode(rBookmark, - INetURLObject::PART_REL_SEGMENT_EXTRA, '%', + INetURLObject::PART_REL_SEGMENT_EXTRA, INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_ASCII_US)); return TruncateBookmark(sRet); } OUString BookmarkToWriter(const OUString &rBookmark) { - return INetURLObject::decode(rBookmark, '%', + return INetURLObject::decode(rBookmark, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_ASCII_US); } diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index f2f19afc0174..7ef726f89087 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -195,7 +195,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet) { const SwFmtINetFmt* pINetFmt = static_cast<const SwFmtINetFmt*>( pItem); m_pURLED->SetText(INetURLObject::decode(pINetFmt->GetValue(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, + INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8)); m_pURLED->SaveValue(); m_pURLED->SetText(pINetFmt->GetName()); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 8f4c71211e6b..faa738fb3582 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -206,7 +206,7 @@ SectRepr::SectRepr( sal_uInt16 nPos, SwSection& rSect ) void SectRepr::SetFile( const OUString& rFile ) { - OUString sNewFile( INetURLObject::decode( rFile, '%', + OUString sNewFile( INetURLObject::decode( rFile, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); const OUString sOldFileName( m_SectionData.GetLinkFileName() ); @@ -293,7 +293,6 @@ OUString SectRepr::GetFile() const .replaceFirst( OUString(sfx2::cTokenSeparator), " ", &n ); } return INetURLObject::decode( sLinkFile.getToken( 0, sfx2::cTokenSeparator ), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); } @@ -1783,7 +1782,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil if ( SfxItemState::SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, false, &pItem ) ) m_sFilePasswd = static_cast<const SfxStringItem*>(pItem)->GetValue(); m_pFileNameED->SetText( INetURLObject::decode( - m_sFileName, '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) ); + m_sFileName, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) ); ::lcl_ReadSections(*pMedium, *m_pSubRegionED); } } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 94e4b02b6b23..9fade37ddb7e 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2540,7 +2540,6 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) { // remember selected filter aFilterName = pGrfDlg->GetCurrentFilter(); aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); m_pConnectED->SetModifyFlag(); @@ -2726,7 +2725,6 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet ) { const SwFmtURL* pFmtURL = static_cast<const SwFmtURL*>(pItem); pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); pNameED->SetText( pFmtURL->GetName()); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index db7c1b396d57..08decd16e133 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1200,7 +1200,6 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* ) m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(nData))); sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); m_pFromFileCB->Check( !sAutoMarkURL.isEmpty() ); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index d34efb368cb1..45230c1d9e74 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2562,7 +2562,6 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext); OUString sNewName = INetURLObject::decode( aURL.getName(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); sal_Int32 nExtLen = aURL.GetExtension().getLength(); diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index a85b1be431e7..effa9f4b31aa 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -305,7 +305,6 @@ void SwGrfShell::Execute(SfxRequest &rReq) if( !sGrfNm.isEmpty() ) { aSet.Put( SvxBrushItem( INetURLObject::decode( sGrfNm, - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ), sFilterNm, GPOS_LT, diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 0e59206f5774..19530171d8fd 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1902,7 +1902,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) const SwFmtINetFmt* pINet; OUString sCmp; - OUString sMark( INetURLObject::decode( rMark, '%', + OUString sMark( INetURLObject::decode( rMark, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index b2a8e34b02c4..d7ccd6ae1aef 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -364,7 +364,6 @@ void SwContentType::Init(bool* pbInvalidateWindow) p->sText, INetURLObject::decode( p->rINetAttr.GetINetFmt().GetValue(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ), &p->rINetAttr, @@ -567,7 +566,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) OUString sLink; pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrmFmt*>( pFrmFmt)); pCnt = new SwGraphicContent(this, sFrmName, - INetURLObject::decode( sLink, '%', + INetURLObject::decode( sLink, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ), pFrmFmt->FindLayoutRect(false, &aNullPt).Top()); @@ -669,7 +668,6 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) p->sText, INetURLObject::decode( p->rINetAttr.GetINetFmt().GetValue(), - '%', INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ), &p->rINetAttr, |