[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/xml
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2004-12-17 10:41:44
Message-ID: 20041217104144.340BF1BB13 () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

Don't infinite loop on stylesheet selection.
Based on a patch by Yan Morin <yansanmo@iquebec.com> (thanks!)

BUG: 88402


  M +2 -2      dom_docimpl.cpp   1.304


--- kdelibs/khtml/xml/dom_docimpl.cpp  #1.303:1.304
@@ -1833,10 +1833,10 @@ void DocumentImpl::recalcStyleSelector()
     QPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
     m_styleSheets->styleSheets.clear();
-    QString sheetUsed = view() ? view()->part()->d->m_sheetUsed : QString();
+    QString sheetUsed = view() ? view()->part()->d->m_sheetUsed.replace("&&", "&") : QString();
     bool autoselect = sheetUsed.isEmpty();
     if (autoselect && !m_preferredStylesheetSet.isEmpty())
         sheetUsed = m_preferredStylesheetSet.string();
     NodeImpl *n;
-    for (;;) {
+    for (int i=0 ; i<2 ; i++) {
         m_availableSheets.clear();
         m_availableSheets << i18n("Basic Page Style");


[prev in list] [next in list] [prev in thread] [next in thread]