From d47b93b109d092c0aa19ec4d9b44dca0f8b6783c Mon Sep 17 00:00:00 2001
From: "kin%netscape.com"
 <kin%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 20 Jul 1999 19:34:35 +0000
Subject: [PATCH] Switch from override style sheets to doc style sheets.

git-svn-id: svn://10.0.0.236/trunk@40298 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/base/nsStyleSheetTxns.cpp      | 32 +++++++++----------
 .../libeditor/base/nsStyleSheetTxns.cpp       | 32 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/mozilla/editor/base/nsStyleSheetTxns.cpp b/mozilla/editor/base/nsStyleSheetTxns.cpp
index 4a2830cf332..cfb2c5011fe 100644
--- a/mozilla/editor/base/nsStyleSheetTxns.cpp
+++ b/mozilla/editor/base/nsStyleSheetTxns.cpp
@@ -71,16 +71,16 @@ AddStyleSheetTxn::Do()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->AppendOverrideStyleSheet(mSheet);
-
-    nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
-    nsCOMPtr<nsIDocument> document;
 
-    rv = presShell->GetDocument(getter_AddRefs(document));
+    if (styleSheet)
+    {
+      nsCOMPtr<nsIDocument> document;
+      rv = presShell->GetDocument(getter_AddRefs(document));
 
-    if (NS_SUCCEEDED(rv) && document && observer && styleSheet)
-      rv = observer->StyleSheetAdded(document, styleSheet);
+      if (NS_SUCCEEDED(rv) && document)
+        document->AddStyleSheet(styleSheet);
+    }
   }
   
   return rv;
@@ -102,7 +102,7 @@ AddStyleSheetTxn::Undo()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->RemoveOverrideStyleSheet(mSheet);
+    styleSet->RemoveDocStyleSheet(mSheet);
 
     nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
@@ -207,7 +207,7 @@ RemoveStyleSheetTxn::Do()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->RemoveOverrideStyleSheet(mSheet);
+    styleSet->RemoveDocStyleSheet(mSheet);
 
     nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
@@ -238,16 +238,16 @@ RemoveStyleSheetTxn::Undo()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->AppendOverrideStyleSheet(mSheet);
-
-    nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
-    nsCOMPtr<nsIDocument> document;
 
-    rv = presShell->GetDocument(getter_AddRefs(document));
+    if (styleSheet)
+    {
+      nsCOMPtr<nsIDocument> document;
+      rv = presShell->GetDocument(getter_AddRefs(document));
 
-    if (NS_SUCCEEDED(rv) && document && observer && styleSheet)
-      rv = observer->StyleSheetAdded(document, styleSheet);
+      if (NS_SUCCEEDED(rv) && document)
+        document->AddStyleSheet(styleSheet);
+    }
   }
   
   return rv;
diff --git a/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp b/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp
index 4a2830cf332..cfb2c5011fe 100644
--- a/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp
+++ b/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp
@@ -71,16 +71,16 @@ AddStyleSheetTxn::Do()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->AppendOverrideStyleSheet(mSheet);
-
-    nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
-    nsCOMPtr<nsIDocument> document;
 
-    rv = presShell->GetDocument(getter_AddRefs(document));
+    if (styleSheet)
+    {
+      nsCOMPtr<nsIDocument> document;
+      rv = presShell->GetDocument(getter_AddRefs(document));
 
-    if (NS_SUCCEEDED(rv) && document && observer && styleSheet)
-      rv = observer->StyleSheetAdded(document, styleSheet);
+      if (NS_SUCCEEDED(rv) && document)
+        document->AddStyleSheet(styleSheet);
+    }
   }
   
   return rv;
@@ -102,7 +102,7 @@ AddStyleSheetTxn::Undo()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->RemoveOverrideStyleSheet(mSheet);
+    styleSet->RemoveDocStyleSheet(mSheet);
 
     nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
@@ -207,7 +207,7 @@ RemoveStyleSheetTxn::Do()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->RemoveOverrideStyleSheet(mSheet);
+    styleSet->RemoveDocStyleSheet(mSheet);
 
     nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
@@ -238,16 +238,16 @@ RemoveStyleSheetTxn::Undo()
 
   if (NS_SUCCEEDED(rv) && styleSet)
   {
-    styleSet->AppendOverrideStyleSheet(mSheet);
-
-    nsCOMPtr<nsIDocumentObserver> observer = do_QueryInterface(presShell);
     nsCOMPtr<nsIStyleSheet> styleSheet     = do_QueryInterface(mSheet);
-    nsCOMPtr<nsIDocument> document;
 
-    rv = presShell->GetDocument(getter_AddRefs(document));
+    if (styleSheet)
+    {
+      nsCOMPtr<nsIDocument> document;
+      rv = presShell->GetDocument(getter_AddRefs(document));
 
-    if (NS_SUCCEEDED(rv) && document && observer && styleSheet)
-      rv = observer->StyleSheetAdded(document, styleSheet);
+      if (NS_SUCCEEDED(rv) && document)
+        document->AddStyleSheet(styleSheet);
+    }
   }
   
   return rv;