diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-09 21:05:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 10:09:28 +0000 |
| commit | 3c62fbcdd78e472d3dde604eff33be54cb3e21be (patch) | |
| tree | 12a45fa393c2ce35a1fdff7efc0a63ef7600b7cd /svtools/source | |
| parent | ffbd3846d40eaf3dc8e8fa37e57d48ff7da88a5b (diff) | |
simplify LocalFileHelper::ConvertURLToPhysicalName
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 21547e3389c2..39461a6ff43c 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -260,7 +260,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, ) String sCompletion( *(*pThis->pCompletions)[nPos] ); // convert the file into an URL - String sURL( sCompletion ); + rtl::OUString sURL( sCompletion ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCompletion, sURL ); // note: if this doesn't work, we're not interested in: we're checking the // untouched sCompletion then @@ -273,7 +273,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, ) continue; } } - if (( sURL.Len() > 0 ) && ( sURL.GetChar(sURL.Len()-1) != '/' )) + if (( sURL.getLength() > 0 ) && ( sURL[sURL.getLength()-1] != '/' )) { String sUpperURL( sURL ); sUpperURL.ToUpperAscii(); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index eec9b4f241d7..3b4bfc44ff37 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -215,7 +215,7 @@ void GraphicObject::ImplAutoSwapIn() { if( HasLink() ) { - String aURLStr; + rtl::OUString aURLStr; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( GetLink(), aURLStr ) ) { diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index c4deeecfd763..c64aa8b3c30f 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -591,7 +591,7 @@ namespace svt aParser.SetURL( _rPath, INetURLObject::WAS_ENCODED ); if ( INET_PROT_NOT_VALID == aParser.GetProtocol() ) { - String sURL; + rtl::OUString sURL; LocalFileHelper::ConvertPhysicalNameToURL( _rPath, sURL ); aParser.SetURL( sURL, INetURLObject::WAS_ENCODED ); } |