summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2011-11-17 15:11:21 -0500
committerKohei Yoshida <kohei.yoshida@suse.com>2011-11-18 14:13:22 -0500
commitd540bdccf5fd2b44732ebbfcb70cf1e11faa5b83 (patch)
tree24d8db65579bdaa760eb7f73750b80fbef2aa343 /sc/source/filter/xml
parentbbf435963eac44bc70c6a22605729b2d3f5417bf (diff)
Let's use std::vector instead.
Diffstat (limited to 'sc/source/filter/xml')
-rw-r--r--sc/source/filter/xml/xmlfilti.cxx21
-rw-r--r--sc/source/filter/xml/xmlfilti.hxx8
2 files changed, 15 insertions, 14 deletions
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 5338917c8d5e..90eb1f7434e7 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -176,27 +176,26 @@ void ScXMLFilterContext::SetCaseSensitive(bool b)
mrQueryParam.bCaseSens = b;
}
-void ScXMLFilterContext::SetUseRegularExpressions(bool bTemp)
+void ScXMLFilterContext::SetUseRegularExpressions(bool b)
{
if (!bUseRegularExpressions)
- bUseRegularExpressions = bTemp;
+ bUseRegularExpressions = b;
}
-void ScXMLFilterContext::OpenConnection(bool bTemp)
+void ScXMLFilterContext::OpenConnection(bool b)
{
- bool* pTemp = new bool;
- *pTemp = bConnectionOr;
+ bool bTemp = bConnectionOr;
bConnectionOr = bNextConnectionOr;
- bNextConnectionOr = bTemp;
- aConnectionOrStack.Push(pTemp);
+ bNextConnectionOr = b;
+ maOrConnectionStack.push_back(bTemp);
}
void ScXMLFilterContext::CloseConnection()
{
- bool* pTemp = static_cast <bool*> (aConnectionOrStack.Pop());
- bConnectionOr = *pTemp;
- bNextConnectionOr = *pTemp;
- delete pTemp;
+ bool bTemp = maOrConnectionStack.back();
+ maOrConnectionStack.pop_back();
+ bConnectionOr = bTemp;
+ bNextConnectionOr = bTemp;
}
bool ScXMLFilterContext::GetConnection()
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index 4a8bb3affaae..51c5e434d6de 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -41,6 +41,8 @@
#include "xmldrani.hxx"
#include "xmldpimp.hxx"
+#include <vector>
+
class ScXMLImport;
struct ScQueryParam;
@@ -60,7 +62,7 @@ class ScXMLFilterContext : public SvXMLImportContext
bool bConnectionOr;
bool bNextConnectionOr;
bool bConditionSourceRange;
- Stack aConnectionOrStack;
+ std::vector<bool> maOrConnectionStack;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -84,8 +86,8 @@ public:
virtual void EndElement();
void SetCaseSensitive(const bool b);
- void SetUseRegularExpressions(bool bTemp);
- void OpenConnection(bool bTemp);
+ void SetUseRegularExpressions(bool b);
+ void OpenConnection(bool b);
void CloseConnection();
bool GetConnection();
void AddFilterField(const com::sun::star::sheet::TableFilterField2& aFilterField);