Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#6589 File | Open broken in viewer. I broke this when I removed the use of path strings. In addition to being more correct, using nsFileSpec and nsFileURL makes this file over 40 lines shorter.

Browse Source
This commit is contained in:
mcmullen%netscape.com 1999-05-18 01:16:27 +00:00
parent 0123e2d7ab
commit 9599cc7b9a
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
webshell/tests/viewer/nsBrowserWindow.cpp
View File

@ -377,42 +377,6 @@ HandleForwardEvent(nsGUIEvent *aEvent)
return result;
}
//----------------------------------------------------------
static void BuildFileURL(const char * aFileName, nsString & aFileURL)
{
nsAutoString fileName(aFileName);
char * str = fileName.ToNewCString();
PRInt32 len = strlen(str);
PRInt32 sum = len + sizeof(FILE_PROTOCOL);
char* lpszFileURL = new char[sum];
// Translate '\' to '/'
for (PRInt32 i = 0; i < len; i++) {
if (str[i] == '\\') {
str[i] = '/';
}
}
// Build the file URL
PR_snprintf(lpszFileURL, sum, "%s%s", FILE_PROTOCOL, str);
// create string
aFileURL = lpszFileURL;
delete[] lpszFileURL;
delete[] str;
}
//----------------------------------------------------------
static void BuildFileURL(const PRUnichar * aFileName, nsString & aFileURL)
{
nsAutoString fileName(aFileName);
char * str = fileName.ToNewCString();
BuildFileURL(str, aFileURL);
delete[] str;
}
static nsEventStatus PR_CALLBACK
HandleLocationEvent(nsGUIEvent *aEvent)
{
@ -767,10 +731,9 @@ nsBrowserWindow::DoFileOpen()
{
nsFileSpec fileSpec;
if (GetFileFromFileSelector(mWindow, fileSpec, mOpenFileDirectory)) {
nsAutoString fileURL;
BuildFileURL(nsString(fileSpec.GetNativePathCString()).GetUnicode(), fileURL);
nsFileURL fileURL(fileSpec);
// Ask the Web widget to load the file URL
mWebShell->LoadURL(fileURL.GetUnicode());
mWebShell->LoadURL(nsString(fileURL.GetURLString()).GetUnicode());
Show();
}
}