9 files changed, 7 insertions, 16 deletions
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 8da804fdafba..fee665930b24 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -71,7 +71,6 @@
 #include <xmloff/animationexport.hxx>
 
 using namespace css;
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::presentation;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 3205f0f0da96..519c3288cdce 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -70,7 +70,6 @@
 #include <animations.hxx>
 #include <animationimport.hxx>
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 28963f4cb6be..ed280f1e1060 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -37,7 +37,6 @@
 #include <anim.hxx>
 
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -231,7 +230,7 @@ struct XMLEffectHint
 class AnimExpImpl
 {
 public:
-    list<XMLEffectHint> maEffects;
+    std::list<XMLEffectHint> maEffects;
 
     static constexpr OUStringLiteral gsDimColor = u"DimColor";
     static constexpr OUStringLiteral gsDimHide = u"DimHide";
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index f1ef4782c3ae..90f5a5a609d4 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -41,7 +41,6 @@
 #include <anim.hxx>
 #include <animimp.hxx>
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 738f47dd2bf0..c0187f905596 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -24,7 +24,6 @@
 
 #include "descriptionimp.hxx"
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 29fc94fda272..2b8921ee27fa 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -35,7 +35,6 @@
 #include <xmloff/namespacemap.hxx>
 #include "eventimp.hxx"
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index e8979e7a2291..990e46128a7c 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -35,7 +35,6 @@
 
 #include <XMLStringBufferImportContext.hxx>
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index a89b1ca840f3..45c1d22fcabb 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -54,7 +54,6 @@ class ShapeGroupContext;
 
 }
 
-using namespace ::std;
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
@@ -528,8 +527,8 @@ class ShapeGroupContext
 public:
     uno::Reference< drawing::XShapes > mxShapes;
     std::vector<SdXMLEventContextData> maEventData;
-    vector<ZOrderHint>              maZOrderList;
-    vector<ZOrderHint>              maUnsortedList;
+    std::vector<ZOrderHint>              maZOrderList;
+    std::vector<ZOrderHint>              maUnsortedList;
 
     sal_Int32                       mnCurrentZ;
     std::shared_ptr<ShapeGroupContext> mpParentContext;
@@ -647,7 +646,7 @@ void ShapeGroupContext::popGroupAndPostProcess()
         for (const ZOrderHint& rHint : maZOrderList)
         {
             // fill in the gaps from unordered list
-            for (vector<ZOrderHint>::iterator aIt = maUnsortedList.begin(); aIt != maUnsortedList.end() && nIndex < rHint.nShould; )
+            for (std::vector<ZOrderHint>::iterator aIt = maUnsortedList.begin(); aIt != maUnsortedList.end() && nIndex < rHint.nShould; )
             {
                 pNewOrder[nIndex++] = (*aIt).nIs;
                 aIt = maUnsortedList.erase(aIt);
@@ -672,7 +671,7 @@ void ShapeGroupContext::popGroupAndPostProcess()
     sal_Int32 nIndex = 0;
     for (const ZOrderHint& rHint : maZOrderList)
     {
-        for (vector<ZOrderHint>::iterator aIt = maUnsortedList.begin(); aIt != maUnsortedList.end() && nIndex < rHint.nShould; )
+        for (std::vector<ZOrderHint>::iterator aIt = maUnsortedList.begin(); aIt != maUnsortedList.end() && nIndex < rHint.nShould; )
         {
             moveShape( (*aIt).nIs, nIndex++ );
             aIt = maUnsortedList.erase(aIt);
@@ -793,8 +792,8 @@ void XMLShapeImportHelper::addShapeConnection( css::uno::Reference< css::drawing
 
 void XMLShapeImportHelper::restoreConnections()
 {
-    const vector<ConnectionHint>::size_type nCount = mpImpl->maConnections.size();
-    for( vector<ConnectionHint>::size_type i = 0; i < nCount; i++ )
+    const std::vector<ConnectionHint>::size_type nCount = mpImpl->maConnections.size();
+    for( std::vector<ConnectionHint>::size_type i = 0; i < nCount; i++ )
     {
         ConnectionHint& rHint = mpImpl->maConnections[i];
         uno::Reference< beans::XPropertySet > xConnector( rHint.mxConnector, uno::UNO_QUERY );
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index f89d4d9fb71a..117511f77c64 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -31,7 +31,6 @@
 #include <xmloff/xmluconv.hxx>
 #include "ximpshow.hxx"
 
-using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;