[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Sep 5 07:45:06 PDT 2011
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 23 ---
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 3
binfilter/inc/bf_sw/redline.hxx | 71 +++-------
3 files changed, 24 insertions(+), 73 deletions(-)
New commits:
commit 8ad34e0aa04042a57ef6f3bdf3e16a713c746cf4
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Sep 5 07:44:50 2011 -0700
It seams that class SwRedlineExtraData isn't actually used.
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index 0b3cac4..1492ee3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -370,26 +370,8 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
/*N*/ }
-// suche den naechsten oder vorherigen Redline mit dergleichen Seq.No
-// Mit dem Lookahead kann die Suche eingeschraenkt werden. 0 oder
-// USHRT_MAX suchen im gesamten Array.
-
-
-/*?*/SwRedlineExtraData::~SwRedlineExtraData()
-/*?*/{
-/*?*/}
-
-
-
-/*?*/int SwRedlineExtraData::operator == ( const SwRedlineExtraData& ) const
-/*?*/{
-/*?*/ return FALSE;
-/*?*/}
-
-
/*?*/SwRedlineData::SwRedlineData( const SwRedlineData& rCpy, BOOL bCpyNext )
/*?*/ : pNext( (bCpyNext && rCpy.pNext) ? new SwRedlineData( *rCpy.pNext ) : 0 )
-/*?*/ , pExtraData( rCpy.pExtraData ? rCpy.pExtraData->CreateNew() : 0 )
/*?*/ , sComment( rCpy.sComment )
/*?*/ , aStamp( rCpy.aStamp )
/*?*/ , eType( rCpy.eType )
@@ -400,10 +382,8 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
// fuer sw3io: pNext geht in eigenen Besitz ueber!
/*?*/SwRedlineData::SwRedlineData( SwRedlineType eT, USHORT nAut, const DateTime& rDT,
-/*?*/ const String& rCmnt, SwRedlineData *pNxt,
-/*?*/ SwRedlineExtraData* pData )
+/*?*/ const String& rCmnt, SwRedlineData *pNxt )
/*?*/ : pNext( pNxt )
-/*?*/ , pExtraData( pData )
/*?*/ , sComment( rCmnt )
/*?*/ , aStamp( rDT )
/*?*/ , eType( eT )
@@ -414,7 +394,6 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
/*?*/SwRedlineData::~SwRedlineData()
/*?*/{
-/*?*/ delete pExtraData;
/*?*/ delete pNext;
/*?*/}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
index aa120f4..8b09e63 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx
@@ -711,8 +711,7 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline(
SwRedlineData* pData = new SwRedlineData(pRedlineInfo->eType,
nAuthorId, aDT,
pRedlineInfo->sComment,
- pNext, // next data (if available)
- NULL); // no extra data
+ pNext); // next data (if available)
return pData;
}
diff --git a/binfilter/inc/bf_sw/redline.hxx b/binfilter/inc/bf_sw/redline.hxx
index dd80f61..589267b 100644
--- a/binfilter/inc/bf_sw/redline.hxx
+++ b/binfilter/inc/bf_sw/redline.hxx
@@ -43,30 +43,10 @@ class SfxItemSet;
-class SwRedlineExtraData
-{
- SwRedlineExtraData( const SwRedlineExtraData& );
- SwRedlineExtraData& operator=( const SwRedlineExtraData& );
-
-protected:
- SwRedlineExtraData() {}
-
-public:
- virtual ~SwRedlineExtraData();
- virtual SwRedlineExtraData* CreateNew() const = 0;
-
- virtual int operator == ( const SwRedlineExtraData& ) const;
-};
-
-
-
-
-
class SwRedlineData
{
friend class SwRedline;
SwRedlineData* pNext; // Verweis auf weitere Daten
- SwRedlineExtraData* pExtraData;
String sComment;
DateTime aStamp;
@@ -78,21 +58,21 @@ public:
// fuer sw3io: pNext/pExtraData gehen in eigenen Besitz ueber!
SwRedlineData( SwRedlineType eT, USHORT nAut, const DateTime& rDT,
- const String& rCmnt, SwRedlineData* pNxt,
- SwRedlineExtraData* pExtraData = 0 );
+ const String& rCmnt, SwRedlineData* pNxt );
~SwRedlineData();
int operator==( const SwRedlineData& rCmp ) const
{
- return nAuthor == rCmp.nAuthor &&
- eType == rCmp.eType &&
- sComment == rCmp.sComment &&
- (( !pNext && !rCmp.pNext ) ||
- ( pNext && rCmp.pNext && *pNext == *rCmp.pNext )) &&
- (( !pExtraData && !rCmp.pExtraData ) ||
- ( pExtraData && rCmp.pExtraData &&
- *pExtraData == *rCmp.pExtraData ));
+ return nAuthor == rCmp.nAuthor
+ && eType == rCmp.eType
+ && sComment == rCmp.sComment
+ && ( ( !pNext && !rCmp.pNext )
+ || ( pNext
+ && rCmp.pNext
+ && *pNext == *rCmp.pNext
+ )
+ );
}
int operator!=( const SwRedlineData& rCmp ) const
{ return !operator==( rCmp ); }
@@ -112,22 +92,20 @@ public:
{ eType = SwRedlineType( eType | REDLINE_FORM_AUTOFMT ); }
int CanCombine( const SwRedlineData& rCmp ) const
{
- return nAuthor == rCmp.nAuthor &&
- eType == rCmp.eType &&
- sComment == rCmp.sComment &&
- GetTimeStamp() == rCmp.GetTimeStamp() &&
- (( !pNext && !rCmp.pNext ) ||
- ( pNext && rCmp.pNext &&
- pNext->CanCombine( *rCmp.pNext ))) &&
- (( !pExtraData && !rCmp.pExtraData ) ||
- ( pExtraData && rCmp.pExtraData &&
- *pExtraData == *rCmp.pExtraData ));
+ return nAuthor == rCmp.nAuthor
+ && eType == rCmp.eType
+ && sComment == rCmp.sComment
+ && GetTimeStamp() == rCmp.GetTimeStamp()
+ && ( ( !pNext
+ && !rCmp.pNext
+ )
+ || ( pNext
+ && rCmp.pNext
+ && pNext->CanCombine( *rCmp.pNext )
+ )
+ );
}
- // ExtraData wird kopiert, der Pointer geht also NICHT in den Besitz
- // des RedlineObjectes!
- const SwRedlineExtraData* GetExtraData() const { return pExtraData; }
-
// fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur
// fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei,
// das es noch weitere geben kann!
@@ -195,11 +173,6 @@ public:
const String& GetComment() const { return pRedlineData->GetComment(); }
void SetComment( const String& rS ) { pRedlineData->SetComment( rS ); }
- // ExtraData wird kopiert, der Pointer geht also NICHT in den Besitz
- // des RedlineObjectes!
- const SwRedlineExtraData* GetExtraData() const
- { return pRedlineData->GetExtraData(); }
-
// fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur
// fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei,
// das es noch weitere geben kann!
More information about the Libreoffice-commits
mailing list