diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-06 12:44:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:32:11 +0000 |
| commit | b2878af3223c438abeecc77d9976e56db31a5b49 (patch) | |
| tree | 74ccf2cfdbec9093671eb98cb58dfe57f27461f1 /sd | |
| parent | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (diff) | |
more SvStream:operator>> conversion
Convert the template based read_lenPrefixed methods to regular
methods.
Change-Id: Ifd0e93aca055e55a0575e4377ec2b8e266dfb019
Reviewed-on: https://gerrit.libreoffice.org/7895
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 37ce783a90fa..fdb812e92b9d 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -247,24 +247,24 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aDesignName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn.ReadUInt16( nTemp16 ); rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn.ReadUChar( rDesign.m_bContentPage ); rIn.ReadUChar( rDesign.m_bNotes ); rIn.ReadUInt16( rDesign.m_nResolution ); - rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aCompression = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn.ReadUInt16( nTemp16 ); rDesign.m_eFormat = (PublishingFormat)nTemp16; - rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aAuthor = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aEMail = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aWWW = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aMisc = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn.ReadUChar( rDesign.m_bDownload ); rIn.ReadUChar( rDesign.m_bCreated ); // not used @@ -280,9 +280,9 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn.ReadUInt16( nTemp16 ); rDesign.m_eScript = (PublishingScript)nTemp16; - rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aURL = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, + rDesign.m_aCGI = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn.ReadUChar( rDesign.m_bAutoSlide ); |