[Libreoffice-commits] .: rsc/inc rsc/source

Joseph Powers jpowers at kemper.freedesktop.org
Mon Jan 24 21:51:02 PST 2011


 rsc/inc/rsclst.hxx         |    6 ++----
 rsc/source/misc/rscdbl.cxx |    9 ++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 962471c0d378dfa847137354b7f36525de1d9b03
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Jan 24 21:50:54 2011 -0800

    Remove DECLARE_LIST( RESubResourceList, REResourceList * )

diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index c848f1b..97ad5c5 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,9 +34,7 @@
 
 class REResourceList;
 
-DECLARE_LIST( RESubResourceList, REResourceList * )
-
-class REResourceList : public RESubResourceList
+class REResourceList
 {
 protected:
     REResourceList*  pParent;
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 0950bb9..7697eb9 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,9 +43,9 @@
 |*
 *************************************************************************/
 REResourceList * InsertList( Atom nClassName, const RscId& rId,
-                             REResourceList * pList ){
+                             REResourceList * pList ) {
     REResourceList	*	pSubList;
-    const char *				pStrClass;
+    const char *		pStrClass;
     ByteString			aStrClass;
 
     pStrClass = pHS->getString( nClassName ).getStr();
@@ -56,8 +56,7 @@ REResourceList * InsertList( Atom nClassName, const RscId& rId,
 
     pSubList = new REResourceList( pList, aStrClass, rId );
 
-    pList->Insert( pSubList, 0xFFFFFFFF );
-    return( pSubList );
+    return pSubList;
 }
 
 void FillSubList( RSCINST & rInst, REResourceList * pList )


More information about the Libreoffice-commits mailing list