From a0b7411d47a0afc2c4e9fd4b65e4e87927f22322 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Wed, 5 Mar 2008 10:39:51 +0000 Subject: [PATCH] Bug 409796 - "No pictures shown in saved file (file name and folder name, containing that file, is in cyrillic)" [p=lolkaantimat@gmail.com (Evgeniy Ivanov [powerfox]) r+sr=biesi a=dveditz] git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@247088 18797224-902f-48f8-a5cc-f745e15eee43 --- .../webbrowserpersist/src/nsWebBrowserPersist.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index 1e10550ffd1..5c835178b29 100644 --- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -1554,11 +1554,11 @@ nsresult nsWebBrowserPersist::SaveDocumentInternal( break; } - nsCAutoString dirName; - dataDirParent->GetNativeLeafName(dirName); + nsAutoString dirName; + dataDirParent->GetLeafName(dirName); nsCAutoString newRelativePathToData; - newRelativePathToData = dirName + newRelativePathToData = NS_ConvertUTF16toUTF8(dirName) + NS_LITERAL_CSTRING("/") + relativePathToData; relativePathToData = newRelativePathToData; @@ -2223,7 +2223,7 @@ nsWebBrowserPersist::CalculateAndAppendFileExt(nsIURI *aURI, nsIChannel *aChanne if (localFile) { - localFile->SetNativeLeafName(newFileName); + localFile->SetLeafName(NS_ConvertUTF8toUTF16(newFileName)); // Resync the URI with the file after the extension has been appended nsCOMPtr fileURL = do_QueryInterface(aURI, &rv);