From 7b14605df5b3da8fa68b4f5589d1948ef105b3a1 Mon Sep 17 00:00:00 2001
From: "axel%pike.org" <axel%pike.org>
Date: Wed, 16 May 2001 08:13:12 +0000
Subject: [PATCH] moving nsOutlinerSelection from nsISecurityCheckedComponent
to class info, r=mstoltz, sr=jst, bug 80907
---
dom/public/nsIDOMClassInfo.h | 1 +
dom/src/base/nsDOMClassInfo.cpp | 2 +
.../outliner/public/nsIOutlinerSelection.idl | 4 +-
.../src/outliner/src/nsOutlinerSelection.cpp | 47 ++++++-------------
.../src/outliner/src/nsOutlinerSelection.h | 1 -
.../base/src/tree/public/nsITreeSelection.idl | 4 +-
.../xul/base/src/tree/src/nsTreeSelection.cpp | 47 ++++++-------------
.../xul/base/src/tree/src/nsTreeSelection.h | 1 -
8 files changed, 37 insertions(+), 70 deletions(-)
diff --git a/dom/public/nsIDOMClassInfo.h b/dom/public/nsIDOMClassInfo.h
index 6a3acbea8bd9b..8b538bf3d2a74 100644
--- a/dom/public/nsIDOMClassInfo.h
+++ b/dom/public/nsIDOMClassInfo.h
@@ -162,6 +162,7 @@ enum nsDOMClassInfoID {
eDOMClassInfo_XULAttr_id,
eDOMClassInfo_XULControllers_id,
eDOMClassInfo_BoxObject_id,
+ eDOMClassInfo_OutlinerSelection_id,
// Crypto classes
eDOMClassInfo_Crypto_id,
diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp
index fcc9918db4bb0..25ceeda6955bc 100644
--- a/dom/src/base/nsDOMClassInfo.cpp
+++ b/dom/src/base/nsDOMClassInfo.cpp
@@ -459,6 +459,8 @@ nsDOMClassInfoData sClassInfoData[] = {
DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(BoxObject, nsDOMGenericSH,
DEFAULT_SCRIPTABLE_FLAGS)
+ NS_DEFINE_CLASSINFO_DATA(OutlinerSelection, nsDOMGenericSH,
+ DEFAULT_SCRIPTABLE_FLAGS)
// Crypto classes
NS_DEFINE_CLASSINFO_DATA(Crypto, nsDOMGenericSH,
diff --git a/layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl b/layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl
index 66c418599fa27..a5898adeb74df 100644
--- a/layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl
+++ b/layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl
@@ -25,10 +25,10 @@
interface nsIOutlinerBoxObject;
-#include "nsISecurityCheckedComponent.idl"
+#include "nsISupports.idl"
[scriptable, uuid(F848D7CF-F3D6-4775-8C9F-135546E61E1E)]
-interface nsIOutlinerSelection : nsISecurityCheckedComponent
+interface nsIOutlinerSelection : nsISupports
{
/**
* The outliner widget for this selection.
diff --git a/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp b/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp
index 2213ac660521c..b88f5cf3279ac 100644
--- a/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp
+++ b/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp
@@ -27,6 +27,7 @@
#include "nsIOutlinerView.h"
#include "nsString.h"
#include "nsIDOMElement.h"
+#include "nsIDOMClassInfo.h"
#include "nsIPresShell.h"
#include "nsIPresContext.h"
#include "nsIContent.h"
@@ -247,7 +248,20 @@ nsOutlinerSelection::~nsOutlinerSelection()
delete mFirstRange;
}
-NS_IMPL_ISUPPORTS2(nsOutlinerSelection, nsIOutlinerSelection, nsISecurityCheckedComponent)
+// XPConnect interface list for nsBoxObject
+NS_CLASSINFO_MAP_BEGIN(OutlinerSelection)
+ NS_CLASSINFO_MAP_ENTRY(nsIOutlinerSelection)
+NS_CLASSINFO_MAP_END
+
+// QueryInterface implementation for nsBoxObject
+NS_INTERFACE_MAP_BEGIN(nsOutlinerSelection)
+ NS_INTERFACE_MAP_ENTRY(nsIOutlinerSelection)
+ NS_INTERFACE_MAP_ENTRY(nsISupports)
+ NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(OutlinerSelection)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_ADDREF(nsOutlinerSelection)
+NS_IMPL_RELEASE(nsOutlinerSelection)
NS_IMETHODIMP nsOutlinerSelection::GetOutliner(nsIOutlinerBoxObject * *aOutliner)
{
@@ -699,37 +713,6 @@ nsOutlinerSelection::FireOnSelectHandler()
return NS_OK;
}
-/* string canCreateWrapper (in nsIIDPtr iid); */
-NS_IMETHODIMP nsOutlinerSelection::CanCreateWrapper(const nsIID * iid, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canCallMethod (in nsIIDPtr iid, in wstring methodName); */
-NS_IMETHODIMP nsOutlinerSelection::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canGetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsOutlinerSelection::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canSetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsOutlinerSelection::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
///////////////////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/outliner/src/nsOutlinerSelection.h b/layout/xul/base/src/outliner/src/nsOutlinerSelection.h
index 000efe4d4ba74..c4fd6d53f1fac 100644
--- a/layout/xul/base/src/outliner/src/nsOutlinerSelection.h
+++ b/layout/xul/base/src/outliner/src/nsOutlinerSelection.h
@@ -37,7 +37,6 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOUTLINERSELECTION
- NS_DECL_NSISECURITYCHECKEDCOMPONENT
friend struct nsOutlinerRange;
diff --git a/layout/xul/base/src/tree/public/nsITreeSelection.idl b/layout/xul/base/src/tree/public/nsITreeSelection.idl
index 66c418599fa27..a5898adeb74df 100644
--- a/layout/xul/base/src/tree/public/nsITreeSelection.idl
+++ b/layout/xul/base/src/tree/public/nsITreeSelection.idl
@@ -25,10 +25,10 @@
interface nsIOutlinerBoxObject;
-#include "nsISecurityCheckedComponent.idl"
+#include "nsISupports.idl"
[scriptable, uuid(F848D7CF-F3D6-4775-8C9F-135546E61E1E)]
-interface nsIOutlinerSelection : nsISecurityCheckedComponent
+interface nsIOutlinerSelection : nsISupports
{
/**
* The outliner widget for this selection.
diff --git a/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/layout/xul/base/src/tree/src/nsTreeSelection.cpp
index 2213ac660521c..b88f5cf3279ac 100644
--- a/layout/xul/base/src/tree/src/nsTreeSelection.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeSelection.cpp
@@ -27,6 +27,7 @@
#include "nsIOutlinerView.h"
#include "nsString.h"
#include "nsIDOMElement.h"
+#include "nsIDOMClassInfo.h"
#include "nsIPresShell.h"
#include "nsIPresContext.h"
#include "nsIContent.h"
@@ -247,7 +248,20 @@ nsOutlinerSelection::~nsOutlinerSelection()
delete mFirstRange;
}
-NS_IMPL_ISUPPORTS2(nsOutlinerSelection, nsIOutlinerSelection, nsISecurityCheckedComponent)
+// XPConnect interface list for nsBoxObject
+NS_CLASSINFO_MAP_BEGIN(OutlinerSelection)
+ NS_CLASSINFO_MAP_ENTRY(nsIOutlinerSelection)
+NS_CLASSINFO_MAP_END
+
+// QueryInterface implementation for nsBoxObject
+NS_INTERFACE_MAP_BEGIN(nsOutlinerSelection)
+ NS_INTERFACE_MAP_ENTRY(nsIOutlinerSelection)
+ NS_INTERFACE_MAP_ENTRY(nsISupports)
+ NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(OutlinerSelection)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_ADDREF(nsOutlinerSelection)
+NS_IMPL_RELEASE(nsOutlinerSelection)
NS_IMETHODIMP nsOutlinerSelection::GetOutliner(nsIOutlinerBoxObject * *aOutliner)
{
@@ -699,37 +713,6 @@ nsOutlinerSelection::FireOnSelectHandler()
return NS_OK;
}
-/* string canCreateWrapper (in nsIIDPtr iid); */
-NS_IMETHODIMP nsOutlinerSelection::CanCreateWrapper(const nsIID * iid, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canCallMethod (in nsIIDPtr iid, in wstring methodName); */
-NS_IMETHODIMP nsOutlinerSelection::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canGetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsOutlinerSelection::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
-
-/* string canSetProperty (in nsIIDPtr iid, in wstring propertyName); */
-NS_IMETHODIMP nsOutlinerSelection::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval)
-{
- nsCAutoString str("AllAccess");
- *_retval = str.ToNewCString();
- return NS_OK;
-}
///////////////////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/tree/src/nsTreeSelection.h b/layout/xul/base/src/tree/src/nsTreeSelection.h
index 000efe4d4ba74..c4fd6d53f1fac 100644
--- a/layout/xul/base/src/tree/src/nsTreeSelection.h
+++ b/layout/xul/base/src/tree/src/nsTreeSelection.h
@@ -37,7 +37,6 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOUTLINERSELECTION
- NS_DECL_NSISECURITYCHECKEDCOMPONENT
friend struct nsOutlinerRange;
--
GitLab