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

remove ifdefs for IBMBIDI from editor, bug 89203 r+sr=roc

This commit is contained in:
cbiesinger%web.de 2003-01-17 11:11:10 +00:00
Родитель b11fb7ca9d
Коммит e3e8585471
3 изменённых файлов: 0 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -366,7 +366,6 @@ nsHTMLEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection)
nsCOMPtr<nsISelectionController> selCon; nsCOMPtr<nsISelectionController> selCon;
mHTMLEditor->GetSelectionController(getter_AddRefs(selCon)); mHTMLEditor->GetSelectionController(getter_AddRefs(selCon));
if (selCon) selCon->SetCaretEnabled(PR_TRUE); if (selCon) selCon->SetCaretEnabled(PR_TRUE);
#ifdef IBMBIDI
/* After inserting text the cursor Bidi level must be set to the level of the inserted text. /* After inserting text the cursor Bidi level must be set to the level of the inserted text.
* This is difficult, because we cannot know what the level is until after the Bidi algorithm * This is difficult, because we cannot know what the level is until after the Bidi algorithm
* is applied to the whole paragraph. * is applied to the whole paragraph.
@ -380,7 +379,6 @@ nsHTMLEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection)
shell->UndefineCaretBidiLevel(); shell->UndefineCaretBidiLevel();
} }
} }
#endif
} }
return res; return res;
@ -1413,11 +1411,9 @@ nsHTMLEditRules::WillInsertText(PRInt32 aAction,
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
} }
} }
#ifdef IBMBIDI
nsCOMPtr<nsISelection> selection(aSelection); nsCOMPtr<nsISelection> selection(aSelection);
nsCOMPtr<nsISelectionPrivate> selPriv(do_QueryInterface(selection)); nsCOMPtr<nsISelectionPrivate> selPriv(do_QueryInterface(selection));
selPriv->SetInterlinePosition(PR_FALSE); selPriv->SetInterlinePosition(PR_FALSE);
#endif
if (curNode) aSelection->Collapse(curNode, curOffset); if (curNode) aSelection->Collapse(curNode, curOffset);
// manually update the doc changed range so that AfterEdit will clean up // manually update the doc changed range so that AfterEdit will clean up
// the correct portion of the document. // the correct portion of the document.
@ -1829,12 +1825,10 @@ nsHTMLEditRules::WillDeleteSelection(nsISelection *aSelection,
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
if (*aHandled) return NS_OK; if (*aHandled) return NS_OK;
#ifdef IBMBIDI
// Test for distance between caret and text that will be deleted // Test for distance between caret and text that will be deleted
res = CheckBidiLevelForDeletion(startNode, startOffset, aAction, aCancel); res = CheckBidiLevelForDeletion(startNode, startOffset, aAction, aCancel);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
if (*aCancel) return NS_OK; if (*aCancel) return NS_OK;
#endif // IBMBIDI
// what's in the direction we are deleting? // what's in the direction we are deleting?

5
editor/libeditor/text/Makefile.in
Просмотреть файл

@ -56,13 +56,8 @@ CPPSRCS = \
nsWrapUtils.cpp \ nsWrapUtils.cpp \
nsInternetCiter.cpp \ nsInternetCiter.cpp \
nsAOLCiter.cpp \ nsAOLCiter.cpp \
$(NULL)
ifdef IBMBIDI
CPPSRCS += \
nsTextEditRulesBidi.cpp \ nsTextEditRulesBidi.cpp \
$(NULL) $(NULL)
endif
# don't want the shared lib; force the creation of a static lib. # don't want the shared lib; force the creation of a static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1

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

@ -236,7 +236,6 @@ nsTextEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection)
res = CreateTrailingBRIfNeeded(); res = CreateTrailingBRIfNeeded();
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
#ifdef IBMBIDI
/* After inserting text the cursor Bidi level must be set to the level of the inserted text. /* After inserting text the cursor Bidi level must be set to the level of the inserted text.
* This is difficult, because we cannot know what the level is until after the Bidi algorithm * This is difficult, because we cannot know what the level is until after the Bidi algorithm
* is applied to the whole paragraph. * is applied to the whole paragraph.
@ -250,7 +249,6 @@ nsTextEditRules::AfterEdit(PRInt32 action, nsIEditor::EDirection aDirection)
shell->UndefineCaretBidiLevel(); shell->UndefineCaretBidiLevel();
} }
} }
#endif
} }
return res; return res;
} }
@ -862,12 +860,10 @@ nsTextEditRules::WillDeleteSelection(nsISelection *aSelection,
if (bCollapsed) if (bCollapsed)
{ {
#ifdef IBMBIDI
// Test for distance between caret and text that will be deleted // Test for distance between caret and text that will be deleted
res = CheckBidiLevelForDeletion(startNode, startOffset, aCollapsedAction, aCancel); res = CheckBidiLevelForDeletion(startNode, startOffset, aCollapsedAction, aCancel);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
if (*aCancel) return NS_OK; if (*aCancel) return NS_OK;
#endif // IBMBIDI
nsCOMPtr<nsIDOMText> textNode; nsCOMPtr<nsIDOMText> textNode;
PRUint32 strLength; PRUint32 strLength;