Kaydet (Commit) 098e422d authored tarafından Nigel Hawkins's avatar Nigel Hawkins

Remove use of SvLongs in dbg_lay.cxx

üst 8ad7a9d0
...@@ -151,7 +151,7 @@ class SwImplProtocol ...@@ -151,7 +151,7 @@ class SwImplProtocol
{ {
SvFileStream *pStream; // Ausgabestream SvFileStream *pStream; // Ausgabestream
SvUShortsSort *pFrmIds; // welche FrmIds sollen aufgezeichnet werden ( NULL == alle ) SvUShortsSort *pFrmIds; // welche FrmIds sollen aufgezeichnet werden ( NULL == alle )
SvLongs *pVar; // Variables std::vector<long> aVars; // Variables
ByteString aLayer; // Einrueckung der Ausgabe (" " pro Start/End) ByteString aLayer; // Einrueckung der Ausgabe (" " pro Start/End)
USHORT nTypes; // welche Typen sollen aufgezeichnet werden USHORT nTypes; // welche Typen sollen aufgezeichnet werden
USHORT nLineCount; // Ausgegebene Zeilen USHORT nLineCount; // Ausgegebene Zeilen
...@@ -175,7 +175,7 @@ public: ...@@ -175,7 +175,7 @@ public:
void ChkStream() { if( !pStream ) NewStream(); } void ChkStream() { if( !pStream ) NewStream(); }
void SnapShot( const SwFrm* pFrm, ULONG nFlags ); void SnapShot( const SwFrm* pFrm, ULONG nFlags );
void GetVar( const USHORT nNo, long& rVar ) void GetVar( const USHORT nNo, long& rVar )
{ if( pVar && nNo < pVar->Count() ) rVar = (*pVar)[ nNo ]; } { if( nNo < aVars.size() ) rVar = aVars[ nNo ]; }
}; };
/* -------------------------------------------------- /* --------------------------------------------------
...@@ -301,7 +301,7 @@ void SwProtocol::GetVar( const USHORT nNo, long& rVar ) ...@@ -301,7 +301,7 @@ void SwProtocol::GetVar( const USHORT nNo, long& rVar )
} }
SwImplProtocol::SwImplProtocol() SwImplProtocol::SwImplProtocol()
: pStream( NULL ), pFrmIds( NULL ), pVar( NULL ), nTypes( 0xffff ), : pStream( NULL ), pFrmIds( NULL ), nTypes( 0xffff ),
nLineCount( 0 ), nMaxLines( USHRT_MAX ), nTestMode( 0 ) nLineCount( 0 ), nMaxLines( USHRT_MAX ), nTestMode( 0 )
{ {
NewStream(); NewStream();
...@@ -328,7 +328,7 @@ SwImplProtocol::~SwImplProtocol() ...@@ -328,7 +328,7 @@ SwImplProtocol::~SwImplProtocol()
delete pStream; delete pStream;
} }
delete pFrmIds; delete pFrmIds;
delete pVar; aVars.clear();
} }
/* -------------------------------------------------- /* --------------------------------------------------
...@@ -374,8 +374,6 @@ void SwImplProtocol::CheckLine( ByteString& rLine ) ...@@ -374,8 +374,6 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
else if( "[var" == aTmp )// variables else if( "[var" == aTmp )// variables
{ {
nInitFile = 6; nInitFile = 6;
if( !pVar )
pVar = new SvLongs( 5, 5 );
} }
else else
nInitFile = 0; // Nanu: Unbekannter Bereich? nInitFile = 0; // Nanu: Unbekannter Bereich?
...@@ -426,7 +424,7 @@ void SwImplProtocol::CheckLine( ByteString& rLine ) ...@@ -426,7 +424,7 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
break; break;
case 5: nMaxLines = (USHORT)nVal; case 5: nMaxLines = (USHORT)nVal;
break; break;
case 6: pVar->Insert( (long)nVal, pVar->Count() ); case 6: aVars.push_back( (long)nVal );
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment