stop duplicate definition of lcl_popOrZero()

This renames it to popOrZero() in node.hxx. Also one more call site
found in mathmlimport.hxx.

Change-Id: I3f0281315146347280d0836ceadcfdf9c80fa166
Reviewed-on: https://gerrit.libreoffice.org/12310
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index f7326e75961a..4bcf594c7827 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -245,11 +245,7 @@ public:
     SmNodeStack & GetNodeStack()    { return aNodeStack; }
     SmNode *GetTree()
     {
-        if (aNodeStack.empty())
-            return 0;
-        SmNode* result = aNodeStack.top();
-        aNodeStack.pop();
-        return result;
+        return popOrZero(aNodeStack);
     }
 
     bool GetSuccess()              { return bSuccess; }