summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-21 13:33:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-21 13:44:52 +0000
commitc1d49234e5e8e7faa84f4d118500a138decfb04e (patch)
tree9a320b5f4e1bbe62b83326ee075674764393e979 /sd
parent5c24789ca33d7b2b0c39626208cf0708fb470d95 (diff)
tweak for pre language-defect #77
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/html/pubdlg.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 55714612b2df..0e4129845e29 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -267,24 +267,24 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
sal_uInt16 nTemp16;
- rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
rIn >> nTemp16;
rDesign.m_eMode = (HtmlPublishMode)nTemp16;
rIn >> rDesign.m_bContentPage;
rIn >> rDesign.m_bNotes;
rIn >> rDesign.m_nResolution;
- rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
rIn >> nTemp16;
rDesign.m_eFormat = (PublishingFormat)nTemp16;
- rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
- rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
- rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
- rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
rIn >> rDesign.m_bDownload;
rIn >> rDesign.m_bCreated; // not used
@@ -300,9 +300,9 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
rIn >> nTemp16;
rDesign.m_eScript = (PublishingScript)nTemp16;
- rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
- rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn,
+ rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
RTL_TEXTENCODING_UTF8);
rIn >> rDesign.m_bAutoSlide;
@@ -323,23 +323,23 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
SdIOCompat aIO(rOut, STREAM_WRITE, 0);
// Name
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aDesignName,
RTL_TEXTENCODING_UTF8);
rOut << (sal_uInt16)rDesign.m_eMode;
rOut << rDesign.m_bContentPage;
rOut << rDesign.m_bNotes;
rOut << rDesign.m_nResolution;
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression,
RTL_TEXTENCODING_UTF8);
rOut << (sal_uInt16)rDesign.m_eFormat;
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aWWW,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc,
RTL_TEXTENCODING_UTF8);
rOut << rDesign.m_bDownload;
rOut << rDesign.m_bCreated; // not used
@@ -354,9 +354,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
rOut << rDesign.m_bUseColor;
rOut << (sal_uInt16)rDesign.m_eScript;
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL,
RTL_TEXTENCODING_UTF8);
- write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI,
RTL_TEXTENCODING_UTF8);
rOut << rDesign.m_bAutoSlide;