remove SvStream::operator<< methods

.. and convert the last few places still using those methods.

Change-Id: Id2cd8f9c0dd281df43af439d4fef65881f34a6fd
Reviewed-on: https://gerrit.libreoffice.org/7495
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

7 files changed, 30 insertions, 30 deletions

diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9f702bd4cb5c..22688ea7f115 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -825,7 +825,7 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
 {
     WriteRecordHeader(0,W_META_TEXTOUT);
 
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(*pWMF, rString);
+    write_uInt16_lenPrefixed_uInt8s_FromOString(*pWMF, rString);
     sal_Int32 nLen = rString.getLength();
     if ((nLen&1)!=0) pWMF->WriteUChar( (sal_uInt8)0 );
     WritePointYX(rPoint);
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 0b128d853740..2c1d817519d2 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -730,7 +730,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
             rOStm.WriteUInt32( nDummy32 ); // Unused
             rOStm.WriteUInt32( nDummy32 ); // Unused
             rOStm.WriteUInt32( nDummy32 ); // Unused
-            write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy
+            write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, OString()); // dummy
             rOStm.WriteUInt16( nRest ); // Count of remaining structures
         }
     }
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 8b6d597234b3..bad3016c6c19 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -2395,7 +2395,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, pA->GetComment());
+                write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment());
                 rOStm.WriteInt32( pA->GetValue() ).WriteUInt32( nDataSize );
 
                 if( nDataSize )
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 9184dc6199a7..b0204af4cc39 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -354,23 +354,23 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
             ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
             for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
             {
-                write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8);
-                write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->second, RTL_TEXTENCODING_UTF8);
+                write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8);
+                write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8);
             }
-            write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "COMPAT_DUPLEX_MODE");
+            write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE");
             switch( pJobData->meDuplexMode )
             {
                 case DUPLEX_UNKNOWN:
-                    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_UNKNOWN");
+                    write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN");
                     break;
                 case DUPLEX_OFF:
-                    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_OFF");
+                    write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF");
                     break;
                 case DUPLEX_SHORTEDGE:
-                    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_SHORTEDGE");
+                    write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE");
                     break;
                 case DUPLEX_LONGEDGE:
-                    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_LONGEDGE");
+                    write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE");
                     break;
             }
             nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos);
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 3414abe46f32..3151ac28dbed 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1254,7 +1254,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteInt32(mnIndex);
     rOStm.WriteInt32(mnLen);
 
-    write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+    write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
 // ------------------------------------------------------------------------
@@ -1395,7 +1395,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     for (sal_Int32 i = 0; i < nAryLen; ++i)
         rOStm.WriteInt32( mpDXAry[ i ] );
 
-    write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+    write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
 // ------------------------------------------------------------------------
@@ -1529,7 +1529,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteInt32( mnIndex );
     rOStm.WriteInt32( mnLen );
 
-    write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+    write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
 // ------------------------------------------------------------------------
@@ -1610,7 +1610,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt16( mnStyle );
 
-    write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
+    write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
 // ------------------------------------------------------------------------
@@ -4186,7 +4186,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
 void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, maComment);
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, maComment);
     rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize );
 
     if ( mnDataSize )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 375be676d44a..c423e0cd02e7 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -253,10 +253,10 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
 {
     VersionCompat aCompat( rOStream, STREAM_WRITE, 1 );
 
-    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8);
-    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
-    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
-    write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8);
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
     rOStream.WriteUInt32( rInfo.mnStatus );
     rOStream.WriteUInt32( rInfo.mnJobs );
 
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c38f2718a442..a3758f4b0dd1 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -163,7 +163,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
         if ( aCacheFile.IsWritable() )
         {
             sal_uInt32 nCacheMagic = ImplFontAttrCache::MAGIC;
-            aCacheFile << nCacheMagic;
+            aCacheFile.WriteUInt32( nCacheMagic );
 
             // write the cache entries to the file
             FontAttrMap::const_iterator aIter = aFontAttributes.begin();
@@ -171,22 +171,22 @@ ImplFontAttrCache::~ImplFontAttrCache()
             {
                 const OUString rFontFileURL( (*aIter).first );
                 const ImplDevFontAttributes& rDFA( (*aIter).second );
-                write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
-                write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
+                write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
+                write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
 
-                aCacheFile << static_cast<short>(rDFA.GetWeight());
-                aCacheFile << static_cast<short>(rDFA.GetSlant());
-                aCacheFile << static_cast<short>(rDFA.GetPitch());
-                aCacheFile << static_cast<short>(rDFA.GetWidthType());
-                aCacheFile << static_cast<short>(rDFA.GetFamilyType());
-                aCacheFile << static_cast<short>(rDFA.IsSymbolFont() != false);
+                aCacheFile.WriteInt16(rDFA.GetWeight());
+                aCacheFile.WriteInt16(rDFA.GetSlant());
+                aCacheFile.WriteInt16(rDFA.GetPitch());
+                aCacheFile.WriteInt16(rDFA.GetWidthType());
+                aCacheFile.WriteInt16(rDFA.GetFamilyType());
+                aCacheFile.WriteInt16(rDFA.IsSymbolFont() != false);
 
-                write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
+                write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
 
                 ++aIter;
             }
             // EOF Marker
-            write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(aCacheFile, OString());
+            write_uInt16_lenPrefixed_uInt8s_FromOString(aCacheFile, OString());
         }
     }
 }