Kaydet (Commit) f5b63844 authored tarafından Marcel Metz's avatar Marcel Metz Kaydeden (comit) Eike Rathke

Replace SmNodeStack with std::stack< SmNode* >

üst 6c6bc189
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <tools/stack.hxx>
#include <tools/string.hxx> #include <tools/string.hxx>
#include <set> #include <set>
...@@ -167,7 +166,7 @@ struct SmErrorDesc ...@@ -167,7 +166,7 @@ struct SmErrorDesc
}; };
DECLARE_STACK(SmNodeStack, SmNode *) typedef ::std::stack< SmNode* > SmNodeStack;
typedef ::std::vector< SmErrorDesc* > SmErrDescList; typedef ::std::vector< SmErrorDesc* > SmErrDescList;
/**************************************************************************/ /**************************************************************************/
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
#include <tools/wldcrd.hxx> #include <tools/wldcrd.hxx>
#include <parse.hxx> #include <parse.hxx>
#include <tools/stack.hxx>
#include <types.hxx> #include <types.hxx>
#include <config.hxx> #include <config.hxx>
#include <svtools/confitem.hxx> #include <svtools/confitem.hxx>
......
...@@ -252,7 +252,13 @@ public: ...@@ -252,7 +252,13 @@ public:
const SvXMLTokenMap &GetColorTokenMap(); const SvXMLTokenMap &GetColorTokenMap();
SmNodeStack & GetNodeStack() { return aNodeStack; } SmNodeStack & GetNodeStack() { return aNodeStack; }
SmNode *GetTree() { return aNodeStack.Pop(); } SmNode *GetTree()
{
SmNode* result = aNodeStack.top();
aNodeStack.pop();
return result;
}
sal_Bool GetSuccess() { return bSuccess; } sal_Bool GetSuccess() { return bSuccess; }
String &GetText() { return aText; } String &GetText() { return aText; }
......
This diff is collapsed.
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