summaryrefslogtreecommitdiff
path: root/svx/source/items/hlnkitem.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-21 10:29:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-21 10:29:33 +0000
commitfffae28952f20fed693df4de8b8645cf0aedabfa (patch)
tree401f5ce0e113adc69199f43b79ff542f012d1d3c /svx/source/items/hlnkitem.cxx
parent6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff)
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'svx/source/items/hlnkitem.cxx')
-rw-r--r--svx/source/items/hlnkitem.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 1f6dfa83a794..11a26aa04d49 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -49,13 +49,13 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
{
// store 'simple' data
// UNICODE: rStrm << sName;
- rStrm.WriteUniOrByteString(sName, rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(sName);
// UNICODE: rStrm << sURL;
- rStrm.WriteUniOrByteString(sURL, rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(sURL);
// UNICODE: rStrm << sTarget;
- rStrm.WriteUniOrByteString(sTarget, rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(sTarget);
rStrm << (sal_uInt32) eType;
@@ -64,7 +64,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
// new data
// UNICODE: rStrm << sIntName;
- rStrm.WriteUniOrByteString(sIntName, rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(sIntName);
// macro-events
rStrm << nMacroEvents;
@@ -91,10 +91,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
rStrm << (sal_uInt16)pMacroTable->GetCurKey();
// UNICODE: rStrm << pMac->GetLibName();
- rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(pMac->GetLibName());
// UNICODE: rStrm << pMac->GetMacName();
- rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(pMac->GetMacName());
}
}
}
@@ -111,10 +111,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
rStrm << (sal_uInt16)pMacroTable->GetCurKey();
// UNICODE: rStrm << pMac->GetLibName();
- rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(pMac->GetLibName());
// UNICODE: rStrm << pMac->GetMacName();
- rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet());
+ rStrm.WriteByteString(pMac->GetMacName());
rStrm << (sal_uInt16)pMac->GetScriptType();
}
@@ -131,13 +131,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
// simple data-types
// UNICODE: rStrm >> pNew->sName;
- rStrm.ReadUniOrByteString(pNew->sName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(pNew->sName);
// UNICODE: rStrm >> pNew->sURL;
- rStrm.ReadUniOrByteString(pNew->sURL, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(pNew->sURL);
// UNICODE: rStrm >> pNew->sTarget;
- rStrm.ReadUniOrByteString(pNew->sTarget, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(pNew->sTarget);
rStrm >> nType;
pNew->eType = (SvxLinkInsertMode) nType;
@@ -149,7 +149,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
{
// new data
// UNICODE: rStrm >> pNew->sIntName;
- rStrm.ReadUniOrByteString(pNew->sIntName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(pNew->sIntName);
// macro-events
rStrm >> pNew->nMacroEvents;
@@ -164,10 +164,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
rStrm >> nCurKey;
// UNICODE: rStrm >> aLibName;
- rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(aLibName);
// UNICODE: rStrm >> aMacName;
- rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(aMacName);
pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) );
}
@@ -181,10 +181,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
rStrm >> nCurKey;
// UNICODE: rStrm >> aLibName;
- rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(aLibName);
// UNICODE: rStrm >> aMacName;
- rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet());
+ rStrm.ReadByteString(aMacName);
rStrm >> nScriptType;