diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index f96fddd2275..0b54e12f73b 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -215,6 +215,7 @@ public: NS_DECL_ISUPPORTS // nsISortService + NS_IMETHOD Sort(nsIDOMNode* node, const char *sortResource, const char *sortDirection); NS_IMETHOD DoSort(nsIDOMNode* node, const nsString& sortResource, const nsString& sortDirection); NS_IMETHOD OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *container, nsIRDFResource **flatArray, PRInt32 numElements, PRInt32 elementSize); @@ -1469,6 +1470,20 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node, +NS_IMETHODIMP +XULSortServiceImpl::Sort(nsIDOMNode* node, const char *sortResource, const char *sortDirection) +{ +#ifdef DEBUG + printf("\n XULSortServiceImpl::Sort \n\n"); +#endif + + nsAutoString sortRes(sortResource), sortDir(sortDirection); + nsresult rv = DoSort(node, sortResource, sortDirection); + return(rv); +} + + + NS_IMETHODIMP XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource, const nsString& sortDirection) diff --git a/mozilla/rdf/base/idl/MANIFEST b/mozilla/rdf/base/idl/MANIFEST index 27580e91c51..5f71423daef 100644 --- a/mozilla/rdf/base/idl/MANIFEST +++ b/mozilla/rdf/base/idl/MANIFEST @@ -11,4 +11,5 @@ nsIRDFResource.idl nsIRDFService.idl nsIRDFXMLSink.idl nsIRDFXMLSource.idl +nsIXULSortService.idl xulstubs.idl diff --git a/mozilla/rdf/base/idl/Makefile.in b/mozilla/rdf/base/idl/Makefile.in index 6b4e8ebeb1c..28806e0f3f7 100644 --- a/mozilla/rdf/base/idl/Makefile.in +++ b/mozilla/rdf/base/idl/Makefile.in @@ -40,6 +40,7 @@ XPIDLSRCS = \ nsIController.idl \ nsIGenericCommandSet.idl \ xulstubs.idl \ + nsIXULSortService.idl \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/base/idl/makefile.win b/mozilla/rdf/base/idl/makefile.win index d09e238d025..fbf58a4c055 100644 --- a/mozilla/rdf/base/idl/makefile.win +++ b/mozilla/rdf/base/idl/makefile.win @@ -34,6 +34,7 @@ XPIDLSRCS= .\nsIRDFNode.idl \ .\nsIController.idl \ .\nsIGenericCommandSet.idl \ .\xulstubs.idl \ + .\nsIXULSortService.idl \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/rdf/content/src/nsXULSortService.cpp b/mozilla/rdf/content/src/nsXULSortService.cpp index f96fddd2275..0b54e12f73b 100644 --- a/mozilla/rdf/content/src/nsXULSortService.cpp +++ b/mozilla/rdf/content/src/nsXULSortService.cpp @@ -215,6 +215,7 @@ public: NS_DECL_ISUPPORTS // nsISortService + NS_IMETHOD Sort(nsIDOMNode* node, const char *sortResource, const char *sortDirection); NS_IMETHOD DoSort(nsIDOMNode* node, const nsString& sortResource, const nsString& sortDirection); NS_IMETHOD OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *container, nsIRDFResource **flatArray, PRInt32 numElements, PRInt32 elementSize); @@ -1469,6 +1470,20 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node, +NS_IMETHODIMP +XULSortServiceImpl::Sort(nsIDOMNode* node, const char *sortResource, const char *sortDirection) +{ +#ifdef DEBUG + printf("\n XULSortServiceImpl::Sort \n\n"); +#endif + + nsAutoString sortRes(sortResource), sortDir(sortDirection); + nsresult rv = DoSort(node, sortResource, sortDirection); + return(rv); +} + + + NS_IMETHODIMP XULSortServiceImpl::DoSort(nsIDOMNode* node, const nsString& sortResource, const nsString& sortDirection) diff --git a/mozilla/rdf/macbuild/RDFIDL.mcp b/mozilla/rdf/macbuild/RDFIDL.mcp index 8a90f554e4d..11c900ed2a4 100644 Binary files a/mozilla/rdf/macbuild/RDFIDL.mcp and b/mozilla/rdf/macbuild/RDFIDL.mcp differ