Commit 7b14605d authored by axel%pike.org's avatar axel%pike.org
Browse files

moving nsOutlinerSelection from nsISecurityCheckedComponent to class info,... 

moving nsOutlinerSelection from nsISecurityCheckedComponent to class info, r=mstoltz, sr=jst, bug 80907
parent 03f5034f

dom/public/nsIDOMClassInfo.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ enum nsDOMClassInfoID { 
  eDOMClassInfo_XULAttr_id,

  eDOMClassInfo_XULControllers_id,

  eDOMClassInfo_BoxObject_id,

  eDOMClassInfo_OutlinerSelection_id,



  // Crypto classes

  eDOMClassInfo_Crypto_id,

dom/src/base/nsDOMClassInfo.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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,

layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl

+2 −2
Original line number Diff line number Diff line
@@ -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.

layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp

+15 −32
Original line number Diff line number Diff line
@@ -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;

}



///////////////////////////////////////////////////////////////////////////////////

layout/xul/base/src/outliner/src/nsOutlinerSelection.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public: 
   

  NS_DECL_ISUPPORTS

  NS_DECL_NSIOUTLINERSELECTION

  NS_DECL_NSISECURITYCHECKEDCOMPONENT



  friend struct nsOutlinerRange;