summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-05-19 04:51:06 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-05-19 20:04:26 +0200
commitacde3e430edfe118d3aa2bc9ebc1593877b98f4a (patch)
treeb12280306737fd6b8a0c466bcb36bc255e161686
parent224172996aeb1ef7ba078a1da63ba4f1923ebbc3 (diff)
sd: remove using namespace from headers
Change-Id: I918733eb5f78b40ae990975035d11e396274c5cc
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx5
2 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index f359b8a2618b..72f6e7d9e17e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -400,7 +400,7 @@ void SdPageObjsTLB::InitEntry(SvTreeListEntry* pEntry,
pEntry->ReplaceItem( pStr, nColToHilite );
}
-void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem)
+void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem)
{
if (pEntry)
{
@@ -800,7 +800,7 @@ void SdPageObjsTLB::AddShapeList (
bIsExcluded ? rIconProvider.maImgPageObjsExcl : rIconProvider.maImgPageObjs);
if (mbSaveTreeItemState)
{
- vector<OUString>::iterator iteStart = maTreeItem.begin();
+ std::vector<OUString>::iterator iteStart = maTreeItem.begin();
while (iteStart != maTreeItem.end())
{
OUString strEntry = GetEntryText(pEntry);
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 08debfa1ef97..dad48ca76f70 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -30,7 +30,6 @@
#include <tools/ref.hxx>
#include "sdxfer.hxx"
#include <vector>
-using namespace std;
#include <boost/scoped_ptr.hpp>
#include <boost/function.hpp>
@@ -134,7 +133,7 @@ protected:
::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
- vector<OUString> maTreeItem;
+ std::vector<OUString> maTreeItem;
bool mbSaveTreeItemState;
OUString maSelectionEntryText;
@@ -215,7 +214,7 @@ public:
void Clear();
void SetSaveTreeItemStateFlag(bool bState){mbSaveTreeItemState = bState;}
- void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem);
+ void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem);
/** return selected entries
nDepth == 0 -> pages