Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#88100

Browse Source 
r=simon@softel.co.il, sr=blizzard
Hookup Bidi preferences


git-svn-id: svn://10.0.0.236/trunk@106930 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2001-11-01 05:40:35 +00:00
parent 3ded5a8fee
commit 9c733170f9
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -3589,10 +3589,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ENSURE_SUCCESS(GetSameTypeParent(getter_AddRefs(parentAsItem)),
NS_ERROR_FAILURE);
nsCOMPtr<nsIDocShell> parent(do_QueryInterface(parentAsItem));
#ifdef IBMBIDI
PRUint32 options;
nsIMarkupDocumentViewer *newViewer = nsnull;
#endif // IBMBIDI
if (mContentViewer || parent) {
nsCOMPtr<nsIMarkupDocumentViewer> oldMUDV;
@@ -3630,11 +3626,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ENSURE_SUCCESS(oldMUDV->
GetHintCharacterSetSource(&hintCharsetSource),
NS_ERROR_FAILURE);
#ifdef IBMBIDI
NS_ENSURE_SUCCESS(oldMUDV->GetBidiOptions(&options),
NS_ERROR_FAILURE);
newViewer = newMUDV.get();
#endif // IBMBIDI
// set the old state onto the new content viewer
NS_ENSURE_SUCCESS(newMUDV->SetDefaultCharacterSet(defaultCharset),
@@ -3785,12 +3776,6 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
}
}
#ifdef IBMBIDI
if (newViewer) {
// set the old state onto the new content viewer
NS_ENSURE_SUCCESS(newViewer->SetBidiOptions(options), NS_ERROR_FAILURE);
}
#endif // IBMBIDI
// XXX: It looks like the LayoutState gets restored again in Embed()
// right after the call to SetupNewViewer(...)