cleanup the Read*() methods in SvIdlParser

to be consistent about when they move to the next token

Change-Id: I8f5b1eab497fb4a7cb2a2267e815668c3d363de7

1 files changed, 30 insertions, 20 deletions

diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index f513e9ec68fb..7a715206211e 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -181,28 +181,38 @@ public:
     SvToken& GetToken() const { return *(*pCurToken).get(); }
 
     bool     ReadIf( char cChar )
-                    {
-                        if( (*pCurToken)->IsChar()
-                          && cChar == (*pCurToken)->GetChar() )
-                        {
-                            GetToken_Next();
-                            return true;
-                        }
-                        else
-                            return false;
-                    }
+    {
+        if( GetToken().IsChar() && cChar == GetToken().GetChar() )
+        {
+            GetToken_Next();
+            return true;
+        }
+        else
+            return false;
+    }
+
+    bool     ReadIf( SvStringHashEntry* pEntry )
+    {
+        if( GetToken().Is( pEntry ) )
+        {
+            GetToken_Next();
+            return true;
+        }
+        else
+            return false;
+    }
 
     bool     ReadIfDelimiter()
-                    {
-                        if( (*pCurToken)->IsChar()
-                          && (';' == (*pCurToken)->GetChar()
-                                || ',' == (*pCurToken)->GetChar()) )
-                        {
-                            GetToken_Next();
-                            return true;
-                        }
-                        return false;
-                    }
+    {
+        if( GetToken().IsChar()
+            && (';' == GetToken().GetChar()
+                 || ',' == GetToken().GetChar()) )
+        {
+            GetToken_Next();
+            return true;
+        }
+        return false;
+    }
 
     sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); }