sw, writerfilter: these 'using namespace' statements can be avoided easily

Especially the 'using namespace std' is scary, now that we have
std::shared_ptr and boost::shared_ptr, too.

Change-Id: Ibb584281f1b9d56103ab5984473eb484157c12d5

5 files changed, 5 insertions, 12 deletions

diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx
index baffe64bf34c..4f985610ee66 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -23,8 +23,6 @@
 #include <dmapper/ConversionHelper.hxx>
 #include <dmapper/DomainMapper_Impl.hxx>
 
-using namespace std;
-
 namespace {
 
 class WriterfilterMiscTest
@@ -74,7 +72,7 @@ void WriterfilterMiscTest::testTwipConversions()
 void WriterfilterMiscTest::testFieldParameters()
 {
     using writerfilter::dmapper::lcl_SplitFieldCommand;
-    boost::tuple<OUString, vector<OUString>, vector<OUString> > result;
+    boost::tuple<OUString, std::vector<OUString>, std::vector<OUString> > result;
 
     result = lcl_SplitFieldCommand("PAGEREF last_page");
     CPPUNIT_ASSERT_EQUAL(OUString("PAGEREF"), boost::get<0>(result));
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index f0bf7b282785..7287bbf04e82 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -32,7 +32,6 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 
 #include <iostream>
-using namespace std;
 
 namespace writerfilter {
 namespace dmapper {
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 7f4f0cba3eef..7d31cd217b1b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -69,7 +69,6 @@ namespace writerfilter {
 
 namespace dmapper
 {
-using namespace std;
 using namespace css;
 
 class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
@@ -1431,7 +1430,7 @@ void GraphicImport::lcl_substream(Id /*name*/, ::writerfilter::Reference<Stream>
 }
 
 
-void GraphicImport::lcl_info(const string & /*info*/)
+void GraphicImport::lcl_info(const std::string& /*info*/)
 {
 }
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 90971f61dc2a..23484c767533 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -23,8 +23,6 @@ namespace writerfilter {
 namespace dmapper
 {
 
-using namespace std;
-using namespace oox;
 using namespace com::sun::star;
 
 namespace
@@ -487,7 +485,7 @@ TextEffectsHandler::TextEffectsHandler(sal_uInt32 aElementId) :
     mpGrabBagStack(nullptr)
 {
     convertElementIdToPropertyId(aElementId);
-    mpGrabBagStack.reset(new GrabBagStack(maElementName));
+    mpGrabBagStack.reset(new oox::GrabBagStack(maElementName));
 }
 
 TextEffectsHandler::~TextEffectsHandler()
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index 6d9fbf33b760..9145b3de9509 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -27,11 +27,10 @@ namespace writerfilter
 namespace dmapper
 {
 using namespace com::sun::star;
-using namespace std;
 
-string XTextRangeToString(uno::Reference< text::XTextRange > textRange)
+std::string XTextRangeToString(uno::Reference< text::XTextRange > textRange)
 {
-    string result;
+    std::string result;
 
     (void) textRange;
 #ifdef DEBUG_WRITERFILTER