Remove the "using namespace std" from filter

Change-Id: Ied355374a0bf662a9be70d83615446cbac9ee0b2
Reviewed-on: https://gerrit.libreoffice.org/26373
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 27 insertions, 34 deletions

diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 3bdceb8d253b..a79a7ed67eae 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::task;
-using namespace ::std;
 using namespace ::swf;
 
 using com::sun::star::io::XOutputStream;
@@ -63,8 +62,8 @@ PageInfo::PageInfo()
 
 PageInfo::~PageInfo()
 {
-    vector<ShapeInfo*>::iterator aIter( maShapesVector.begin() );
-    const vector<ShapeInfo*>::iterator aEnd( maShapesVector.end() );
+    std::vector<ShapeInfo*>::iterator aIter( maShapesVector.begin() );
+    const std::vector<ShapeInfo*>::iterator aEnd( maShapesVector.end() );
     while( aIter != aEnd )
     {
         delete (*aIter++);
@@ -505,7 +504,7 @@ void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStr
 {
     OSL_ENSURE( (xShapes->getCount() <= 0xffff), "overflow in FlashExporter::exportDrawPageContents()" );
 
-    sal_uInt16 nShapeCount = (sal_uInt16)min( xShapes->getCount(), (sal_Int32)0xffff );
+    sal_uInt16 nShapeCount = (sal_uInt16)std::min( xShapes->getCount(), (sal_Int32)0xffff );
     sal_uInt16 nShape;
 
     Reference< XShape > xShape;
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index b91c0f363c86..22841bf1787a 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -23,7 +23,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 using namespace ::swf;
-using namespace ::std;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
@@ -110,7 +109,7 @@ void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream >
     sal_uInt32 nSize = rIn.Tell();
     rIn.Seek( STREAM_SEEK_TO_BEGIN );
 
-    Sequence< sal_Int8 > aBuffer( min( nBufferSize, nSize ) );
+    Sequence< sal_Int8 > aBuffer( std::min( nBufferSize, nSize ) );
 
     while( nSize )
     {
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 4bc5557e4156..5d1d057c762e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -39,7 +39,6 @@
 #include <memory>
 
 using namespace ::swf;
-using namespace ::std;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -175,7 +174,7 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1
     rBits.writeUB( bFilled ? 1 : 0, 1 );        // StateFillStyle1
     rBits.writeUB( 1, 1 );          // StateMoveTo
 
-    sal_uInt16 nMoveBits = max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
+    sal_uInt16 nMoveBits = std::max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
 
     rBits.writeUB( nMoveBits, 5 );  // Number of bits per value
                                     // TODO: Optimize horizontal and vertical lines
@@ -193,7 +192,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int
     rBits.writeUB( 1, 1 );          // TypeFlag
     rBits.writeUB( 1, 1 );          // StraightFlag
 
-    sal_uInt16 nBits = max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
+    sal_uInt16 nBits = std::max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
 
     rBits.writeUB( nBits - 2, 4 );  // Number of bits per value
 
@@ -227,10 +226,10 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s
     rBits.writeUB( 0, 1 );          // CurvedFlag
 
     sal_uInt8 nBits = static_cast<sal_uInt8>(
-        max( getMaxBitsSigned( control_dx ),
-            max( getMaxBitsSigned( control_dy ),
-                max( getMaxBitsSigned( anchor_dx ),
-                    max( getMaxBitsSigned( anchor_dy ), (sal_uInt16)3 ) ) ) ) );
+        std::max( getMaxBitsSigned( control_dx ),
+            std::max( getMaxBitsSigned( control_dy ),
+                std::max( getMaxBitsSigned( anchor_dx ),
+                    std::max( getMaxBitsSigned( anchor_dy ), (sal_uInt16)3 ) ) ) ) );
 
     rBits.writeUB( nBits - 2, 4 );  // Number of bits per value
 
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 2b2e8c1d39e0..ca6dc1e318be 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -24,7 +24,6 @@
 #include <math.h>
 
 using namespace ::swf;
-using namespace ::std;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
@@ -109,8 +108,8 @@ void BitStream::writeTo( SvStream& out )
 {
     pad();
 
-    vector< sal_uInt8 >::iterator aIter( maData.begin() );
-    const vector< sal_uInt8>::iterator aEnd( maData.end() );
+    std::vector< sal_uInt8 >::iterator aIter( maData.begin() );
+    const std::vector< sal_uInt8>::iterator aEnd( maData.end() );
     while(aIter != aEnd)
     {
         out.WriteUChar( *aIter++ );
@@ -262,9 +261,9 @@ void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
     // AS: Christian, can they be negative, or is that a wasted check?
     // CL: I think so, f.e. for shapes that have the top and/or left edge outside
     //         the page origin
-    sal_uInt8 nBits1 = sal::static_int_cast<sal_uInt8>( max( getMaxBitsSigned( minX ), getMaxBitsSigned( minY ) ) );
-    sal_uInt8 nBits2 = sal::static_int_cast<sal_uInt8>( max( getMaxBitsSigned( maxX ), getMaxBitsSigned( maxY ) ) );
-    sal_uInt8 nBitsMax = max( nBits1, nBits2 );
+    sal_uInt8 nBits1 = sal::static_int_cast<sal_uInt8>( std::max( getMaxBitsSigned( minX ), getMaxBitsSigned( minY ) ) );
+    sal_uInt8 nBits2 = sal::static_int_cast<sal_uInt8>( std::max( getMaxBitsSigned( maxX ), getMaxBitsSigned( maxY ) ) );
+    sal_uInt8 nBitsMax = std::max( nBits1, nBits2 );
 
     aBits.writeUB( nBitsMax, 5 );
     aBits.writeSB( minX, nBitsMax );
@@ -337,7 +336,7 @@ Sprite::Sprite( sal_uInt16 nId )
 
 Sprite::~Sprite()
 {
-    for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
+    for(std::vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
         delete *i;
 }
 
@@ -345,7 +344,7 @@ Sprite::~Sprite()
 void Sprite::write( SvStream& out )
 {
     SvMemoryStream aTmp;
-    for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
+    for(std::vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
         (*i)->write( aTmp );
 
     if( !mnFrames )
@@ -465,7 +464,7 @@ void FlashFont::write( SvStream& out )
     sal_uInt16 nGlyphs = uInt16_( maGlyphOffsets.size() );
     sal_uInt16 nOffset = nGlyphs * sizeof( sal_uInt16 );
 
-    for(vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); ++i)
+    for(std::vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); ++i)
         aTag.addUI16( nOffset + (*i) );
 
     aTag.addBits( maGlyphData );
@@ -551,7 +550,7 @@ struct GradRecord
 // TODO: better emulation of our gradients
 void FillStyle::Impl_addGradient( Tag* pTag ) const
 {
-    vector< struct GradRecord > aGradientRecords;
+    std::vector< struct GradRecord > aGradientRecords;
     basegfx::B2DHomMatrix m(basegfx::tools::createRotateB2DHomMatrix((maGradient.GetAngle() - 900) * F_PI1800));
 
     switch( maGradient.GetStyle() )
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index fd6e84ea7877..dc259fd7fe57 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::text;
-using namespace ::std;
 
 using com::sun::star::beans::PropertyValue;
 using com::sun::star::beans::XPropertySet;
@@ -179,7 +178,7 @@ static OString convertString( const OUString& aInput )
     return aRet;
 }
 
-static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries  ) throw( css::uno::Exception, std::exception )
+static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, std::vector< PageEntry* >& rPageEntries  ) throw( css::uno::Exception, std::exception )
 {
     OString aInfo;
 
@@ -224,8 +223,8 @@ static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFi
         aInfo += aNewLine;
     }
 
-    vector< PageEntry* >::iterator aIter( rPageEntries.begin() );
-    vector< PageEntry* >::iterator aEnd( rPageEntries.end() );
+    std::vector< PageEntry* >::iterator aIter( rPageEntries.begin() );
+    std::vector< PageEntry* >::iterator aEnd( rPageEntries.end() );
     while( aIter != aEnd )
     {
         PageEntry* pEntry = (*aIter++);
@@ -319,7 +318,7 @@ bool PlaceWareExporter::doExport( const Reference< XComponent >& xDoc, Reference
     if( osl::File::E_None != nRC )
         return false;
 
-    vector< PageEntry* > aPageEntries;
+    std::vector< PageEntry* > aPageEntries;
 
     // Create new package...
     try
@@ -357,8 +356,8 @@ bool PlaceWareExporter::doExport( const Reference< XComponent >& xDoc, Reference
         createSlideFile( xDoc, aZipFile, rURL, aPageEntries );
 
         // add gifs to zip
-        vector< PageEntry* >::iterator aIter( aPageEntries.begin() );
-        vector< PageEntry* >::iterator aEnd( aPageEntries.end() );
+        std::vector< PageEntry* >::iterator aIter( aPageEntries.begin() );
+        std::vector< PageEntry* >::iterator aEnd( aPageEntries.end() );
         while( aIter != aEnd )
         {
             PageEntry* pEntry = (*aIter++);
@@ -384,8 +383,8 @@ bool PlaceWareExporter::doExport( const Reference< XComponent >& xDoc, Reference
     {
     }
 
-    vector< PageEntry* >::iterator aIter( aPageEntries.begin() );
-    vector< PageEntry* >::iterator aEnd( aPageEntries.end() );
+    std::vector< PageEntry* >::iterator aIter( aPageEntries.begin() );
+    std::vector< PageEntry* >::iterator aEnd( aPageEntries.end() );
     while( aIter != aEnd )
     {
         delete (*aIter++);
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index dab095db6d06..f99e79ec4bda 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -77,8 +77,6 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-using namespace ::std;
-
 #define SVG_EXPORT_ALLPAGES ((sal_Int32)-1)