From 148c9f90bb6f37d24aea8836ff9fdafdfd25c918 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 20 Oct 2005 23:19:22 +0000
Subject: [PATCH] Start out with our display textnode in the right state so we
 don't require two-pass reflow (which printing can't handle) to display
 comboboxes right. Bug 311380, r+sr=roc

git-svn-id: svn://10.0.0.236/trunk@182658 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/forms/nsComboboxControlFrame.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 75fe5837016..618850a42f7 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -2086,8 +2086,10 @@ nsComboboxControlFrame::CreateAnonymousContent(nsPresContext* aPresContext,
   if (labelContent) {
     // set the value of the text node
     mDisplayContent.swap(labelContent);
-    mDisplayedIndex = -1;
-    mDisplayedOptionText.Truncate();
+    mListControlFrame->GetSelectedIndex(&mDisplayedIndex);
+    if (mDisplayedIndex != -1) {
+      mListControlFrame->GetOptionText(mDisplayedIndex, mDisplayedOptionText);
+    }
     ActuallyDisplayText(PR_FALSE);
 
     nsCOMPtr<nsINodeInfo> nodeInfo;