diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-20 02:34:38 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-20 02:49:37 +0200 |
| commit | 04232e0171e1f5cd67e90424753a27a78968500e (patch) | |
| tree | 7ad45474e399803cd2f8619b0eb02acf143b02ce /avmedia | |
| parent | d58fc49073ec69ce3a17b6a6613135af857ce4f7 (diff) | |
collada2gltf: output bundle path needs to be in url format
Otherwise it does not work on Windows.
It's strange though that input path has to be converted from url to
native path format. At least that was my observation.
Change-Id: Ia8d9e9719d927cab2ae4d928eb8066cab4588281
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 9b485529a19c..2366dc756e4a 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -142,7 +142,8 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, #ifdef ENABLE_COLLADA2GLTF if (rSourceURL.endsWith(".dae") || rSourceURL.endsWith(".kmz")) { - OUString sName = ::utl::TempFile::CreateTempName(); + OUString sName; + ::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(), sName); // remove .tmp extension sName = sName.copy(0, sName.getLength() - 4); const INetURLObject aSourceURLObj(rSourceURL); @@ -162,7 +163,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, GLTF::COLLADA2GLTFWriter writer(asset); writer.write(); // Path to the .json file created by COLLADA2GLTFWriter - ::utl::LocalFileHelper::ConvertPhysicalNameToURL(sName + "/" + GetFilename(sName) + ".json", sSource); + sSource = sName + "/" + GetFilename(sName) + ".json"; } #endif |