[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit a9c3b2db93c52e00a10b37d421fc49cd78d460f1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 00:01:52 2002 +0000

    	- fixed 3072542 -- double "&" in submit button
    
            * khtml/rendering/render_form.cpp: (RenderSubmitButton::rawText):
    	Don't double the "&" character, not needed for KWQ.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2347 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9e64f82..693b19d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3072542 -- double "&" in submit button
+
+        * khtml/rendering/render_form.cpp: (RenderSubmitButton::rawText):
+	Don't double the "&" character, not needed for KWQ.
+
 2002-10-16  David Hyatt  <hyatt at apple.com>
 
 	When render objects were being dynamically wrapped in anonymous
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9e64f82..693b19d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3072542 -- double "&" in submit button
+
+        * khtml/rendering/render_form.cpp: (RenderSubmitButton::rawText):
+	Don't double the "&" character, not needed for KWQ.
+
 2002-10-16  David Hyatt  <hyatt at apple.com>
 
 	When render objects were being dynamically wrapped in anonymous
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9e64f82..693b19d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-10-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3072542 -- double "&" in submit button
+
+        * khtml/rendering/render_form.cpp: (RenderSubmitButton::rawText):
+	Don't double the "&" character, not needed for KWQ.
+
 2002-10-16  David Hyatt  <hyatt at apple.com>
 
 	When render objects were being dynamically wrapped in anonymous
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index c6dc583..08af55f 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -68,7 +68,7 @@ RenderFormElement::~RenderFormElement()
 
 short RenderFormElement::baselinePosition( bool f ) const
 {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     return marginTop() + widget()->baselinePosition();
 #else
     return RenderWidget::baselinePosition( f ) - 2 - style()->fontMetrics().descent();
@@ -223,7 +223,7 @@ void RenderCheckBox::calcMinMaxWidth()
 {
     KHTMLAssert( !minMaxKnown() );
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     // Let the widget tell us how big it wants to be.
     QSize s(widget()->sizeHint());
 #else
@@ -282,7 +282,7 @@ void RenderRadioButton::calcMinMaxWidth()
 {
     KHTMLAssert( !minMaxKnown() );
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     // Let the widget tell us how big it wants to be.
     QSize s(widget()->sizeHint());
 #else
@@ -313,6 +313,9 @@ QString RenderSubmitButton::rawText()
 {
     QString value = element()->value().isEmpty() ? defaultLabel() : element()->value().string();
     value = value.stripWhiteSpace();
+#if APPLE_CHANGES
+    return value;
+#else
     QString raw;
     for(unsigned int i = 0; i < value.length(); i++) {
         raw += value[i];
@@ -320,13 +323,14 @@ QString RenderSubmitButton::rawText()
             raw += '&';
     }
     return raw;
+#endif
 }
 
 void RenderSubmitButton::calcMinMaxWidth()
 {
     KHTMLAssert( !minMaxKnown() );
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     // Let the widget tell us how big it wants to be.
     QSize s(widget()->sizeHint());
     setIntrinsicWidth(s.width());
@@ -487,7 +491,7 @@ void RenderLineEdit::calcMinMaxWidth()
 {
     KHTMLAssert( !minMaxKnown() );
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     // Let the widget tell us how big it wants to be.
     int size = element()->size();
     QSize s(widget()->sizeForCharacterWidth(size > 0 ? size : 17));
@@ -792,7 +796,7 @@ void RenderSelect::updateFromElement()
         else
             static_cast<KComboBox*>(m_widget)->clear();
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
         if (m_useListBox)
             static_cast<KListBox*>(m_widget)->beginBatchInsert();
 #endif
@@ -830,7 +834,7 @@ void RenderSelect::updateFromElement()
                 KHTMLAssert(false);
             m_selectionChanged = true;
         }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
         if (m_useListBox)
 	    static_cast<KListBox*>(m_widget)->endBatchInsert();
 #endif
@@ -850,7 +854,7 @@ void RenderSelect::updateFromElement()
     RenderFormElement::updateFromElement();
 }
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
 // Override to deal with our widget.
 short RenderSelect::baselinePosition( bool f ) const
 {
@@ -911,7 +915,7 @@ void RenderSelect::layout( )
         if(size < 1)
             size = QMIN(static_cast<KListBox*>(m_widget)->count(), 10);
 
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
         width += w->scrollBarWidth();
         height = size*height;
         // NSBrowser has problems drawing scrollbar correctly when its size is too small.
@@ -1148,7 +1152,7 @@ void RenderTextArea::calcMinMaxWidth()
     TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
     const QFontMetrics &m = style()->fontMetrics();
     w->setTabStopWidth(8 * m.width(" "));
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
     QSize size( QMAX(element()->cols(), 1)*m.width('x') + w->frameWidth() +
                 w->verticalScrollBarWidth(),
                 QMAX(element()->rows(), 1)*m.height() + w->frameWidth()*2 +

-- 
WebKit Debian packaging