diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-01 08:48:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-01 12:14:45 +0300 |
| commit | fe41e4ba11f66d247ca4b09563c3ea21728fa410 (patch) | |
| tree | 6d99b24d8bb32e4924cf1889986c17552d629ba6 /sfx2/source | |
| parent | Bin pointless INET_MARK_TOKEN (diff) | |
| download | core-fe41e4ba11f66d247ca4b09563c3ea21728fa410.tar.gz core-fe41e4ba11f66d247ca4b09563c3ea21728fa410.zip | |
Bin pointless INET_HEX_ESCAPE
Change-Id: I72238e511c2fca4a4aba0be60b0f2d3b1f46e5c2
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/macroloader.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 81afe1f76407..3560779e0794 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -216,7 +216,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 ), INET_HEX_ESCAPE, 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 == "." ) @@ -253,7 +253,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An } // find BASIC method - OUString aQualifiedMethod( INetURLObject::decode(aMacro.copy( nHashPos+1 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET) ); + OUString aQualifiedMethod( INetURLObject::decode(aMacro.copy( nHashPos+1 ), '%', INetURLObject::DECODE_WITH_CHARSET) ); OUString aArgs; if ( -1 != nArgsPos ) { @@ -316,7 +316,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), INET_HEX_ESCAPE, + 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/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index c33915591764..46f0c21a174f 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -919,7 +919,7 @@ OUString SfxObjectShell::GetTitle else if ( nMaxLength == SFX_TITLE_FILENAME ) { OUString aName( aURL.GetBase() ); - aName = INetURLObject::decode( aName, INET_HEX_ESCAPE, 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 7dbf539cea8b..6d92c0e3f231 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 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), '%', INetURLObject::DECODE_WITH_CHARSET ) ); if ( aBasMgrName == "." ) aLibrary = pDoc->GetTitle(); else |