summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-05-19 02:19:41 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-05-19 20:04:24 +0200
commitade92713c32cf36cfb516f76824eef6c3d124321 (patch)
treecef9c634f2590fd8a427d89b7e59d8b8744bc304 /lotuswordpro
parentb54e050169d22bb814a4815404021665e1fcf93b (diff)
lwp: remove using namespace std from headers
Change-Id: Ied5806a1706473ac0fe4e1baebb71256cf56681d
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/source/filter/bento.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpsdwfileloader.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpsdwfileloader.hxx3
-rw-r--r--lotuswordpro/source/filter/lwptblformula.cxx6
-rw-r--r--lotuswordpro/source/filter/lwptblformula.hxx6
5 files changed, 8 insertions, 13 deletions
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 842f773ceea9..1940e16d7a10 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -67,8 +67,6 @@
#define BEN_EXPORT
#endif
-using namespace std;
-
#include "ut.hxx"
#include "utlist.hxx"
#include <tools/stream.hxx>
@@ -416,7 +414,7 @@ public: // Internal methods
pCBenNamedObjectListElmt GetNameListElmt() { return &cNameListElmt; }
private: // Data
- string csName;
+ std::string csName;
CBenNamedObjectListElmt cNameListElmt;
BenContainerPos cPos;
};
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index dd828f064a52..e34ec7967468 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -78,7 +78,7 @@ LwpSdwFileLoader::~LwpSdwFileLoader(void)
* @descr entry of lwp-drawing objects.
* @param pDrawObjVector a container which will contains the created drawing object of XF-Model.
*/
-void LwpSdwFileLoader::CreateDrawObjects(vector <XFFrame*>* pDrawObjVector)
+void LwpSdwFileLoader::CreateDrawObjects(std::vector <XFFrame*>* pDrawObjVector)
{
unsigned char BinSignature[2];
m_pStream->Read(BinSignature,2);
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
index a90ccc0d59f3..41369f6c6af8 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
@@ -63,7 +63,6 @@
#include "lwpheader.hxx"
#include "xfilter/ixfstream.hxx"
#include <vector>
-using namespace std;
class XFFrame;
class LwpGraphicObject;
@@ -80,7 +79,7 @@ public:
// void RegisterStyle(void);
// add by ,03/25/2005
- void CreateDrawObjects(vector <XFFrame*>* pDrawObjVector);
+ void CreateDrawObjects(std::vector <XFFrame*>* pDrawObjVector);
// end add
};
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index ae55778833dd..dfe0cb410b39 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -597,7 +597,7 @@ OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
aFormula += " ";//Append a blank space
//Append args
- vector<LwpFormulaArg*>::iterator aItr;
+ std::vector<LwpFormulaArg*>::iterator aItr;
for (aItr=m_aArgs.begin();aItr!=m_aArgs.end();++aItr)
{
aFormula += (*aItr)->ToArgString(pCellsMap) + "|"; //separator
@@ -628,7 +628,7 @@ OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
OUString aFormula;
if (2==m_aArgs.size())
{
- vector<LwpFormulaArg*>::iterator aItr = m_aArgs.end();
+ std::vector<LwpFormulaArg*>::iterator aItr = m_aArgs.end();
--aItr;
aFormula += (*aItr)->ToArgString(pCellsMap) + " ";
@@ -661,7 +661,7 @@ OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap)
OUString aFuncName = LwpFormulaTools::GetName(m_nTokenType);
aFormula += aFuncName;
- vector<LwpFormulaArg*>::iterator aItr = m_aArgs.begin();
+ std::vector<LwpFormulaArg*>::iterator aItr = m_aArgs.begin();
aFormula += (*aItr)->ToArgString(pCellsMap);
}
else
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index de39862915ef..d5610384442d 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -64,8 +64,6 @@
#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
-using namespace std;
-
/* These token types are written to the file. Don't change their
values unless you filter them.
*/
@@ -178,7 +176,7 @@ public:
OUString ToArgString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
protected:
- vector<LwpFormulaArg*> m_aArgs;
+ std::vector<LwpFormulaArg*> m_aArgs;
sal_uInt16 m_nTokenType;
};
@@ -214,7 +212,7 @@ protected:
bool ReadArguments(LwpFormulaFunc& aFunc);
bool m_bSupported;
private:
- vector<LwpFormulaArg*> m_aStack;
+ std::vector<LwpFormulaArg*> m_aStack;
bool ReadConst();
void MarkUnsupported(sal_uInt16 TokenType);