[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Sep 26 04:54:23 PDT 2011
binfilter/bf_svx/source/svdraw/svx_svdio.cxx | 186 ------------------------
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 11 -
binfilter/inc/bf_svx/svdio.hxx | 8 -
3 files changed, 205 deletions(-)
New commits:
commit 097519ecf53e5be95245b3678552726041fb0004
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 24 00:34:35 2011 +0100
ditch out of date debugging stuff
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
index d602a53..65ce7a0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdio.cxx
@@ -117,10 +117,6 @@ namespace binfilter {
/*N*/ {
/*N*/ UINT32 nReadAnz(nAktPos - nFilePos);
/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ ImpCheckRecordIntegrity();
-/*N*/ #endif
-/*N*/
/*N*/ if(nReadAnz != nBlkSize)
/*N*/ {
/*N*/ // FilePos korregieren
@@ -137,10 +133,6 @@ namespace binfilter {
/*N*/ Write();
/*N*/ // und die FilePos restaurieren.
/*N*/ rStream.Seek(nAktPos);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ ImpCheckRecordIntegrity();
-/*N*/ #endif
/*N*/ }
/*N*/ else
/*N*/ OSL_FAIL("SdrIOHeader::CloseRecord(): Falscher StreamMode angegeben.");
@@ -208,150 +200,6 @@ namespace binfilter {
/*?*/ return 0;
/*N*/ }
-#ifdef DBG_UTIL
-
-/*N*/ void SdrIOHeader::ImpGetRecordName(ByteString& rStr, INT32 nSubRecCount,
-/*N*/ INT32 nSubRecReadCount) const
-/*N*/ {
-/*N*/ rStr = "CheckRecordIntegrity (ID=";
-/*N*/ rStr += cMagic[0];
-/*N*/ rStr += cMagic[1];
-/*N*/ rStr += cHdrID[0];
-/*N*/ rStr += cHdrID[1];
-/*N*/ rStr += ')';
-/*N*/
-/*N*/ if(nSubRecCount != -1)
-/*N*/ {
-/*N*/ rStr += " (";
-/*N*/
-/*N*/ if(nSubRecReadCount != -1)
-/*N*/ {
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecReadCount );
-/*N*/ rStr += " von ";
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
-/*N*/ rStr += " Records gelesen)";
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rStr += ByteString_CreateFromInt32( nSubRecCount );
-/*N*/ rStr += " Records)";
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-/*N*/ BOOL SdrIOHeader::ImpHasSubRecords() const
-/*N*/ {
-/*N*/ // nicht jeder Record hat SubRecords
-/*N*/ return IsID(SdrIOModlID) ||
-/*N*/ IsID(SdrIOPageID) ||
-/*N*/ IsID(SdrIOMaPgID) ||
-/*N*/ IsID(SdrIODObjID);
-/*N*/ }
-
-// Testet die Integritaet eines Records. Innerhalb eines Records
-// muessen alle Daten in Subrecords (SdrDownCompat) untergebracht sein.
-
-/*N*/ void SdrIOHeader::ImpCheckRecordIntegrity()
-/*N*/ {
-/*N*/ UINT32 nFilePos0(rStream.Tell());
-/*N*/
-/*N*/ if(IsMagic() && ImpHasSubRecords())
-/*N*/ {
-/*N*/ // nicht jeder Record hat SubRecords
-/*N*/ // Seek an den Recordanfang
-/*N*/ rStream.Seek(nFilePos);
-/*N*/ Read();
-/*N*/
-/*N*/ // Anzahl der vorhandenen SubRecords
-/*N*/ UINT32 nHasSubRecCount(0);
-/*N*/ // Anzahl der SubRecords bis nFilePos0
-/*N*/ UINT32 nReadSubRecCount(0);
-/*N*/ UINT32 nAktFilePos(rStream.Tell());
-/*N*/ BOOL bFilePos0Hit(nAktFilePos == nFilePos0);
-/*N*/
-/*N*/ while(!rStream.GetError() && !rStream.IsEof() && nAktFilePos < nFilePos + nBlkSize)
-/*N*/ {
-/*N*/ UINT32 nSubRecSiz;
-/*N*/
-/*N*/ nHasSubRecCount++;
-/*N*/ rStream >> nSubRecSiz;
-/*N*/ nAktFilePos += nSubRecSiz;
-/*N*/ rStream.Seek(nAktFilePos);
-/*N*/
-/*N*/ if(nAktFilePos <= nFilePos0)
-/*N*/ nReadSubRecCount++;
-/*N*/
-/*N*/ if(nAktFilePos == nFilePos0)
-/*N*/ // Aha, nFilePos0 ist ok.
-/*N*/ bFilePos0Hit = TRUE;
-/*N*/ }
-/*N*/
-/*N*/ ByteString aStr;
-/*N*/
-/*N*/ if(nAktFilePos != nFilePos+nBlkSize)
-/*N*/ aStr += "- SubRecord-Strukturfehler.\n";
-/*N*/
-/*N*/ if(nFilePos0 > nAktFilePos)
-/*N*/ {
-/*?*/ UINT32 nToMuch(nFilePos0 - nAktFilePos);
-/*?*/
-/*?*/ aStr += "- ";
-/*?*/
-/*?*/ if(nToMuch == 1)
-/*?*/ aStr += "1 Byte";
-/*?*/ else
-/*?*/ {
-/*?*/ aStr += ByteString_CreateFromInt32( nToMuch );
-/*?*/ aStr += " Bytes";
-/*?*/ }
-/*?*/
-/*?*/ aStr += " zuviel gelesen.\n";
-/*N*/ }
-
-/*N*/ if(!bFilePos0Hit)
-/*N*/ aStr += "- Aktuelle Fileposition liegt nicht am Ende eines SubRecords.\n";
-/*N*/
-/*N*/ if(aStr.Len())
-/*N*/ {
-/*?*/ ByteString aStr2;
-/*?*/
-/*?*/ aStr.Insert(":\n", 0);
-/*?*/ ImpGetRecordName(aStr2, nHasSubRecCount, nReadSubRecCount);
-/*?*/ aStr.Insert(aStr2, 0);
-/*?*/ OSL_FAIL(aStr.GetBuffer());
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // keine SubRecords vorhanden, also nur FilePos pruefen
-/*N*/ if(nFilePos0 > nFilePos + nBlkSize)
-/*N*/ {
-/*?*/ ByteString aStr;
-/*?*/ UINT32 nToMuch(nFilePos0 - nFilePos+nBlkSize);
-/*?*/
-/*?*/ ImpGetRecordName(aStr);
-/*?*/ aStr += ":\nAus dem Record wurde";
-/*?*/
-/*?*/ if(nToMuch == 1)
-/*?*/ aStr += "1 Byte";
-/*?*/ else
-/*?*/ {
-/*?*/ aStr += "n ";
-/*?*/ aStr += ByteString_CreateFromInt32( nToMuch );
-/*?*/ aStr += " Bytes";
-/*?*/ }
-/*?*/
-/*?*/ aStr += " zuviel gelesen. FilePos wird korregiert";
-/*?*/
-/*?*/ OSL_FAIL(aStr.GetBuffer());
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Fileposition restaurieren
-/*N*/ rStream.Seek(nFilePos0);
-/*N*/ }
-#endif
-
/*N*/ SdrIOHeaderLookAhead::SdrIOHeaderLookAhead(SvStream& rNewStream, BOOL bAutoOpen)
/*N*/ : SdrIOHeader(rNewStream, STREAM_READ, SdrIOEndeID, FALSE)
/*N*/ {
@@ -515,40 +363,6 @@ namespace binfilter {
/*N*/ {
/*N*/ UINT32 nReadAnz(nAktPos - nSubRecPos);
/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ if(nReadAnz > nSubRecSiz)
-/*N*/ {
-/*?*/ ByteString aErrMsg("SdrDownCompat::CloseSubRecord(), ");
-/*?*/
-/*?*/ aErrMsg += "RedordID";
-/*?*/
-/*?*/ if(!pRecId)
-/*?*/ aErrMsg += " unbekannt";
-/*?*/ else
-/*?*/ {
-/*?*/ aErrMsg += '=';
-/*?*/ aErrMsg += pRecId;
-/*?*/ }
-/*?*/
-/*?*/ aErrMsg += ":\nAus dem Record wurde";
-/*?*/
-/*?*/ UINT32 nToMuch(nReadAnz - nSubRecSiz);
-/*?*/
-/*?*/ if(nToMuch == 1)
-/*?*/ aErrMsg += " 1 Byte";
-/*?*/ else
-/*?*/ {
-/*?*/ aErrMsg += "n ";
-/*?*/ aErrMsg += ByteString_CreateFromInt32( nToMuch );
-/*?*/ aErrMsg += " Bytes";
-/*?*/ }
-/*?*/
-/*?*/ aErrMsg += " zuviel gelesen, FilePos korregiert.";
-/*?*/
-/*?*/ OSL_FAIL(aErrMsg.GetBuffer());
-/*N*/ }
-#endif
-
/*N*/ if(nReadAnz != nSubRecSiz)
/*N*/ {
/*N*/ // den Rest ueberspringen
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 2eaab3f..e4e2a2b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -400,17 +400,6 @@ using namespace ::com::sun::star;
/*N*/ delete mpOutlinerCache;
/*N*/
/*N*/ ClearUndoBuffer();
-/*N*/ #ifdef DBG_UTIL
-/*N*/ if(pAktUndoGroup)
-/*N*/ {
-/*?*/ ByteString aStr("Im Dtor des SdrModel steht noch ein offenes Undo rum: \"");
-/*?*/
-/*?*/ aStr += ByteString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding());
-/*?*/ aStr += '\"';
-/*?*/
-/*?*/ OSL_FAIL(aStr.GetBuffer());
-/*N*/ }
-/*N*/ #endif
/*N*/ if (pAktUndoGroup!=NULL) delete pAktUndoGroup;
/*N*/ Clear();
/*N*/ delete pLayerAdmin;
diff --git a/binfilter/inc/bf_svx/svdio.hxx b/binfilter/inc/bf_svx/svdio.hxx
index 8d44c03..37abf5b 100644
--- a/binfilter/inc/bf_svx/svdio.hxx
+++ b/binfilter/inc/bf_svx/svdio.hxx
@@ -163,14 +163,6 @@ protected:
virtual void Write();
virtual void Read();
-#if _SOLAR__PRIVATE
-#ifdef DBG_UTIL
- void ImpCheckRecordIntegrity();
- void ImpGetRecordName(ByteString& rStr, INT32 nSubRecCount=-1, INT32 nSubRecReadCount=-1) const;
- BOOL ImpHasSubRecords() const;
-#endif
-#endif // __PRIVATE
-
public:
SdrIOHeader(SvStream& rNewStream, UINT16 nNewMode, const char cID[2]=SdrIOEndeID, BOOL bAutoOpen=TRUE);
virtual ~SdrIOHeader();
More information about the Libreoffice-commits
mailing list