[Libreoffice-commits] .: rsc/inc rsc/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jan 23 21:04:02 PST 2011
rsc/inc/rscarray.hxx | 4 ++--
rsc/inc/rscclass.hxx | 4 ++--
rsc/inc/rscclobj.hxx | 22 +++-------------------
rsc/inc/rsccont.hxx | 4 ++--
rsc/inc/rscdb.hxx | 10 +++++-----
rsc/inc/rscmgr.hxx | 5 ++---
rsc/inc/rscrange.hxx | 4 ++--
rsc/inc/rsctop.hxx | 5 ++---
rsc/source/parser/rscdb.cxx | 31 +++++++++++++++----------------
rsc/source/res/rscarray.cxx | 16 ++++++++--------
rsc/source/res/rscclass.cxx | 17 ++++-------------
rsc/source/res/rscclobj.cxx | 18 ++++--------------
rsc/source/res/rsccont.cxx | 16 ++++------------
rsc/source/res/rscmgr.cxx | 10 +++-------
rsc/source/res/rscrange.cxx | 7 ++-----
rsc/source/res/rsctop.cxx | 7 +++----
16 files changed, 63 insertions(+), 117 deletions(-)
New commits:
commit bd5e5aa0e064c21b2affc86f239404458493543e
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 23 21:03:53 2011 -0800
Remove DECLARE_LIST( RscInconsList, RscInconsistent* )
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 1c3fc40..68ace33 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.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
@@ -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 fb3c2ef..a5cdb14 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.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
@@ -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 7a11090..b75ab71 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.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
@@ -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
@@ -58,7 +42,7 @@ protected:
public:
using NameNode::Insert;
-
+
ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey );
ObjNode * DelObjNode( RscTop * pClass, ULONG lFileKey );
sal_uInt32 GetId() const;
@@ -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 f93da45..e103936 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.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
@@ -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 195bf61..44401cc 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.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
@@ -32,7 +32,7 @@
#include <rscall.h>
#include <rsckey.hxx>
#include <rscconst.hxx>
-#include <rscflag.hxx>
+#include <rscflag.hxx>
#include <rscrange.hxx>
#include <rscstr.hxx>
#include <rscarray.hxx>
@@ -303,7 +303,7 @@ public:
RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags );
~RscTypCont();
-
+
Atom AddLanguage( const char* );
BOOL IsPreload() const
@@ -315,7 +315,7 @@ public:
BOOL IsSrsDefault() const
{ return (nFlags & SRSDEFAULT_FLAG) ? TRUE : FALSE; }
ByteString ChangeLanguage( const ByteString& rNewLang );
- const std::vector< sal_uInt32 >& GetFallbacks() const
+ const std::vector< sal_uInt32 >& GetFallbacks() const
{ return aLangFallbacks; }
RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; }
@@ -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 a8e81f2..990129b 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.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
@@ -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 d493fad..3a342c4 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.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
@@ -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 3ee2491..2ec293b 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.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
@@ -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 8310821..7213a36 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.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
@@ -141,7 +141,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
aCountry = aLang.getToken( 0, '-', nIndex );
if( nIndex != -1 )
aVariant = aLang.copy( nIndex );
-
+
bool bAppendEnUsFallback =
! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) ||
rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) );
@@ -155,7 +155,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
{
aLangFallbacks.push_back(getLangIdAndShortenLocale( this, aLg, aCountry, aVariant ) );
} while( aLg.getLength() );
-
+
if( bAppendEnUsFallback )
{
aLg = "en";
@@ -761,7 +761,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
RscWriteRc aMem( nByteOrder );
aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE );
aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
-
+
return aError;
}
@@ -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 9583584..a3030ef 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.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
@@ -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 1db51a7..3e4879e 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.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
@@ -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 15e1f96..895c778 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.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
@@ -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 f5feda5..509d40f 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.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
@@ -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 76f323f..af980b0 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.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
@@ -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 aadf901..8fbc85f 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.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
@@ -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 2ad0420..8fbebf2 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.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
@@ -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;
}
More information about the Libreoffice-commits
mailing list