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

fix for regression, bug#45477 

cant insert hrules, images, etc...
r=brade, a=granrose
This commit is contained in:
anthonyd%netscape.com 2000-07-14 18:38:24 +00:00
Родитель a61905952f
Коммит 7cda3a6d5f
8 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -110,7 +110,7 @@ NS_IMETHODIMP CreateElementTxn::Do(void)
nsCOMPtr<nsIDOMElement>newElement;
//new call to use instead to get proper HTML element, bug# 39919
mEditor->CreateHTMLContent(mTag, getter_AddRefs(newContent));
result = mEditor->CreateHTMLContent(mTag, getter_AddRefs(newContent));
newElement = do_QueryInterface(newContent);
if (NS_FAILED(result)) return result;
if (!newElement) return NS_ERROR_NULL_POINTER;

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

@ -1847,7 +1847,7 @@ nsEditor::ReplaceContainer(nsIDOMNode *inNode,
nsCOMPtr<nsIContent> newContent;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
res = CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
elem = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;
*outNode = do_QueryInterface(elem);
@ -1968,7 +1968,7 @@ nsEditor::InsertContainerAbove( nsIDOMNode *inNode,
nsCOMPtr<nsIContent> newContent;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
res = CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
elem = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;
*outNode = do_QueryInterface(elem);

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

@ -3749,7 +3749,7 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
if (!doc) return NS_ERROR_NOT_INITIALIZED;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(realTagName, getter_AddRefs(newContent));
res = CreateHTMLContent(realTagName, getter_AddRefs(newContent));
newElement = do_QueryInterface(newContent);
if (NS_FAILED(res) || !newElement)
return NS_ERROR_FAILURE;

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

@ -1226,7 +1226,7 @@ nsTextEditRules::CreateBogusNodeIfNeeded(nsIDOMSelection *aSelection)
nsString qualifiedTag;
qualifiedTag.AssignWithConversion("br");
mEditor->CreateHTMLContent(qualifiedTag, getter_AddRefs(newContent));
res = mEditor->CreateHTMLContent(qualifiedTag, getter_AddRefs(newContent));
brElement = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;

2
editor/libeditor/base/CreateElementTxn.cpp
Просмотреть файл

@ -110,7 +110,7 @@ NS_IMETHODIMP CreateElementTxn::Do(void)
nsCOMPtr<nsIDOMElement>newElement;
//new call to use instead to get proper HTML element, bug# 39919
mEditor->CreateHTMLContent(mTag, getter_AddRefs(newContent));
result = mEditor->CreateHTMLContent(mTag, getter_AddRefs(newContent));
newElement = do_QueryInterface(newContent);
if (NS_FAILED(result)) return result;
if (!newElement) return NS_ERROR_NULL_POINTER;

4
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -1847,7 +1847,7 @@ nsEditor::ReplaceContainer(nsIDOMNode *inNode,
nsCOMPtr<nsIContent> newContent;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
res = CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
elem = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;
*outNode = do_QueryInterface(elem);
@ -1968,7 +1968,7 @@ nsEditor::InsertContainerAbove( nsIDOMNode *inNode,
nsCOMPtr<nsIContent> newContent;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
res = CreateHTMLContent(aNodeType, getter_AddRefs(newContent));
elem = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;
*outNode = do_QueryInterface(elem);

2
editor/libeditor/html/nsHTMLEditor.cpp
Просмотреть файл

@ -3749,7 +3749,7 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
if (!doc) return NS_ERROR_NOT_INITIALIZED;
//new call to use instead to get proper HTML element, bug# 39919
CreateHTMLContent(realTagName, getter_AddRefs(newContent));
res = CreateHTMLContent(realTagName, getter_AddRefs(newContent));
newElement = do_QueryInterface(newContent);
if (NS_FAILED(res) || !newElement)
return NS_ERROR_FAILURE;

2
editor/libeditor/text/nsTextEditRules.cpp
Просмотреть файл

@ -1226,7 +1226,7 @@ nsTextEditRules::CreateBogusNodeIfNeeded(nsIDOMSelection *aSelection)
nsString qualifiedTag;
qualifiedTag.AssignWithConversion("br");
mEditor->CreateHTMLContent(qualifiedTag, getter_AddRefs(newContent));
res = mEditor->CreateHTMLContent(qualifiedTag, getter_AddRefs(newContent));
brElement = do_QueryInterface(newContent);
if (NS_FAILED(res)) return res;