[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Sat Jan 21 06:29:41 PST 2012
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 2 +-
binfilter/bf_sc/source/core/data/sc_document.cxx | 2 +-
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 2 +-
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 2 +-
binfilter/bf_sch/source/core/sch_memchrt.cxx | 6 ++----
binfilter/bf_sd/source/core/sd_anminfo.cxx | 2 +-
binfilter/bf_sd/source/core/sd_cusshow.cxx | 4 ++--
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 4 ++--
binfilter/bf_sd/source/core/sd_sdpage2.cxx | 4 ++--
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx | 4 ++--
binfilter/bf_so3/source/data/pseudo.cxx | 11 ++++-------
binfilter/bf_so3/source/inplace/client.cxx | 6 ++----
binfilter/bf_so3/source/inplace/embobj.cxx | 9 ++-------
binfilter/bf_so3/source/inplace/ipclient.cxx | 10 ++--------
binfilter/bf_so3/source/inplace/ipobj.cxx | 10 ++--------
binfilter/bf_so3/source/misc/iface.cxx | 8 ++------
binfilter/bf_so3/source/persist/persist.cxx | 12 ++++--------
binfilter/bf_so3/source/persist/svstor.cxx | 17 ++++-------------
binfilter/bf_svtools/source/items/svt_style.cxx | 6 ++----
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 2 +-
binfilter/bf_svx/source/items/svx_bulitem.cxx | 2 +-
binfilter/bf_svx/source/items/svx_textitem.cxx | 2 +-
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 16 ++++++++--------
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx | 2 +-
binfilter/bf_svx/source/svdraw/svx_svdview.cxx | 4 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx | 3 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 9 +++------
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 6 ++----
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 5 ++---
29 files changed, 61 insertions(+), 111 deletions(-)
New commits:
commit 258ba2fb484d5e1bb4a3aca3991b3b66ea915a10
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Jan 21 15:29:29 2012 +0100
Removed some unused parameters.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 14b4809..930e0a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -580,7 +580,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ rStream >> cGUI >> cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet( ::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*?*/ case SCID_LINKUPMODE: // Link Update Mode
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 1f00d00..26187a7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2428,7 +2428,7 @@ namespace binfilter {
/*N*/ rStream >> cGUI >> cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet( ::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*N*/ case SCID_DOCPOOL:
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index e911df3..1dbc3b6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -653,7 +653,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ DBG_ERRORFILE( "Der Header enthaelt mehr/neuere Daten" );
/*N*/ rStream.Seek( nPos + nCnt );
/*N*/ }
-/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet, nFileVers ) );
+/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet ) );
/*N*/ rStream.SetVersion( nFileVers );
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 1de45ba..2a7aef4 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -1150,7 +1150,7 @@ enum ChartStyleV0
/*N*/
/*N*/ // aInfo is a member of SdrModel
/*N*/ // the SdrModel was read before this, so the value is set
-/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding( aInfo.eLastReadCharSet, rIn.GetVersion());
+/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding( aInfo.eLastReadCharSet );
/*N*/ rIn.SetStreamCharSet( eSysSet );
/*N*/ // Note: The CharSet is stored in the MemChart and later set again at the stream !
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index 524c31e..fa12f85 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -452,8 +452,7 @@ namespace binfilter {
/*N*/ SvStream& operator << (SvStream& rOut, const SchMemChart& rMemChart)
/*N*/ {
-/*N*/ CharSet aSysCharSet = static_cast< CharSet >( ::GetSOStoreTextEncoding( osl_getThreadTextEncoding(),
-/*N*/ (USHORT)rOut.GetVersion()) );
+/*N*/ CharSet aSysCharSet = static_cast< CharSet >( ::GetSOStoreTextEncoding( osl_getThreadTextEncoding() ) );
/*N*/ rOut.SetStreamCharSet( aSysCharSet );
/*N*/
/*N*/ //Version 1: Abspeichern der pRow,pColTable (long-array)
@@ -525,8 +524,7 @@ namespace binfilter {
/*N*/ INT16 nCharSet;
/*N*/ rIn >> nCharSet;
/*N*/
-/*N*/ rtl_TextEncoding aCharSet = ::GetSOLoadTextEncoding( static_cast< rtl_TextEncoding >( nCharSet ),
-/*N*/ (USHORT)rIn.GetVersion());
+/*N*/ rtl_TextEncoding aCharSet = ::GetSOLoadTextEncoding( static_cast< rtl_TextEncoding >( nCharSet ) );
/*N*/ rIn.SetStreamCharSet( aCharSet );
/*N*/
/*N*/ rMemChart.aMainTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
diff --git a/binfilter/bf_sd/source/core/sd_anminfo.cxx b/binfilter/bf_sd/source/core/sd_anminfo.cxx
index 049db00..57ee2dd 100644
--- a/binfilter/bf_sd/source/core/sd_anminfo.cxx
+++ b/binfilter/bf_sd/source/core/sd_anminfo.cxx
@@ -190,7 +190,7 @@ using namespace ::com::sun::star;
/*N*/ rIn >> nCharSet;
/*N*/
/*N*/ // #unicode# eTextEnc = (rtl_TextEncoding)nCharSet;
-/*N*/ eTextEnc = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
+/*N*/ eTextEnc = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet);
/*N*/
/*N*/ String aSoundFileRel = rIn.ReadUniOrByteString( eTextEnc );
/*N*/ if( aSoundFileRel.Len() )
diff --git a/binfilter/bf_sd/source/core/sd_cusshow.cxx b/binfilter/bf_sd/source/core/sd_cusshow.cxx
index 8113e4c..165a611 100644
--- a/binfilter/bf_sd/source/core/sd_cusshow.cxx
+++ b/binfilter/bf_sd/source/core/sd_cusshow.cxx
@@ -99,7 +99,7 @@ using namespace ::com::sun::star;
/*N*/ // Name
/*N*/ // #90477# rOut.WriteByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
/*N*/ rOut.WriteUniOrByteString(rCustomShow.aName,
-/*N*/ GetSOStoreTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rOut.GetVersion()));
+/*N*/ GetSOStoreTextEncoding(osl_getThreadTextEncoding()));
/*N*/
/*N*/ // Anzahl Seiten
/*N*/ UINT32 nCount = rCustomShow.Count();
@@ -133,7 +133,7 @@ using namespace ::com::sun::star;
/*N*/ // Name
/*N*/ // #90477# rIn.ReadByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
/*N*/ rCustomShow.aName = rIn.ReadUniOrByteString(
-/*N*/ GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion()));
+/*N*/ GetSOLoadTextEncoding(osl_getThreadTextEncoding()));
/*N*/
/*N*/ // Anzahl Seiten
/*N*/ UINT32 nCount = 0;
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index b14cdd9..f41f1bc 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -343,7 +343,7 @@ SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
SvStream& operator << (SvStream& rOut, SdDrawDocument& rDoc)
{
// #90477# CharSet eSysSet = ::GetStoreCharSet( osl_getThreadTextEncoding());
- CharSet eSysSet = GetSOStoreTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rOut.GetVersion());
+ CharSet eSysSet = GetSOStoreTextEncoding(osl_getThreadTextEncoding());
/**************************************************************************
* Aktuelle FileFormat-Versionsnummer
@@ -463,7 +463,7 @@ SvStream& operator << (SvStream& rOut, SdDrawDocument& rDoc)
SvStream& operator >> (SvStream& rIn, SdDrawDocument& rDoc)
{
// #90477# CharSet eSysSet = ::GetStoreCharSet( osl_getThreadTextEncoding());
- CharSet eSysSet = GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion());
+ CharSet eSysSet = GetSOLoadTextEncoding(osl_getThreadTextEncoding());
rIn >> (FmFormModel&) rDoc;
rDoc.GetItemPool().LoadCompleted();
diff --git a/binfilter/bf_sd/source/core/sd_sdpage2.cxx b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
index 8a374cf..b64c2ae 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage2.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
@@ -77,7 +77,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
{
FmFormPage::ReadData( rHead, rIn );
- rIn.SetStreamCharSet(GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion()));
+ rIn.SetStreamCharSet(GetSOLoadTextEncoding(osl_getThreadTextEncoding()));
if ( pModel->IsStreamingSdrModel() )
{
@@ -152,7 +152,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
rIn >> nCharSet; // nur Einlesen, Konvertierung ab 303 durch Stream
// #90477# eCharSet = (CharSet) nCharSet;
- eCharSet = (CharSet)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
+ eCharSet = (CharSet)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet);
String aSoundFileRel = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aSoundFileRel, FALSE,
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
index 93d1dff..d8e21a2 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
@@ -50,8 +50,8 @@ namespace binfilter {
/*N*/ TYPEINIT1(SfxInPlaceObjectFactory,SvFactory);
/*N*/ SO2_IMPL_CLASS1(SfxInPlaceObject,SfxInPlaceObjectFactory,SvInPlaceObject,
/*N*/ SvGlobalName(0x3C8A87D0L,0x9B53,0x11d3,0x9E,0xCE,0x00,0x50,0x04,0xD7,0x6C,0x4E))
-/*?*/ void SfxInPlaceObject::TestMemberObjRef(BOOL){}
-/*?*/ void SfxInPlaceObject::TestMemberInvariant(BOOL){}
+/*?*/ void SfxInPlaceObject::TestMemberObjRef(){}
+/*?*/ void SfxInPlaceObject::TestMemberInvariant(){}
/*?*/ ::IUnknown* SfxInPlaceObject::GetMemberInterface( const SvGlobalName & ){ return 0L; }
/*N*/ SfxInPlaceObject::SfxInPlaceObject()
diff --git a/binfilter/bf_so3/source/data/pseudo.cxx b/binfilter/bf_so3/source/data/pseudo.cxx
index 625fc41..170220e 100644
--- a/binfilter/bf_so3/source/data/pseudo.cxx
+++ b/binfilter/bf_so3/source/data/pseudo.cxx
@@ -157,24 +157,21 @@ SvPseudoObject::~SvPseudoObject()
//=========================================================================
#ifdef TEST_INVARIANT
-void SvPseudoObject::TestMemberObjRef( BOOL /*bFree*/ )
+void SvPseudoObject::TestMemberObjRef()
/* [Beschreibung]
Siehe <So Debugging>.
*/
-{
-}
+{}
//=========================================================================
-void SvPseudoObject::TestMemberInvariant( BOOL bPrint )
+void SvPseudoObject::TestMemberInvariant()
/* [Beschreibung]
Siehe <So Debugging>.
*/
-{
- (void)bPrint;
-}
+{}
#endif
diff --git a/binfilter/bf_so3/source/inplace/client.cxx b/binfilter/bf_so3/source/inplace/client.cxx
index be1f9c3..6866a16 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -243,12 +243,10 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvEmbeddedClient,SvEmbeddedClientFactory,SvObject,
return NULL;
}
-void SvEmbeddedClient::TestMemberObjRef( BOOL )
-{
-}
+void SvEmbeddedClient::TestMemberObjRef() {}
#ifdef TEST_INVARIANT
-void SvEmbeddedClient::TestMemberInvariant( BOOL )
+void SvEmbeddedClient::TestMemberInvariant()
{
}
#endif
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index db75460..c6e7d33 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -198,15 +198,10 @@ SO2_IMPL_CLASS2_DLL(SvEmbeddedObject,SvFactory,SvPersist,SvPseudoObject,
return NULL;
}
-void SvEmbeddedObject::TestMemberObjRef( BOOL /*bFree*/ )
-{
-}
+void SvEmbeddedObject::TestMemberObjRef() {}
#ifdef TEST_INVARIANT
-void SvEmbeddedObject::TestMemberInvariant( BOOL bPrint )
-{
- (void)bPrint;
-}
+void SvEmbeddedObject::TestMemberInvariant() {}
#endif
/************************************************************************
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index 773be0d..0409e78 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -96,17 +96,11 @@ SvInPlaceClient::~SvInPlaceClient()
}
//=========================================================================
-void SvInPlaceClient::TestMemberObjRef( BOOL bFree )
-{
- (void)bFree;
-}
+void SvInPlaceClient::TestMemberObjRef() {}
//=========================================================================
#ifdef TEST_INVARIANT
-void SvInPlaceClient::TestMemberInvariant( BOOL bPrint )
-{
- (void)bPrint;
-}
+void SvInPlaceClient::TestMemberInvariant() {}
#endif
//=========================================================================
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 7df32c4..21c0c74 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -56,16 +56,10 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvInPlaceObject,SvInPlaceObjectFactory,SvEmbeddedOb
return NULL;
}
-void SvInPlaceObject::TestMemberObjRef( BOOL bFree )
-{
- (void)bFree;
-}
+void SvInPlaceObject::TestMemberObjRef() {}
#ifdef TEST_INVARIANT
-void SvInPlaceObject::TestMemberInvariant( BOOL bPrint )
-{
- (void)bPrint;
-}
+void SvInPlaceObject::TestMemberInvariant() {}
#endif
/************************************************************************
diff --git a/binfilter/bf_so3/source/misc/iface.cxx b/binfilter/bf_so3/source/misc/iface.cxx
index 8dd3929..d00b35b 100644
--- a/binfilter/bf_so3/source/misc/iface.cxx
+++ b/binfilter/bf_so3/source/misc/iface.cxx
@@ -66,9 +66,7 @@ SO2_IMPL_CLASS1_DLL(SvObject,SvObjectFactory,SotObject,
|*
|* Beschreibung:
*************************************************************************/
-void SvObject::TestMemberObjRef( BOOL /*bFree*/ )
-{
-}
+void SvObject::TestMemberObjRef() {}
/*************************************************************************
|* SvObject::TestMemberObjRef()
@@ -77,9 +75,7 @@ void SvObject::TestMemberObjRef( BOOL /*bFree*/ )
*************************************************************************/
#ifdef TEST_INVARIANT
-void SvObject::TestMemberInvariant( BOOL /*bPrint*/ )
-{
-}
+void SvObject::TestMemberInvariant() {}
#endif
/*************************************************************************
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 20c112e..b0a4f32 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -243,13 +243,9 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvObjectContainer,SvObjectContainerFactory,SvObject
}
#ifdef TEST_INVARIANT
-void SvObjectContainer::TestMemberObjRef( BOOL /*bFree*/ )
-{
-}
+void SvObjectContainer::TestMemberObjRef() {}
-void SvObjectContainer::TestMemberInvariant( BOOL /*bPrint*/ )
-{
-}
+void SvObjectContainer::TestMemberInvariant() {}
#endif
SvObjectContainer::SvObjectContainer()
@@ -287,7 +283,7 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvPersist,SvPersistFactory,SvObjectContainer,
}
#ifdef TEST_INVARIANT
-void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
+void SvPersist::TestMemberObjRef()
{
if( pChildList )
{
@@ -313,7 +309,7 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
}
}
-void SvPersist::TestMemberInvariant( BOOL /*bPrint*/ )
+void SvPersist::TestMemberInvariant()
{
#ifdef DBG_UTIL
DBG_ASSERT( !(bOpSave || bOpSaveAs), "bOpSave && bOpSaveAs" );
diff --git a/binfilter/bf_so3/source/persist/svstor.cxx b/binfilter/bf_so3/source/persist/svstor.cxx
index 9696abc..643861a 100644
--- a/binfilter/bf_so3/source/persist/svstor.cxx
+++ b/binfilter/bf_so3/source/persist/svstor.cxx
@@ -64,14 +64,10 @@ SO2_IMPL_STANDARD_CLASS2_DLL(SvStorageStream,SvStorageStreamFactory,SvObject,Sot
return NULL;
}
-void SvStorageStream::TestMemberObjRef( BOOL /*bFree*/ )
-{
-}
+void SvStorageStream::TestMemberObjRef() {}
#ifdef TEST_INVARIANT
-void SvStorageStream::TestMemberInvariant( BOOL /*bPrint*/ )
-{
-}
+void SvStorageStream::TestMemberInvariant() {}
#endif
@@ -170,15 +166,10 @@ SO2_IMPL_STANDARD_CLASS2_DLL(SvStorage,SvStorageFactory,SvObject,SotStorage,
return NULL;
}
-void SvStorage::TestMemberObjRef( BOOL /*bFree*/ )
-{
-}
+void SvStorage::TestMemberObjRef() {}
#ifdef TEST_INVARIANT
-void SvStorage::TestMemberInvariant( BOOL bPrint )
-{
- (void)bPrint;
-}
+void SvStorage::TestMemberInvariant() {}
#endif
/************************************************************************
diff --git a/binfilter/bf_svtools/source/items/svt_style.cxx b/binfilter/bf_svtools/source/items/svt_style.cxx
index 71da24a..406c8b9 100644
--- a/binfilter/bf_svtools/source/items/svt_style.cxx
+++ b/binfilter/bf_svtools/source/items/svt_style.cxx
@@ -808,8 +808,7 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream )
return FALSE;
rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)nCharSet,
- sal::static_int_cast< USHORT >(rStream.GetVersion()) );
+ (rtl_TextEncoding)nCharSet );
rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
rStream.SetStreamCharSet( eEnc );
@@ -897,8 +896,7 @@ BOOL SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
rStream >> nCharSet;
rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)nCharSet,
- sal::static_int_cast< USHORT >(rStream.GetVersion()) );
+ (rtl_TextEncoding)nCharSet );
rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
rStream.SetStreamCharSet( eEnc );
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 179d318..efff99f 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -529,7 +529,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
USHORT nCharSet;
rIStream >> nCharSet;
- rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (USHORT)rIStream.GetVersion() );
+ rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet );
// Die Anzahl der Absaetze...
USHORT nParagraphs;
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index 1a354ab..47c5142 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -57,7 +57,7 @@ namespace binfilter {
/*N*/
/*N*/ // #90477#
/*N*/ rStream >> nTemp;
-/*N*/ nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp, (sal_uInt16)rStream.GetVersion());
+/*N*/ nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp);
/*N*/ aFont.SetCharSet((rtl_TextEncoding)nTemp);
/*N*/
/*N*/ rStream >> nTemp; aFont.SetPitch((FontPitch)nTemp);
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 814cb9c..d3ee941 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -333,7 +333,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ aStyle = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
/*N*/
/*N*/ // Task 91008/90471: set the "correct" textencoding
-/*N*/ eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
+/*N*/ eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding );
/*N*/
/*N*/ // irgendwann wandelte sich der StarBats vom ANSI- zum SYMBOL-Font
/*N*/ if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") )
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 3f720e3..c3333e0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -110,7 +110,7 @@ using namespace ::com::sun::star;
/*N*/ rOut<<UINT32(rModInfo.aCreationDate.GetTime());
/*N*/
/*N*/ // #90477# rOut<<UINT8( GetStoreCharSet( rModInfo.eCreationCharSet ) );
-/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eCreationCharSet, (sal_uInt16)rOut.GetVersion()));
+/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eCreationCharSet));
/*N*/
/* Since we removed old SV-stuff there is no way to determine system-speciefic informations, yet.
We just have to write anythink in the file for compatibility:
@@ -128,7 +128,7 @@ using namespace ::com::sun::star;
/*N*/ rOut<<UINT32(rModInfo.aLastWriteDate.GetTime());
/*N*/
/*N*/ // #90477# rOut<<UINT8( GetStoreCharSet( rModInfo.eLastWriteCharSet ) );
-/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eLastWriteCharSet, (sal_uInt16)rOut.GetVersion()));
+/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eLastWriteCharSet));
/*N*/
/*N*/ // see comment above
/*N*/ rOut<<UINT8(0); // rOut<<UINT8(rModInfo.eLastWriteGUI);
@@ -139,7 +139,7 @@ using namespace ::com::sun::star;
/*N*/ rOut<<UINT32(rModInfo.aLastReadDate.GetTime());
/*N*/
/*N*/ // #90477# rOut<<UINT8( GetStoreCharSet( rModInfo.eLastReadCharSet ) );
-/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eLastReadCharSet, (sal_uInt16)rOut.GetVersion()));
+/*N*/ rOut << UINT8(GetSOStoreTextEncoding(rModInfo.eLastReadCharSet));
/*N*/
/*N*/ // see comment above
/*N*/ rOut<<UINT8(0); // rOut<<UINT8(rModInfo.eLastReadGUI);
@@ -165,7 +165,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // #90477# rIn>>n8; rModInfo.eCreationCharSet=rtl_TextEncoding(n8);
/*N*/ rIn >> n8;
-/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8, (sal_uInt16)rIn.GetVersion());
+/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8);
/*N*/ rModInfo.eCreationCharSet = rtl_TextEncoding(n8);
/*N*/
/* Since we removed old SV-stuff there is no way to determine system-speciefic informations, yet.
@@ -184,7 +184,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // #90477# rIn>>n8; rModInfo.eLastWriteCharSet=rtl_TextEncoding(n8);
/*N*/ rIn >> n8;
-/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8, (sal_uInt16)rIn.GetVersion());
+/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8);
/*N*/ rModInfo.eLastWriteCharSet = rtl_TextEncoding(n8);
/*N*/
/*N*/ // see comment above
@@ -197,7 +197,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // #90477# rIn>>n8; rModInfo.eLastReadCharSet=rtl_TextEncoding(n8);
/*N*/ rIn >> n8;
-/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8, (sal_uInt16)rIn.GetVersion());
+/*N*/ n8 = (UINT8)GetSOLoadTextEncoding((rtl_TextEncoding)n8);
/*N*/ rModInfo.eLastReadCharSet = rtl_TextEncoding(n8);
/*N*/
/*N*/ // see comment above
@@ -1340,12 +1340,12 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // #90477# rIn >> nCharSet;
/*N*/ rIn >> nCharSet;
-/*N*/ nCharSet = (INT16)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
+/*N*/ nCharSet = (INT16)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet);
/*N*/
/*N*/ // StreamCharSet setzen, damit Strings beim
/*N*/ // Lesen automatisch konvertiert werden
/*N*/ // #90477# rIn.SetStreamCharSet(rtl_TextEncoding(nCharSet));
-/*N*/ rIn.SetStreamCharSet(GetSOLoadTextEncoding(rtl_TextEncoding(nCharSet), (sal_uInt16)rIn.GetVersion()));
+/*N*/ rIn.SetStreamCharSet(GetSOLoadTextEncoding(rtl_TextEncoding(nCharSet)));
/*N*/ }
/*N*/
/*N*/ // Tabellen- und Listennamen lesen (Tabellen/Listen existieren schon) // SOH!!!
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
index 95a6fed..10d49a8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
@@ -193,7 +193,7 @@ namespace binfilter {
/*N*/
/*N*/ // #90477# rIn >> nTmp16; eCharSet = rtl_TextEncoding(nTmp16);
/*N*/ rIn >> nTmp16;
-/*N*/ eCharSet = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nTmp16, (sal_uInt16)rIn.GetVersion());
+/*N*/ eCharSet = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nTmp16);
/*N*/
/*N*/ rIn >> nTmp32; aFileDate0.SetDate(nTmp32);
/*N*/ rIn >> nTmp32; aFileDate0.SetTime(nTmp32);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
index d0df4b9..10f19a4 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
@@ -147,7 +147,7 @@ namespace binfilter {
/*N*/ rtl_TextEncoding eOutCharSet = osl_getThreadTextEncoding();
/*N*/
/*N*/ // #90477# rOut << UINT16( GetStoreCharSet( eOutCharSet ) );
-/*N*/ rOut << (UINT16)GetSOStoreTextEncoding(eOutCharSet, (sal_uInt16)rOut.GetVersion());
+/*N*/ rOut << (UINT16)GetSOStoreTextEncoding(eOutCharSet);
/*N*/ }
/*N*/ SdrCreateView::WriteRecords(rOut);
/*N*/ }
@@ -165,7 +165,7 @@ namespace binfilter {
/*N*/ // #90477# rIn>>nCharSet;
/*N*/ // rIn.SetStreamCharSet(rtl_TextEncoding(nCharSet));
/*N*/ rIn >> nCharSet;
-/*N*/ rIn.SetStreamCharSet(GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion()));
+/*N*/ rIn.SetStreamCharSet(GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet));
/*N*/ } break;
/*N*/ default: bRet=FALSE;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
index 929ede3..2e171c2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
@@ -427,8 +427,7 @@ void lcl_sw3doc_ChgChartName( SwDoc* pDoc )
/*N*/ }
/*N*/ pStrm->Read( cPasswd, 16L );
/*N*/ *pStrm >> cSet >> cGUI >> nDate >> nTime;
-/*N*/ eSrcSet = GetSOLoadTextEncoding( (rtl_TextEncoding) cSet,
-/*N*/ pStrm->GetVersion() );
+/*N*/ eSrcSet = GetSOLoadTextEncoding( (rtl_TextEncoding) cSet );
/*N*/ pStrm->SetStreamCharSet( eSrcSet );
/*N*/ if( nFileFlags & SWGF_BLOCKNAME )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index ce3ce33..b7be46a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -263,10 +263,8 @@ public:
/*N*/ pCurPaM =
/*N*/ pCurNumRange= NULL;
/*N*/ eSrcSet = osl_getThreadTextEncoding();
-/*N*/ if( pStrm )
-/*N*/ eSrcSet = GetSOStoreTextEncoding( eSrcSet, pStrm->GetVersion() );
-/*N*/ else if( pRoot.Is() )
-/*N*/ eSrcSet = GetSOStoreTextEncoding( eSrcSet, pRoot->GetVersion() );
+/*N*/ if( pStrm || pRoot.Is() )
+/*N*/ eSrcSet = GetSOStoreTextEncoding( eSrcSet );
/*N*/ nVersion = SWG_VERSION;
/*N*/
/*N*/ aRecTypes.Remove( 0, aRecTypes.Count() );
@@ -1420,8 +1418,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ // MIB 8.4.97: Datenbank-Felder enthalten ein 0xff, das auf keinen
/*N*/ // Fall mit konvertiert werden darf. Wir erkennen sie am Wert
/*N*/ // IDX_NOCONV_FF.
-/*N*/ rtl_TextEncoding eSrcEnc = GetSOLoadTextEncoding( (rtl_TextEncoding)cSet,
-/*N*/ r.GetVersion() );
+/*N*/ rtl_TextEncoding eSrcEnc = GetSOLoadTextEncoding( (rtl_TextEncoding)cSet );
/*N*/ while( n-- )
/*N*/ {
/*N*/ sal_uInt16 nId;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index 72b891c..e14cf58 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -115,8 +115,7 @@ namespace binfilter {
/*N*/ if(RTL_TEXTENCODING_DONTKNOW== eCharSet)
/*N*/ eCharSet = RTL_TEXTENCODING_SYMBOL;
/*N*/ else if( RTL_TEXTENCODING_SYMBOL != eCharSet )
-/*N*/ eCharSet = GetSOLoadTextEncoding( rtl_TextEncoding( eCharSet ),
-/*?*/ pStrm->GetVersion() );
+/*N*/ eCharSet = GetSOLoadTextEncoding( rtl_TextEncoding( eCharSet ) );
/*N*/ cFlags = OpenFlagRec();
/*N*/ CloseFlagRec();
/*N*/
@@ -236,8 +235,7 @@ namespace binfilter {
/*?*/ aFont.SetPitch( FontPitch( ePitch ) );
/*?*/ aFont.SetCharSet( rtl_TextEncoding( eCharSet ) );
/*?*/ aFont.SetCharSet(
-/*?*/ GetSOLoadTextEncoding( rtl_TextEncoding( eCharSet ),
-/*?*/ pStrm->GetVersion() ) );
+/*?*/ GetSOLoadTextEncoding( rtl_TextEncoding( eCharSet ) ) );
/*N*/ }
/*N*/ // muss sein...
/*N*/ aFont.SetTransparent( TRUE );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
index 9c6e21d..69c5c59 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
@@ -178,8 +178,7 @@ namespace binfilter {
/*?*/ ConvertFmtsToStarSymbol();
/*N*/ }
/*N*/ // TODO: unicode: is this required really?
-/*N*/ eSrcSet = GetSOLoadTextEncoding( osl_getThreadTextEncoding(),
-/*N*/ pStrm->GetVersion() );
+/*N*/ eSrcSet = GetSOLoadTextEncoding( osl_getThreadTextEncoding() );
/*N*/ }
/*N*/ }
@@ -258,7 +257,7 @@ void Sw3IoImp::SetDBName()
rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)cSet, pStrm->GetVersion() );
+ (rtl_TextEncoding)cSet );
sDBName = ConvertStringNoDbDelim( s8, eEnc );
SwDBData aData;
aData.sDataSource = sDBName.GetToken(0, DB_DELIM);
More information about the Libreoffice-commits
mailing list