Remove DECLARE_LIST( RscInconsList, RscInconsistent* )

16 files changed, 40 insertions, 94 deletions

diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 9a6bba30e987..9d91534728ce 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -93,7 +93,7 @@ public:
                     // Gibt die Groesse der Klasse in Bytes
     sal_uInt32          Size(){ return( nSize ); };
 
-    BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
+    BOOL            IsConsistent( const RSCINST & rInst );
     virtual void    SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index e0c2bdd9953c..49d8250af0a7 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -84,7 +84,7 @@ public:
                     // Gibt die Groesse der Klasse in Bytes
     sal_uInt32          Size(){ return( nSize ); };
 
-    BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
+    BOOL            IsConsistent( const RSCINST & rInst );
     void            SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index 46b6ada33d85..b75ab715feb6 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -32,22 +32,6 @@
 #include <rscdef.hxx>
 #include <rscall.h>
 
-/****************** C L A S S E S ****************************************/
-class RscTypCont;
-
-/*********** R s c I n c o n s i s t e n t *******************************/
-class RscInconsistent {
-public:
-    RscId aFirstId;   //Paar von inkonsistenten Id's
-    RscId aSecondId;
-    RscInconsistent( const RscId & rFirst, const RscId & rSecond ){
-            aFirstId = rFirst;
-            aSecondId = rSecond;
-        };
-};
-
-DECLARE_LIST( RscInconsList, RscInconsistent * )
-
 /******************* O b j N o d e ***************************************/
 class ObjNode : public IdNode{
     RscId       aRscId; // Id der Resource
@@ -76,7 +60,7 @@ public:
                     // get the Object from this Node
                     return( pRscObj );
                 }
-    BOOL        IsConsistent( RscInconsList * pList = NULL );
+    BOOL        IsConsistent();
 };
 
 /******************* R e f N o d e ***************************************/
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 3126ceb0a1a0..07977cabbd52 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -99,7 +99,7 @@ public:
                     // Gibt die Groesse der Klasse in Bytes
     sal_uInt32          Size(){ return( nSize ); };
 
-    BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
+    BOOL            IsConsistent( const RSCINST & rInst );
     void            SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
     BOOL            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 7ac5e42eca1c..346f95497800 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -353,7 +353,7 @@ public:
     void        WriteSyntax( FILE * fOutput );
     void        WriteRcCtor( FILE * fOutput );
     void        FillNameIdList( REResourceList * pList, ULONG lFileKey );
-    BOOL        MakeConsistent( RscInconsList * pList );
+    BOOL        MakeConsistent();
     sal_uInt32      PutTranslatorKey( sal_uInt64 nKey );
     void        IncFilePos( ULONG nOffset ){ nFilePos += nOffset; }
 };
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index da8e72304926..fef2712d4e27 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -72,8 +72,7 @@ public:
                                     RscTypCont * pTC, const RscId & rId );
     ERRTYPE         WriteCxx( const RSCINST & rInst, FILE * fOutput,
                               RscTypCont * pTC, const RscId & rId );
-    BOOL            IsConsistent( const RSCINST & rInst,
-                                  RscInconsList * pList = NULL );
+    BOOL            IsConsistent( const RSCINST & rInst );
     ERRTYPE         GetRef( const RSCINST & rInst, RscId * );
     ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId );
 };
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 6f36c47ed200..48d0077e43c8 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -164,7 +164,7 @@ public:
                               RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
                              RscTypCont * pTC, sal_uInt32, BOOL bExtra );
-    BOOL            IsConsistent( const RSCINST & rInst, RscInconsList * pList );
+    BOOL            IsConsistent( const RSCINST & rInst );
     void            WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
                                     const char * );
 
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index e382164eef97..777f45246aa8 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -191,8 +191,7 @@ public:
     virtual void    Destroy( const RSCINST & rInst );
 
                     // prueft auf konsistenz
-    virtual BOOL    IsConsistent( const RSCINST & rInst,
-                                  RscInconsList * pList = NULL );
+    virtual BOOL    IsConsistent( const RSCINST & rInst );
 
                     // Alles auf Default setzen
     virtual void    SetToDefault( const RSCINST & rInst );
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 362206c84bc5..9c2c43bb48bb 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -977,56 +977,55 @@ void RscTypCont :: Delete( ULONG lFileKey ){
 |*    RscTypCont :: MakeConsistent()
 |*
 *************************************************************************/
-BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop,
-                       RscInconsList * pList )
+BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
 {
     BOOL bRet = TRUE;
 
     if( pObjNode ){
         RSCINST aTmpI;
 
-        if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop, pList ) )
+        if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop ) )
             bRet = FALSE;
 
         aTmpI.pClass = pRscTop;
         aTmpI.pData = pObjNode->GetRscObj();
-        if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) )
+        if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
             bRet = FALSE;
 
-        if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop, pList ) )
+        if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) )
             bRet = FALSE;
     };
 
     return( bRet );
 }
 
-BOOL MakeConsistent( RscTop * pRscTop, RscInconsList * pList )
+BOOL MakeConsistent( RscTop * pRscTop )
 {
     BOOL bRet = TRUE;
 
     if( pRscTop ){
-        if( ! ::MakeConsistent( (RscTop*)pRscTop->Left(), pList ) )
+        if( ! ::MakeConsistent( (RscTop*)pRscTop->Left() ) )
             bRet = FALSE;
 
         if( pRscTop->GetObjNode() ){
             if( ! pRscTop->GetObjNode()->IsConsistent() ){
                 pRscTop->GetObjNode()->OrderTree();
-                if( ! pRscTop->GetObjNode()->IsConsistent( pList ) )
+                if( ! pRscTop->GetObjNode()->IsConsistent() )
                     bRet = FALSE;
             }
-            if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop, pList ) )
+            if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) )
                 bRet = FALSE;
         }
 
-        if( ! ::MakeConsistent( (RscTop*)pRscTop->Right(), pList ) )
+        if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) )
             bRet = FALSE;
     };
 
     return bRet;
 }
 
-BOOL RscTypCont :: MakeConsistent( RscInconsList * pList ){
-    return( ::MakeConsistent( pRoot, pList ) );
+BOOL RscTypCont :: MakeConsistent(){
+    return( ::MakeConsistent( pRoot ) );
 }
 
 sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey )
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index c15c1bec471a..a3030ef65b64 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.cxx
@@ -294,30 +294,30 @@ ERRTYPE RscArray::GetArrayEle
 |*    RscArray::IsConsistent()
 |*
 *************************************************************************/
-static BOOL IsConsistent( RscInstNode * pNode, RscInconsList * pList )
+static BOOL IsConsistent( RscInstNode * pNode )
 {
     BOOL bRet = TRUE;
 
     if( pNode )
     {
-        bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst, pList );
-        if( !IsConsistent( pNode->Left(), pList ) )
+        bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst );
+        if( !IsConsistent( pNode->Left() ) )
             bRet = FALSE;
-        if( !IsConsistent( pNode->Right(), pList ) )
+        if( !IsConsistent( pNode->Right() ) )
             bRet = FALSE;
     }
     return bRet;
 }
 
-BOOL RscArray::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
+BOOL RscArray::IsConsistent( const RSCINST & rInst )
 {
     RscArrayInst * pClassData;
     BOOL    bRet;
 
-    bRet = RscTop::IsConsistent( rInst, pList );
+    bRet = RscTop::IsConsistent( rInst );
 
     pClassData = (RscArrayInst *)(rInst.pData + nOffInstData);
-    if( !::IsConsistent( pClassData->pNode, pList ) )
+    if( !::IsConsistent( pClassData->pNode ) )
         bRet = FALSE;
 
     return( bRet );
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 1c9bdcfb5569..ad2a45e66892 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -200,15 +200,6 @@ BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
         bRet = TRUE;
     else
         bRet = FALSE;
-/*  {
-        //Variablenname ist Default
-        RSCINST aTmpI;
-
-        aTmpI = GetInstData( pData, nEle, TRUE );
-        if( aTmpI.IsInst() && !aTmpI.pClass->IsDefault( aTmpI ) )
-            bRet = FALSE;
-    }
-*/
     return bRet;
 }
 
@@ -528,13 +519,13 @@ RSCINST RscClass::GetCopyVar
 |*    Beschreibung
 |*
 *************************************************************************/
-BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
+BOOL RscClass::IsConsistent( const RSCINST & rInst )
 {
     sal_uInt32  i = 0;
     RSCINST aTmpI;
     BOOL    bRet;
 
-    bRet = RscTop::IsConsistent( rInst, pList );
+    bRet = RscTop::IsConsistent( rInst );
 
     for( i = 0; i < nEntries; i++ )
     {
@@ -543,7 +534,7 @@ BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
             aTmpI = GetInstData( rInst.pData, i, TRUE );
 
             if( aTmpI.IsInst() )
-                if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) )
+                if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
                     bRet = FALSE;
         }
     };
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index 7c264489fb98..895c778525e8 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.cxx
@@ -152,29 +152,23 @@ sal_uInt32 ObjNode::GetId() const
 |*    ObjNode::IsConsistent()
 |*
 *************************************************************************/
-BOOL ObjNode::IsConsistent( RscInconsList * pList )
+BOOL ObjNode::IsConsistent()
 {
     BOOL bRet = TRUE;
 
     if( (long)aRscId > 0x7FFF || (long)aRscId < 1 )
     {
         bRet = FALSE;
-        if( pList )
-            pList->Insert( new RscInconsistent( aRscId, aRscId ) );
     }
     else
     {
         if( Left() )
         {
-            if( !((ObjNode *)Left())->IsConsistent( pList ) )
+            if( !((ObjNode *)Left())->IsConsistent() )
                 bRet = FALSE;
             if( ((ObjNode *)Left())->aRscId >= aRscId )
             {
                 bRet = FALSE;
-                if( pList )
-                    pList->Insert(
-                        new RscInconsistent( ((ObjNode *)Left())->GetRscId(),
-                                             GetRscId() ) );
             }
         };
         if( Right() )
@@ -182,12 +176,8 @@ BOOL ObjNode::IsConsistent( RscInconsList * pList )
             if( ((ObjNode *)Right())->aRscId <= aRscId )
             {
                 bRet = FALSE;
-                if( pList )
-                    pList->Insert(
-                        new RscInconsistent( GetRscId(),
-                                             ((ObjNode *)Right())->GetRscId() ) );
             }
-            if( !((ObjNode *)Right())->IsConsistent( pList ) )
+            if( !((ObjNode *)Right())->IsConsistent() )
                 bRet = FALSE;
         };
     };
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 1e5113d736f4..e2b49d7d9ab7 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -598,12 +598,12 @@ else
 |*    RscBaseCont::IsConsistent()
 |*
 *************************************************************************/
-BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
+BOOL RscBaseCont::IsConsistent( const RSCINST & rInst ) {
     sal_uInt32  i = 0;
     RscBaseContInst * pClassData;
     BOOL    bRet;
 
-    bRet = RscTop::IsConsistent( rInst, pList );
+    bRet = RscTop::IsConsistent( rInst );
 
     pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
 
@@ -614,23 +614,15 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
             if( (INT32)pClassData->pEntries[ i ].aName > 0x7FFF
               || (INT32)pClassData->pEntries[ i ].aName < 1 ){
                 bRet = FALSE;
-                if( pList )
-                    pList->Insert( new RscInconsistent(
-                        pClassData->pEntries[ i ].aName,
-                        pClassData->pEntries[ i ].aName ) );
             }
             else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName,
                 pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
             {
                  bRet = FALSE;
-                 if( pList )
-                     pList->Insert( new RscInconsistent(
-                         pClassData->pEntries[ i    ].aName,
-                         pClassData->pEntries[ i +1 ].aName ) );
              };
         }
         if( ! pClassData->pEntries[ i ].aInst.pClass->
-              IsConsistent( pClassData->pEntries[ i ].aInst, pList ) )
+              IsConsistent( pClassData->pEntries[ i ].aInst ) )
             bRet = FALSE;
     };
 
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index ef01c7ef6d8b..c563a9d2a86b 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -530,12 +530,12 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
 |*    RscArray::IsConsistent()
 |*
 *************************************************************************/
-BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
+BOOL RscMgr::IsConsistent( const RSCINST & rInst )
 {
     BOOL    bRet;
     RscMgrInst * pClassData;
 
-    bRet = RscClass::IsConsistent( rInst, pList );
+    bRet = RscClass::IsConsistent( rInst );
 
     pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
     if( pClassData->aRefId.IsId() &&
@@ -543,10 +543,6 @@ BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
         || (pClassData->aRefId.GetNumber() > 0x7FFF)
         || IsToDeep( rInst ).IsError()) )
     {
-        if( pList )
-            pList->Insert(
-                new RscInconsistent( pClassData->aRefId,
-                                     pClassData->aRefId ) );
         bRet = FALSE;
     }
 
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index bd121e2a5246..0e1aa26736b6 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -596,15 +596,12 @@ void RscIdRange::WriteRcAccess
 |*    RscIdRange::IsConsistent()
 |*
 *************************************************************************/
-BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList )
+BOOL RscIdRange::IsConsistent( const RSCINST & rInst )
 {
     long nValue = ((RscId *)rInst.pData)->GetNumber();
     if( (nMax >= nValue) && (nMin <= nValue) )
         return TRUE;
     else {
-        if( pList )
-            pList->Insert( new RscInconsistent(
-                *(RscId *)rInst.pData, *(RscId *)rInst.pData ) );
         return FALSE;
     }
 }
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 7bb0cf707eff..a3305412da10 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -518,11 +518,10 @@ void    RscTop::Destroy( const RSCINST & rInst ){
 |*    RscTop::IsConsistent()
 |*
 *************************************************************************/
-BOOL    RscTop::IsConsistent( const RSCINST & rInst,
-                              RscInconsList * pList )
+BOOL    RscTop::IsConsistent( const RSCINST & rInst )
 {
     if( pSuperClass )
-        return pSuperClass->IsConsistent( rInst, pList );
+        return pSuperClass->IsConsistent( rInst );
     else
         return TRUE;
 }