mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed build bustage for linux (why can't Linus do NS_LITERAL_STRING correctly!)

This commit is contained in:
cmanske%netscape.com 2000-07-12 01:00:58 +00:00
Родитель 5946c0c8bf
Коммит 4b0e5559b9
2 изменённых файлов: 18 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
editor/base/nsEditorShell.cpp
Просмотреть файл

@ -1386,9 +1386,11 @@ NS_IMETHODIMP
nsEditorShell::FinishHTMLSource(void)
{
if (mHTMLSourceMode)
{
// Call the JS command to convert and switch to previous edit mode
return DoControllerCommand(NS_LITERAL_STRING("cmd_FinishHTMLSource"));
nsAutoString command(NS_LITERAL_STRING("cmd_FinishHTMLSource"));
return DoControllerCommand(command);
}
return NS_OK;
}
@ -1648,8 +1650,9 @@ nsEditorShell::CheckAndSaveDocument(const PRUnichar *reasonToSave, PRBool *_retv
}
else if (mHTMLSourceMode) // result == eNo
{
// User doesn't want to save document, so we just cancel source mode
rv = DoControllerCommand(NS_LITERAL_STRING("cmd_CancelHTMLSource"));
// User doesn't want to save document, so we just cancel source mode
nsAutoString command(NS_LITERAL_STRING("cmd_CancelHTMLSource"));
rv = DoControllerCommand(command);
}
}
}
@ -5211,9 +5214,9 @@ nsEditorShell::HandleMouseClickOnElement(nsIDOMElement *aElement, PRInt32 aClick
// In "All Tags" mode, use AdvancedProperties,
// in others use appriate object property dialog
if (mDisplayMode != eDisplayModeAllTags)
commandName = NS_ConvertASCIItoUCS2("cmd_objectProperties");
commandName = NS_LITERAL_STRING("cmd_objectProperties");
else
commandName = NS_ConvertASCIItoUCS2("cmd_advancedProperties");
commandName = NS_LITERAL_STRING("cmd_advancedProperties");
rv = DoControllerCommand(commandName);

15
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -1386,9 +1386,11 @@ NS_IMETHODIMP
nsEditorShell::FinishHTMLSource(void)
{
if (mHTMLSourceMode)
{
// Call the JS command to convert and switch to previous edit mode
return DoControllerCommand(NS_LITERAL_STRING("cmd_FinishHTMLSource"));
nsAutoString command(NS_LITERAL_STRING("cmd_FinishHTMLSource"));
return DoControllerCommand(command);
}
return NS_OK;
}
@ -1648,8 +1650,9 @@ nsEditorShell::CheckAndSaveDocument(const PRUnichar *reasonToSave, PRBool *_retv
}
else if (mHTMLSourceMode) // result == eNo
{
// User doesn't want to save document, so we just cancel source mode
rv = DoControllerCommand(NS_LITERAL_STRING("cmd_CancelHTMLSource"));
// User doesn't want to save document, so we just cancel source mode
nsAutoString command(NS_LITERAL_STRING("cmd_CancelHTMLSource"));
rv = DoControllerCommand(command);
}
}
}
@ -5211,9 +5214,9 @@ nsEditorShell::HandleMouseClickOnElement(nsIDOMElement *aElement, PRInt32 aClick
// In "All Tags" mode, use AdvancedProperties,
// in others use appriate object property dialog
if (mDisplayMode != eDisplayModeAllTags)
commandName = NS_ConvertASCIItoUCS2("cmd_objectProperties");
commandName = NS_LITERAL_STRING("cmd_objectProperties");
else
commandName = NS_ConvertASCIItoUCS2("cmd_advancedProperties");
commandName = NS_LITERAL_STRING("cmd_advancedProperties");
rv = DoControllerCommand(commandName);