diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-22 13:05:23 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-27 12:34:04 +0200 |
commit | 67f6bff3ec9c56186bbd040ab21d5643640a3cd7 (patch) | |
tree | e047754570717edaab89a01b307c293af6b5b6b2 /avmedia | |
parent | 8df2785b487dd7a9fed563482579871a12f0afb3 (diff) |
avmediaogl: Use INetURLObject for URL operations
Change-Id: I7b9763489ca7ec64051b53b87ab1475167ffeb35
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 4224e3558c70..720825ab151e 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -55,7 +55,7 @@ bool OGLPlayer::create( const OUString& rURL ) // Load *.json file and init renderer glTFFile aJsonFile; aJsonFile.type = GLTF_JSON; - OString sFileName = OUStringToOString(m_sURL.copy(m_sURL.lastIndexOf("/")+1),RTL_TEXTENCODING_UTF8); + OString sFileName = OUStringToOString(INetURLObject(m_sURL).GetLastName(),RTL_TEXTENCODING_UTF8); aJsonFile.filename = (char*)sFileName.getStr(); if( !lcl_LoadFile(&aJsonFile, m_sURL) ) return false; @@ -71,8 +71,8 @@ bool OGLPlayer::create( const OUString& rURL ) glTFFile* pFile = m_pHandle->files[i]; if( pFile && pFile->filename ) { - const OUString sFilesURL = m_sURL.copy(0,m_sURL.lastIndexOf("/")+1) + - OStringToOUString(OString(pFile->filename),RTL_TEXTENCODING_UTF8); + const OUString sFilesURL = + INetURLObject::GetAbsURL(m_sURL,OStringToOUString(OString(pFile->filename),RTL_TEXTENCODING_UTF8)); if( pFile->type == GLTF_IMAGE ) { // Load images as bitmaps |