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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/macroloader.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 79f8ce50b88b..5557ab3c6f6d 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -218,7 +218,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An { // find BasicManager SfxObjectShell* pDoc = NULL; - OUString aBasMgrName( INetURLObject::decode(aMacro.copy( 8, nHashPos-8 ), '%', INetURLObject::DECODE_WITH_CHARSET) ); + OUString aBasMgrName( INetURLObject::decode(aMacro.copy( 8, nHashPos-8 ), INetURLObject::DECODE_WITH_CHARSET) ); if ( aBasMgrName.isEmpty() ) pBasMgr = pAppMgr; else if ( aBasMgrName == "." ) @@ -255,7 +255,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An } // find BASIC method - OUString aQualifiedMethod( INetURLObject::decode(aMacro.copy( nHashPos+1 ), '%', INetURLObject::DECODE_WITH_CHARSET) ); + OUString aQualifiedMethod( INetURLObject::decode(aMacro.copy( nHashPos+1 ), INetURLObject::DECODE_WITH_CHARSET) ); OUString aArgs; if ( -1 != nArgsPos ) { @@ -318,7 +318,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An { // direct API call on a specified object OUStringBuffer aCall; - aCall.append('[').append(INetURLObject::decode(aMacro.copy(6), '%', + aCall.append('[').append(INetURLObject::decode(aMacro.copy(6), INetURLObject::DECODE_WITH_CHARSET)); aCall.append(']'); pAppMgr->GetLib(0)->Execute(aCall.makeStringAndClear()); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index d16ed6a01af4..3f90d2d381e4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -936,7 +936,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_ { OUString aToken = aUserData.getToken(i, ';'); m_pSearchED->InsertEntry( INetURLObject::decode( - aToken, '%', INetURLObject::DECODE_WITH_CHARSET ) ); + aToken, INetURLObject::DECODE_WITH_CHARSET ) ); } } } @@ -959,7 +959,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() { OUString aText = m_pSearchED->GetEntry(i); aUserData += INetURLObject::encode( - aText, INetURLObject::PART_UNO_PARAM_VALUE, '%', + aText, INetURLObject::PART_UNO_PARAM_VALUE, INetURLObject::ENCODE_ALL ); aUserData += ";"; } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index d355efacaba5..0d98a2584b15 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -561,7 +561,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_STRING], 6 )) { // STRING support - rArgs[nLen].Value <<= OUString( INetURLObject::decode( aValue, '%', INetURLObject::DECODE_WITH_CHARSET )); + rArgs[nLen].Value <<= OUString( INetURLObject::decode( aValue, INetURLObject::DECODE_WITH_CHARSET )); } else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_DOUBLE], 6)) { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 228900c661af..73deeca8877c 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2683,7 +2683,6 @@ void SfxMedium::SetIsRemote_Impl() case INetProtocol::Ftp: case INetProtocol::Http: case INetProtocol::Https: - case INetProtocol::Vim: pImp->m_bRemote = true; break; default: diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8ec5d45a9d63..19e74f38ef64 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -928,7 +928,7 @@ OUString SfxObjectShell::GetTitle else if ( nMaxLength == SFX_TITLE_FILENAME ) { OUString aName( aURL.GetBase() ); - aName = INetURLObject::decode( aName, '%', INetURLObject::DECODE_WITH_CHARSET ); + aName = INetURLObject::decode( aName, INetURLObject::DECODE_WITH_CHARSET ); if( aName.isEmpty() ) aName = aURL.GetURLNoPass(); return X(aName); diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 57c1c085e3ec..b6ad3b1902d1 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -444,7 +444,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i sal_Int32 nArgsPos = aScript.indexOf( '(' ); if ( ( nHashPos != -1 ) && ( nArgsPos == -1 || nHashPos < nArgsPos ) ) { - OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), '%', INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INetURLObject::DECODE_WITH_CHARSET ) ); if ( aBasMgrName == "." ) aLibrary = pDoc->GetTitle(); else |