Kaydet (Commit) 520130db authored tarafından Matteo Casalin's avatar Matteo Casalin Kaydeden (comit) Caolán McNamara

Remove unneeded member data

Change-Id: Ifc8cd48b9cfdd7d1fcd0ed9472b7080ba8ff6c6c
Reviewed-on: https://gerrit.libreoffice.org/5734Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 858592ad
...@@ -95,8 +95,7 @@ using namespace nsSwDocInfoSubType; ...@@ -95,8 +95,7 @@ using namespace nsSwDocInfoSubType;
class WW8ReadFieldParams class WW8ReadFieldParams
{ {
private: private:
OUString aData; const OUString aData;
sal_Int32 nLen;
sal_Int32 nFnd; sal_Int32 nFnd;
sal_Int32 nNext; sal_Int32 nNext;
sal_Int32 nSavPtr; sal_Int32 nSavPtr;
...@@ -117,7 +116,6 @@ public: ...@@ -117,7 +116,6 @@ public:
WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData ) WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData )
: aData( _rData ) : aData( _rData )
, nLen( _rData.getLength() )
, nFnd( 0 ) , nFnd( 0 )
, nNext( 0 ) , nNext( 0 )
, nSavPtr( 0 ) , nSavPtr( 0 )
...@@ -127,6 +125,8 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData ) ...@@ -127,6 +125,8 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData )
Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
(also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
*/ */
const sal_Int32 nLen = aData.getLength();
while ( nNext<nLen && aData[nNext]==' ' ) while ( nNext<nLen && aData[nNext]==' ' )
++nNext; ++nNext;
...@@ -168,7 +168,7 @@ sal_Int32 WW8ReadFieldParams::GoToTokenParam() ...@@ -168,7 +168,7 @@ sal_Int32 WW8ReadFieldParams::GoToTokenParam()
// ret: -2: NOT a '\' parameter but normal Text // ret: -2: NOT a '\' parameter but normal Text
sal_Int32 WW8ReadFieldParams::SkipToNextToken() sal_Int32 WW8ReadFieldParams::SkipToNextToken()
{ {
if ( nNext<0 || nNext>=nLen ) if ( nNext<0 || nNext>=aData.getLength() )
return -1; return -1;
nFnd = FindNextStringPiece(nNext); nFnd = FindNextStringPiece(nNext);
...@@ -177,7 +177,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() ...@@ -177,7 +177,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
nSavPtr = nNext; nSavPtr = nNext;
if ( aData[nFnd]=='\\' && nFnd+1<nLen && aData[nFnd+1]!='\\' ) if ( aData[nFnd]=='\\' && nFnd+1<aData.getLength() && aData[nFnd+1]!='\\' )
{ {
const sal_Int32 nRet = aData[++nFnd]; const sal_Int32 nRet = aData[++nFnd];
nNext = ++nFnd; // und dahinter setzen nNext = ++nFnd; // und dahinter setzen
...@@ -202,6 +202,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() ...@@ -202,6 +202,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
// //
sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart)
{ {
const sal_Int32 nLen = aData.getLength();
sal_Int32 n = nStart<0 ? nFnd : nStart; // Anfang sal_Int32 n = nStart<0 ? nFnd : nStart; // Anfang
sal_Int32 n2; // Ende sal_Int32 n2; // Ende
......
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