[Libreoffice-commits] .: 10 commits - binfilter/bf_basic binfilter/bf_goodies binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Mon Apr 18 13:12:50 PDT 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 302 -------
binfilter/bf_basic/source/classes/sb.cxx | 14
binfilter/bf_basic/source/classes/sbxmod.cxx | 62 -
binfilter/bf_basic/source/inc/sbjsmod.hxx | 2
binfilter/bf_basic/source/sbx/sbxarray.cxx | 38 -
binfilter/bf_basic/source/sbx/sbxbase.cxx | 49 -
binfilter/bf_basic/source/sbx/sbxcoll.cxx | 10
binfilter/bf_basic/source/sbx/sbxobj.cxx | 27
binfilter/bf_basic/source/sbx/sbxvalue.cxx | 100 --
binfilter/bf_basic/source/sbx/sbxvar.cxx | 41 -
binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx | 1
binfilter/bf_sc/source/core/data/sc_attrib.cxx | 152 ----
binfilter/bf_sc/source/core/data/sc_conditio.cxx | 96 --
binfilter/bf_sc/source/core/data/sc_documen8.cxx | 41 -
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 13
binfilter/bf_sc/source/core/data/sc_document.cxx | 77 --
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 166 ----
binfilter/bf_sc/source/core/data/sc_dpsave.cxx | 62 -
binfilter/bf_sc/source/core/data/sc_drwlayer.cxx | 21
binfilter/bf_sc/source/core/data/sc_global2.cxx | 61 -
binfilter/bf_sc/source/core/data/sc_olinetab.cxx | 36
binfilter/bf_sc/source/core/data/sc_patattr.cxx | 19
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 48 -
binfilter/bf_sc/source/core/data/sc_pivot2.cxx | 14
binfilter/bf_sc/source/core/data/sc_validat.cxx | 52 -
binfilter/bf_sc/source/core/inc/ddelink.hxx | 2
binfilter/bf_sc/source/core/inc/scmatrix.hxx | 2
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 157 ----
binfilter/bf_sc/source/core/tool/sc_chgviset.cxx | 27
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 12
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 142 ---
binfilter/bf_sc/source/core/tool/sc_ddelink.cxx | 23
binfilter/bf_sc/source/core/tool/sc_detdata.cxx | 23
binfilter/bf_sc/source/core/tool/sc_rangelst.cxx | 40 -
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 44 -
binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx | 48 -
binfilter/bf_sc/source/core/tool/sc_token.cxx | 176 ----
binfilter/bf_sc/source/core/tool/sc_userlist.cxx | 20
binfilter/bf_sch/source/core/sch_stlsheet.cxx | 10
binfilter/bf_sd/source/core/sd_stlsheet.cxx | 11
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 5
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 2
binfilter/bf_sfx2/source/view/sfx2_printer.cxx | 13
binfilter/bf_starmath/source/cfgitem.hxx | 2
binfilter/bf_starmath/source/starmath_cfgitem.cxx | 9
binfilter/bf_svtools/source/items/svt_flagitem.cxx | 9
binfilter/bf_svtools/source/items/svt_intitem.cxx | 9
binfilter/bf_svtools/source/items/svt_macitem.cxx | 7
binfilter/bf_svtools/source/items/svt_ptitem.cxx | 9
binfilter/bf_svtools/source/items/svt_rectitem.cxx | 9
binfilter/bf_svtools/source/items/svt_rngitem_inc.cxx | 22
binfilter/bf_svtools/source/items/svt_stritem.cxx | 8
binfilter/bf_svtools/source/items/svt_style.cxx | 149 ---
binfilter/bf_svtools/source/items/svt_szitem.cxx | 8
binfilter/bf_svtools/source/items1/svt_bintitem.cxx | 8
binfilter/bf_svtools/source/items1/svt_cenumitm.cxx | 16
binfilter/bf_svtools/source/items1/svt_cintitem.cxx | 36
binfilter/bf_svtools/source/items1/svt_cntwall.cxx | 15
binfilter/bf_svtools/source/items1/svt_cstitem.cxx | 12
binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx | 11
binfilter/bf_svtools/source/items1/svt_dateitem.cxx | 12
binfilter/bf_svtools/source/items1/svt_dtritem.cxx | 17
binfilter/bf_svtools/source/items1/svt_frqitem.cxx | 25
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 68 -
binfilter/bf_svtools/source/items1/svt_lckbitem.cxx | 15
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 232 ------
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 7
binfilter/bf_svtools/source/items1/svt_sfontitm.cxx | 22
binfilter/bf_svtools/source/items1/svt_sitem.cxx | 6
binfilter/bf_svtools/source/items1/svt_slstitm.cxx | 28
binfilter/bf_svtools/source/items1/svt_tfrmitem.cxx | 14
binfilter/bf_svtools/source/items1/svt_visitem.cxx | 9
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 135 ---
binfilter/bf_svx/source/editeng/editdoc.hxx | 2
binfilter/bf_svx/source/editeng/editobj2.hxx | 2
binfilter/bf_svx/source/editeng/svx_editdoc.cxx | 22
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 215 -----
binfilter/bf_svx/source/items/svx_algitem.cxx | 12
binfilter/bf_svx/source/items/svx_bulitem.cxx | 60 -
binfilter/bf_svx/source/items/svx_chrtitem.cxx | 7
binfilter/bf_svx/source/items/svx_e3ditem.cxx | 12
binfilter/bf_svx/source/items/svx_flditem.cxx | 21
binfilter/bf_svx/source/items/svx_frmitems.cxx | 260 ------
binfilter/bf_svx/source/items/svx_grfitem.cxx | 14
binfilter/bf_svx/source/items/svx_numitem.cxx | 109 --
binfilter/bf_svx/source/items/svx_pageitem.cxx | 18
binfilter/bf_svx/source/items/svx_paraitem.cxx | 117 ---
binfilter/bf_svx/source/items/svx_textitem.cxx | 238 ------
binfilter/bf_svx/source/outliner/svx_outlobj.cxx | 12
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 19
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 4
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 207 -----
binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx | 47 -
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 383 ----------
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 21
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 416 -----------
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 93 --
binfilter/inc/bf_basic/basmgr.hxx | 4
binfilter/inc/bf_basic/sbmeth.hxx | 2
binfilter/inc/bf_basic/sbmod.hxx | 4
binfilter/inc/bf_basic/sbstar.hxx | 2
binfilter/inc/bf_basic/sbx.hxx | 8
binfilter/inc/bf_basic/sbxcore.hxx | 4
binfilter/inc/bf_basic/sbxobj.hxx | 2
binfilter/inc/bf_basic/sbxvar.hxx | 4
binfilter/inc/bf_goodies/graphicobject.hxx | 2
binfilter/inc/bf_sc/attrib.hxx | 12
binfilter/inc/bf_sc/chgtrack.hxx | 16
binfilter/inc/bf_sc/chgviset.hxx | 2
binfilter/inc/bf_sc/collect.hxx | 2
binfilter/inc/bf_sc/compiler.hxx | 2
binfilter/inc/bf_sc/conditio.hxx | 8
binfilter/inc/bf_sc/dbcolect.hxx | 4
binfilter/inc/bf_sc/detdata.hxx | 3
binfilter/inc/bf_sc/document.hxx | 3
binfilter/inc/bf_sc/dpobject.hxx | 6
binfilter/inc/bf_sc/dpsave.hxx | 6
binfilter/inc/bf_sc/drwlayer.hxx | 2
binfilter/inc/bf_sc/global.hxx | 6
binfilter/inc/bf_sc/olinetab.hxx | 6
binfilter/inc/bf_sc/patattr.hxx | 2
binfilter/inc/bf_sc/pivot.hxx | 4
binfilter/inc/bf_sc/rangelst.hxx | 4
binfilter/inc/bf_sc/rangenam.hxx | 4
binfilter/inc/bf_sc/token.hxx | 2
binfilter/inc/bf_sc/userlist.hxx | 4
binfilter/inc/bf_sc/validat.hxx | 4
binfilter/inc/bf_sch/stlsheet.hxx | 2
binfilter/inc/bf_sd/stlsheet.hxx | 2
binfilter/inc/bf_sfx2/evntconf.hxx | 2
binfilter/inc/bf_sfx2/frmdescr.hxx | 3
binfilter/inc/bf_sfx2/msgnodei.hxx | 10
binfilter/inc/bf_sfx2/printer.hxx | 2
binfilter/inc/bf_sfx2/saveopt.hxx | 2
binfilter/inc/bf_svtools/bintitem.hxx | 2
binfilter/inc/bf_svtools/cenumitm.hxx | 4
binfilter/inc/bf_svtools/cintitem.hxx | 8
binfilter/inc/bf_svtools/cntwall.hxx | 2
binfilter/inc/bf_svtools/cstitem.hxx | 4
binfilter/inc/bf_svtools/ctypeitm.hxx | 2
binfilter/inc/bf_svtools/dateitem.hxx | 2
binfilter/inc/bf_svtools/dtritem.hxx | 2
binfilter/inc/bf_svtools/flagitem.hxx | 2
binfilter/inc/bf_svtools/frqitem.hxx | 2
binfilter/inc/bf_svtools/intitem.hxx | 2
binfilter/inc/bf_svtools/itempool.hxx | 8
binfilter/inc/bf_svtools/itemset.hxx | 2
binfilter/inc/bf_svtools/lckbitem.hxx | 2
binfilter/inc/bf_svtools/macitem.hxx | 2
binfilter/inc/bf_svtools/poolitem.hxx | 4
binfilter/inc/bf_svtools/ptitem.hxx | 2
binfilter/inc/bf_svtools/rectitem.hxx | 2
binfilter/inc/bf_svtools/reqitem.hxx | 2
binfilter/inc/bf_svtools/rngitem.hxx | 4
binfilter/inc/bf_svtools/sfontitm.hxx | 2
binfilter/inc/bf_svtools/slstitm.hxx | 2
binfilter/inc/bf_svtools/stritem.hxx | 2
binfilter/inc/bf_svtools/style.hxx | 10
binfilter/inc/bf_svtools/szitem.hxx | 2
binfilter/inc/bf_svtools/tfrmitem.hxx | 2
binfilter/inc/bf_svtools/visitem.hxx | 2
binfilter/inc/bf_svtools/zformat.hxx | 6
binfilter/inc/bf_svx/adjitem.hxx | 2
binfilter/inc/bf_svx/akrnitem.hxx | 2
binfilter/inc/bf_svx/algitem.hxx | 2
binfilter/inc/bf_svx/blnkitem.hxx | 2
binfilter/inc/bf_svx/boxitem.hxx | 20
binfilter/inc/bf_svx/brkitem.hxx | 2
binfilter/inc/bf_svx/brshitem.hxx | 2
binfilter/inc/bf_svx/bulitem.hxx | 2
binfilter/inc/bf_svx/charreliefitem.hxx | 2
binfilter/inc/bf_svx/charrotateitem.hxx | 2
binfilter/inc/bf_svx/charscaleitem.hxx | 2
binfilter/inc/bf_svx/chrtitem.hxx | 2
binfilter/inc/bf_svx/cmapitem.hxx | 2
binfilter/inc/bf_svx/cntritem.hxx | 2
binfilter/inc/bf_svx/colritem.hxx | 2
binfilter/inc/bf_svx/crsditem.hxx | 2
binfilter/inc/bf_svx/cscoitem.hxx | 2
binfilter/inc/bf_svx/e3ditem.hxx | 2
binfilter/inc/bf_svx/editobj.hxx | 4
binfilter/inc/bf_svx/emphitem.hxx | 2
binfilter/inc/bf_svx/escpitem.hxx | 2
binfilter/inc/bf_svx/fhgtitem.hxx | 2
binfilter/inc/bf_svx/flditem.hxx | 6
binfilter/inc/bf_svx/fontitem.hxx | 2
binfilter/inc/bf_svx/frmdiritem.hxx | 2
binfilter/inc/bf_svx/grfcrop.hxx | 2
binfilter/inc/bf_svx/hyznitem.hxx | 2
binfilter/inc/bf_svx/keepitem.hxx | 2
binfilter/inc/bf_svx/kernitem.hxx | 2
binfilter/inc/bf_svx/langitem.hxx | 2
binfilter/inc/bf_svx/lrspitem.hxx | 2
binfilter/inc/bf_svx/lspcitem.hxx | 2
binfilter/inc/bf_svx/numitem.hxx | 6
binfilter/inc/bf_svx/opaqitem.hxx | 2
binfilter/inc/bf_svx/outlobj.hxx | 2
binfilter/inc/bf_svx/pageitem.hxx | 4
binfilter/inc/bf_svx/pbinitem.hxx | 2
binfilter/inc/bf_svx/postitem.hxx | 2
binfilter/inc/bf_svx/prntitem.hxx | 2
binfilter/inc/bf_svx/protitem.hxx | 2
binfilter/inc/bf_svx/sdasaitm.hxx | 2
binfilter/inc/bf_svx/shaditem.hxx | 2
binfilter/inc/bf_svx/shdditem.hxx | 2
binfilter/inc/bf_svx/sizeitem.hxx | 2
binfilter/inc/bf_svx/spltitem.hxx | 2
binfilter/inc/bf_svx/svdetc.hxx | 2
binfilter/inc/bf_svx/svdpage.hxx | 2
binfilter/inc/bf_svx/sxfiitm.hxx | 2
binfilter/inc/bf_svx/tstpitem.hxx | 2
binfilter/inc/bf_svx/twolinesitem.hxx | 2
binfilter/inc/bf_svx/udlnitem.hxx | 2
binfilter/inc/bf_svx/ulspitem.hxx | 2
binfilter/inc/bf_svx/wghtitem.hxx | 2
binfilter/inc/bf_svx/wrlmitem.hxx | 2
binfilter/inc/bf_svx/xbtmpit.hxx | 2
binfilter/inc/bf_svx/xcolit.hxx | 2
binfilter/inc/bf_svx/xflasit.hxx | 2
binfilter/inc/bf_svx/xflftrit.hxx | 2
binfilter/inc/bf_svx/xflgrit.hxx | 2
binfilter/inc/bf_svx/xflhtit.hxx | 2
binfilter/inc/bf_svx/xit.hxx | 2
binfilter/inc/bf_svx/xlnasit.hxx | 2
binfilter/inc/bf_svx/xlndsit.hxx | 2
binfilter/inc/bf_svx/xlnedit.hxx | 2
binfilter/inc/bf_svx/xlnstit.hxx | 2
binfilter/inc/bf_svx/xtxasit.hxx | 2
binfilter/inc/bf_sw/cellatr.hxx | 6
binfilter/inc/bf_sw/fchrfmt.hxx | 2
binfilter/inc/bf_sw/fmtanchr.hxx | 2
binfilter/inc/bf_sw/fmtclbl.hxx | 9
binfilter/inc/bf_sw/fmtclds.hxx | 5
binfilter/inc/bf_sw/fmtcnct.hxx | 2
binfilter/inc/bf_sw/fmtcntnt.hxx | 2
binfilter/inc/bf_sw/fmteiro.hxx | 2
binfilter/inc/bf_sw/fmtflcnt.hxx | 3
binfilter/inc/bf_sw/fmtfld.hxx | 2
binfilter/inc/bf_sw/fmtfordr.hxx | 2
binfilter/inc/bf_sw/fmtfsize.hxx | 2
binfilter/inc/bf_sw/fmtftn.hxx | 2
binfilter/inc/bf_sw/fmtftntx.hxx | 10
binfilter/inc/bf_sw/fmthbsh.hxx | 4
binfilter/inc/bf_sw/fmthdft.hxx | 4
binfilter/inc/bf_sw/fmtinfmt.hxx | 2
binfilter/inc/bf_sw/fmtline.hxx | 2
binfilter/inc/bf_sw/fmtlsplt.hxx | 2
binfilter/inc/bf_sw/fmtornt.hxx | 4
binfilter/inc/bf_sw/fmtpdsc.hxx | 2
binfilter/inc/bf_sw/fmtrfmrk.hxx | 2
binfilter/inc/bf_sw/fmtruby.hxx | 2
binfilter/inc/bf_sw/fmtsrnd.hxx | 2
binfilter/inc/bf_sw/fmturl.hxx | 2
binfilter/inc/bf_sw/grfatr.hxx | 6
binfilter/inc/bf_sw/hfspacingitem.hxx | 2
binfilter/inc/bf_sw/paratr.hxx | 6
binfilter/inc/bf_sw/tgrditem.hxx | 2
binfilter/inc/bf_sw/tox.hxx | 2
260 files changed, 250 insertions(+), 5759 deletions(-)
New commits:
commit 3ecca361a4cddf96bf42f164fa8b1dad7fefc0e1
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 17 20:49:00 2011 +0200
deactivate StoreData function in binfilter
perform nothing or just return FALSE if waiting for a boolean
when called
diff --git a/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index 49b4ef4..bdf209f 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -1111,20 +1111,6 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
return TRUE;
}
-BOOL StarBASIC::StoreData( SvStream& r ) const
-{
- if( !SbxObject::StoreData( r ) )
- return FALSE;
- r << (UINT16) pModules->Count();
- for( USHORT i = 0; i < pModules->Count(); i++ )
- {
- SbModule* p = (SbModule*) pModules->Get( i );
- if( !p->Store( r ) )
- return FALSE;
- }
- return TRUE;
-}
-
//========================================================================
// #118116 Implementation Collection object
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index d079f19..0aa7a85 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -548,41 +548,6 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbModule::StoreData( SvStream& rStrm ) const
-{
- BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
- if ( bFixup )
- fixUpMethodStart( true );
- BOOL bRet = SbxObject::StoreData( rStrm );
- if ( !bRet )
- return FALSE;
-
- if( pImage )
- {
- pImage->aOUSource = aOUSource;
- pImage->aComment = aComment;
- pImage->aName = GetName();
- rStrm << (BYTE) 1;
- // # PCode is saved only for legacy formats only
- // It should be noted that it probably isn't necessary
- // It would be better not to store the image ( more flexible with
- // formats )
- if ( bFixup )
- fixUpMethodStart( false ); // restore method starts
- return FALSE;
-
- }
- else
- {
- SbiImage aImg;
- aImg.aOUSource = aOUSource;
- aImg.aComment = aComment;
- aImg.aName = GetName();
- rStrm << (BYTE) 1;
- return FALSE;
- }
-}
-
// Called for >= OO 1.0 passwd protected libraries only
//
@@ -648,20 +613,6 @@ BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
-{
- if( !SbxObject::StoreData( rStrm ) )
- return FALSE;
-
- // Source-String schreiben
- String aTmp = aOUSource;
- rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
- return TRUE;
-}
-
-
-/////////////////////////////////////////////////////////////////////////
-
SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
: SbxMethod( r, t ), pMod( p )
{
@@ -706,18 +657,6 @@ BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbMethod::StoreData( SvStream& rStrm ) const
-{
- if( !SbxMethod::StoreData( rStrm ) )
- return FALSE;
- rStrm << (INT16) nDebugFlags
- << (INT16) nLine1
- << (INT16) nLine2
- << (INT16) nStart
- << (BYTE) bInvalid;
- return TRUE;
-}
-
// Kann spaeter mal weg
SbxInfo* SbMethod::GetInfo()
diff --git a/binfilter/bf_basic/source/inc/sbjsmod.hxx b/binfilter/bf_basic/source/inc/sbjsmod.hxx
index 835f23a..39fb1d9 100644
--- a/binfilter/bf_basic/source/inc/sbjsmod.hxx
+++ b/binfilter/bf_basic/source/inc/sbjsmod.hxx
@@ -40,7 +40,7 @@ namespace binfilter {
class SbJScriptModule : public SbModule
{
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
TYPEINFO();
diff --git a/binfilter/bf_basic/source/sbx/sbxarray.cxx b/binfilter/bf_basic/source/sbx/sbxarray.cxx
index 84d57e1..aa22c83 100644
--- a/binfilter/bf_basic/source/sbx/sbxarray.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxarray.cxx
@@ -500,33 +500,6 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
return bRes;
}
-BOOL SbxArray::StoreData( SvStream& rStrm ) const
-{
- UINT32 nElem = 0;
- UINT32 n;
- // Welche Elemente sind ueberhaupt definiert?
- for( n = 0; n < pData->size(); n++ )
- {
- SbxVariableRef* pRef = (*pData)[n];
- SbxVariable* p = *pRef;
- if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
- nElem++;
- }
- rStrm << (UINT16) nElem;
- for( n = 0; n < pData->size(); n++ )
- {
- SbxVariableRef* pRef = (*pData)[n];
- SbxVariable* p = *pRef;
- if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
- {
- rStrm << (UINT16) n;
- if( !p->Store( rStrm ) )
- return FALSE;
- }
- }
- return StorePrivateData( rStrm );
-}
-
// #100883 Method to set method directly to parameter array
void SbxArray::PutDirect( SbxVariable* pVar, UINT32 nIdx )
{
@@ -766,17 +739,6 @@ BOOL SbxDimArray::LoadData( SvStream& rStrm, USHORT nVer )
return SbxArray::LoadData( rStrm, nVer );
}
-BOOL SbxDimArray::StoreData( SvStream& rStrm ) const
-{
- rStrm << (INT16) nDim;
- for( short i = 0; i < nDim; i++ )
- {
- short lb, ub;
- GetDim( i, lb, ub );
- rStrm << (INT16) lb << (INT16) ub;
- }
- return SbxArray::StoreData( rStrm );
-}
}
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index b051da5..a15ab3f 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -302,12 +302,6 @@ BOOL SbxBase::LoadData( SvStream&, USHORT )
return FALSE;
}
-BOOL SbxBase::StoreData( SvStream& ) const
-{
- DBG_CHKTHIS( SbxBase, 0 );
- return FALSE;
-}
-
BOOL SbxBase::LoadPrivateData( SvStream&, USHORT )
{
DBG_CHKTHIS( SbxBase, 0 );
@@ -379,21 +373,6 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbxInfo::StoreData( SvStream& rStrm ) const
-{
- rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US );
- rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
- rStrm << nHelpId << aParams.Count();
- for( USHORT i = 0; i < aParams.Count(); i++ )
- {
- SbxParamInfo* p = aParams.GetObject( i );
- rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US );
- rStrm << (UINT16) p->eType
- << (UINT16) p->nFlags
- << (UINT32) p->nUserData;
- }
- return TRUE;
-}
}
diff --git a/binfilter/bf_basic/source/sbx/sbxcoll.cxx b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
index 23c42ae..91167fa 100644
--- a/binfilter/bf_basic/source/sbx/sbxcoll.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
@@ -287,16 +287,6 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
return bRes;
}
-BOOL SbxStdCollection::StoreData( SvStream& rStrm ) const
-{
- BOOL bRes = SbxCollection::StoreData( rStrm );
- if( bRes )
- {
- rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
- rStrm << bAddRemoveOk;
- }
- return bRes;
-}
}
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 1d754d6..adbd1fe 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -620,33 +620,6 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbxObject::StoreData( SvStream& rStrm ) const
-{
- if( !SbxVariable::StoreData( rStrm ) )
- return FALSE;
- XubString aDfltProp;
- if( pDfltProp )
- aDfltProp = pDfltProp->GetName();
- rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
- rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
- ULONG nPos = rStrm.Tell();
- rStrm << (UINT32) 0L;
- if( !StorePrivateData( rStrm ) )
- return FALSE;
- ULONG nNew = rStrm.Tell();
- rStrm.Seek( nPos );
- rStrm << (UINT32) ( nNew - nPos );
- rStrm.Seek( nNew );
- if( !pMethods->Store( rStrm ) )
- return FALSE;
- if( !pProps->Store( rStrm ) )
- return FALSE;
- if( !pObjs->Store( rStrm ) )
- return FALSE;
- ((SbxObject*) this)->SetModified( FALSE );
- return TRUE;
-}
-
XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
const SbxObject* )
{
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index a96f369..df37d89 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -1599,106 +1599,6 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
return TRUE;
}
-BOOL SbxValue::StoreData( SvStream& r ) const
-{
- UINT16 nType = sal::static_int_cast< UINT16 >(aData.eType);
- r << nType;
- switch( nType & 0x0FFF )
- {
- case SbxBOOL:
- case SbxINTEGER:
- r << aData.nInteger; break;
- case SbxLONG:
- r << aData.nLong; break;
- case SbxDATE:
- // #49935: Als double speichern, sonst Fehler beim Einlesen
- ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE );
- r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US );
- ((SbxValue*)this)->aData.eType = (SbxDataType)nType;
- break;
- case SbxSINGLE:
- case SbxDOUBLE:
- r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US );
- break;
- case SbxULONG64:
- {
- r << aData.nULong64.nHigh << aData.nULong64.nLow;
- break;
- }
- case SbxLONG64:
- case SbxCURRENCY:
- {
- r << aData.nLong64.nHigh << aData.nLong64.nLow;
- break;
- }
- case SbxSTRING:
- if( aData.pString )
- {
- r.WriteByteString( *aData.pString, RTL_TEXTENCODING_ASCII_US );
- }
- else
- {
- String aEmpty;
- r.WriteByteString( aEmpty, RTL_TEXTENCODING_ASCII_US );
- }
- break;
- case SbxERROR:
- case SbxUSHORT:
- r << aData.nUShort; break;
- case SbxOBJECT:
- // sich selbst als Objektptr speichern geht nicht!
- if( aData.pObj )
- {
- if( PTR_CAST(SbxValue,aData.pObj) != this )
- {
- r << (BYTE) 1;
- return aData.pObj->Store( r );
- }
- else
- r << (BYTE) 2;
- }
- else
- r << (BYTE) 0;
- break;
- case SbxCHAR:
- {
- char c = sal::static_int_cast< char >(aData.nChar);
- r << c;
- break;
- }
- case SbxBYTE:
- r << aData.nByte; break;
- case SbxULONG:
- r << aData.nULong; break;
- case SbxINT:
- {
- BYTE n = SAL_TYPES_SIZEOFINT;
- r << n << (sal_Int32)aData.nInt;
- break;
- }
- case SbxUINT:
- {
- BYTE n = SAL_TYPES_SIZEOFINT;
- r << n << (sal_uInt32)aData.nUInt;
- break;
- }
- case SbxEMPTY:
- case SbxNULL:
- case SbxVOID:
- break;
- case SbxDATAOBJECT:
- r << aData.nLong;
- break;
- // #78919 For backwards compatibility
- case SbxWSTRING:
- case SbxWCHAR:
- break;
- default:
- DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
- return FALSE;
- }
- return TRUE;
-}
}
diff --git a/binfilter/bf_basic/source/sbx/sbxvar.cxx b/binfilter/bf_basic/source/sbx/sbxvar.cxx
index 50814bf..62079fd 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -414,47 +414,6 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
return TRUE;
}
-BOOL SbxVariable::StoreData( SvStream& rStrm ) const
-{
- rStrm << (BYTE) 0xFF; // Marker
- BOOL bValStore;
- if( this->IsA( TYPE(SbxMethod) ) )
- {
- // #50200 Verhindern, dass Objekte, die zur Laufzeit als Return-Wert
- // in der Methode als Value gespeichert sind, mit gespeichert werden
- SbxVariable* pThis = (SbxVariable*)this;
- USHORT nSaveFlags = GetFlags();
- pThis->SetFlag( SBX_WRITE );
- pThis->SbxValue::Clear();
- pThis->SetFlags( nSaveFlags );
-
- // Damit die Methode in keinem Fall ausgefuehrt wird!
- // CAST, um const zu umgehen!
- pThis->SetFlag( SBX_NO_BROADCAST );
- bValStore = SbxValue::StoreData( rStrm );
- pThis->ResetFlag( SBX_NO_BROADCAST );
- }
- else
- bValStore = SbxValue::StoreData( rStrm );
- if( !bValStore )
- return FALSE;
- rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US );
- rStrm << nUserData;
- if( pInfo.Is() )
- {
- rStrm << (BYTE) 2; // Version 2: mit UserData!
- pInfo->StoreData( rStrm );
- }
- else
- rStrm << (BYTE) 0;
- // Privatdaten nur speichern, wenn es eine SbxVariable ist
- if( GetClass() == SbxCLASS_VARIABLE )
- return StorePrivateData( rStrm );
- else
- return TRUE;
-}
-
-////////////////////////////// SbxInfo ///////////////////////////////////
SbxInfo::SbxInfo() : aHelpFile(), nHelpId( 0 ), aParams()
{}
diff --git a/binfilter/bf_svx/source/editeng/editobj2.hxx b/binfilter/bf_svx/source/editeng/editobj2.hxx
index 4272738..fe68563 100644
--- a/binfilter/bf_svx/source/editeng/editobj2.hxx
+++ b/binfilter/bf_svx/source/editeng/editobj2.hxx
@@ -192,7 +192,7 @@ private:
protected:
void DeleteContents();
- virtual void StoreData( SvStream& rOStream ) const;
+ virtual void StoreData( SvStream& rOStream ) const {}
virtual void CreateData( SvStream& rIStream );
BOOL ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily,
const String& rNewName, SfxStyleFamily eNewFamily );
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 38f547a..d0e3900 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -366,11 +366,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlo
}
-void EditTextObject::StoreData( SvStream& /*rOStream*/ ) const
-{
- OSL_FAIL( "StoreData: Basisklasse!" );
-}
-
void EditTextObject::CreateData( SvStream& /*rIStream*/ )
{
OSL_FAIL( "CreateData: Basisklasse!" );
@@ -704,187 +699,6 @@ void BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily );
}
-void BinTextObject::StoreData( SvStream& rOStream ) const
-{
- USHORT nVer = 602;
- rOStream << nVer;
-
- rOStream << bOwnerOfPool;
-
- // Erst den Pool speichern, spaeter nur noch Surregate
- if ( bOwnerOfPool )
- {
- GetPool()->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 );
- GetPool()->Store( rOStream );
- }
-
- // Aktuelle Zeichensatz speichern...
- // #90477# GetSOStoreTextEncoding: Bug in 5.2, when default char set is multi byte text encoding
- rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), (USHORT) rOStream.GetVersion() );
- rOStream << (USHORT) eEncoding;
-
- // Die Anzahl der Absaetze...
- USHORT nParagraphs = GetContents().Count();
- rOStream << nParagraphs;
-
- char cFeatureConverted = ByteString( CH_FEATURE, eEncoding ).GetChar(0);
-
- // Die einzelnen Absaetze...
- for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
- {
- ContentInfo* pC = GetContents().GetObject( nPara );
-
- // Text...
- ByteString aText( pC->GetText(), eEncoding );
-
- // Symbols?
- BOOL bSymbolPara = FALSE;
- if ( pC->GetLoadStoreTempInfos() && pC->GetLoadStoreTempInfos()->bSymbolParagraph_Store )
- {
- DBG_ASSERT( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_ON, "Why bSymbolParagraph_Store?" );
- aText = ByteString( pC->GetText(), RTL_TEXTENCODING_SYMBOL );
- bSymbolPara = TRUE;
- }
- else if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
- {
- const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO );
- if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
- {
- aText = ByteString( pC->GetText(), RTL_TEXTENCODING_SYMBOL );
- bSymbolPara = TRUE;
- }
- }
- for ( USHORT nA = 0; nA < pC->GetAttribs().Count(); nA++ )
- {
- XEditAttribute* pAttr = pC->GetAttribs().GetObject( nA );
-
- if ( pAttr->GetItem()->Which() == EE_CHAR_FONTINFO )
- {
- const SvxFontItem& rFontItem = (const SvxFontItem&)*pAttr->GetItem();
- if ( ( !bSymbolPara && ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) )
- || ( bSymbolPara && ( rFontItem.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) )
- {
- // Not correctly converted
- String aPart( pC->GetText(), pAttr->GetStart(), pAttr->GetEnd() - pAttr->GetStart() );
- ByteString aNew( aPart, rFontItem.GetCharSet() );
- aText.Erase( pAttr->GetStart(), pAttr->GetEnd() - pAttr->GetStart() );
- aText.Insert( aNew, pAttr->GetStart() );
- }
-
- // #88414# Convert StarSymbol back to StarBats
- FontToSubsFontConverter hConv = CreateFontToSubsFontConverter( rFontItem.GetFamilyName(), FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS );
- if ( hConv )
- {
- // Don't create a new Attrib with StarBats font, MBR changed the
- // SvxFontItem::Store() to store StarBats instead of StarSymbol!
- for ( USHORT nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ )
- {
- sal_Unicode cOld = pC->GetText().GetChar( nChar );
- char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL );
- if ( cConv )
- aText.SetChar( nChar, cConv );
- }
-
- DestroyFontToSubsFontConverter( hConv );
- }
- }
- }
-
- // #88414# Convert StarSymbol back to StarBats
- // StarSymbol as paragraph attribute or in StyleSheet?
-
- FontToSubsFontConverter hConv = NULL;
- if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
- {
- hConv = CreateFontToSubsFontConverter( ((const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO )).GetFamilyName(), FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS );
- }
- else if ( pC->GetStyle().Len() && pC->GetLoadStoreTempInfos() )
- {
- hConv = pC->GetLoadStoreTempInfos()->hOldSymbolConv_Store;
- }
-
- if ( hConv )
- {
- for ( USHORT nChar = 0; nChar < pC->GetText().Len(); nChar++ )
- {
- if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) )
- {
- sal_Unicode cOld = pC->GetText().GetChar( nChar );
- char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL );
- if ( cConv )
- aText.SetChar( nChar, cConv );
- }
- }
-
- DestroyFontToSubsFontConverter( hConv );
-
- if ( pC->GetLoadStoreTempInfos() )
- pC->GetLoadStoreTempInfos()->hOldSymbolConv_Store = NULL;
- }
-
-
- // Convert CH_FEATURE to CH_FEATURE_OLD
- aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD );
- rOStream.WriteByteString( aText );
-
- // StyleName und Family...
- rOStream.WriteByteString( ByteString( pC->GetStyle(), eEncoding ) );
- rOStream << (USHORT)pC->GetFamily();
-
- // Absatzattribute...
- pC->GetParaAttribs().Store( rOStream );
-
- // Die Anzahl der Attribute...
- USHORT nAttribs = pC->GetAttribs().Count();
- rOStream << nAttribs;
-
- // Und die einzelnen Attribute
- // Items als Surregate => immer 8 Byte pro Attrib
- // Which = 2; Surregat = 2; Start = 2; End = 2;
- for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
- {
- XEditAttribute* pX = pC->GetAttribs().GetObject( nAttr );
-
- rOStream << pX->GetItem()->Which();
- GetPool()->StoreSurrogate( rOStream, pX->GetItem() );
- rOStream << pX->GetStart();
- rOStream << pX->GetEnd();
- }
- }
-
- // Ab 400:
- rOStream << nMetric;
-
- // Ab 600
- rOStream << nUserType;
- rOStream << nObjSettings;
-
- // Ab 601
- rOStream << bVertical;
-
- // Ab 602
- rOStream << nScriptType;
-
- rOStream << bStoreUnicodeStrings;
- if ( bStoreUnicodeStrings )
- {
- for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
- {
- ContentInfo* pC = GetContents().GetObject( nPara );
- USHORT nL = pC->GetText().Len();
- rOStream << nL;
- rOStream.Write( pC->GetText().GetBuffer(), nL*sizeof(sal_Unicode) );
-
- // #91575# StyleSheetName must be Unicode too!
- // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed...
- // If needed, change nL back to ULONG and increase version...
- nL = pC->GetStyle().Len();
- rOStream << nL;
- rOStream.Write( pC->GetStyle().GetBuffer(), nL*sizeof(sal_Unicode) );
- }
- }
-}
-
void BinTextObject::CreateData( SvStream& rIStream )
{
rIStream >> nVersion;
@@ -1216,8 +1030,6 @@ void BinTextObject::PrepareStore( SfxStyleSheetPool* pStyleSheetPool )
}
// SymbolConvertion because of StyleSheet?
- // Cannot be checked in StoreData, no StyleSheetPool, so do it here...
-
pC->DestroyLoadStoreTempInfos(); // Maybe old infos, if somebody is not calling FinishLoad after CreateData, but PrepareStore...
if ( ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_ON ) && pC->aStyle.Len() && pStyleSheetPool )
diff --git a/binfilter/inc/bf_basic/sbmeth.hxx b/binfilter/inc/bf_basic/sbmeth.hxx
index 6815ab8..bfc3577 100644
--- a/binfilter/inc/bf_basic/sbmeth.hxx
+++ b/binfilter/inc/bf_basic/sbmeth.hxx
@@ -60,7 +60,7 @@ class SbMethod : public SbxMethod
SbMethod( const String&, SbxDataType, SbModule* );
SbMethod( const SbMethod& );
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
virtual ~SbMethod();
public:
diff --git a/binfilter/inc/bf_basic/sbmod.hxx b/binfilter/inc/bf_basic/sbmod.hxx
index c2a3569..419efe5 100644
--- a/binfilter/inc/bf_basic/sbmod.hxx
+++ b/binfilter/inc/bf_basic/sbmod.hxx
@@ -48,7 +48,7 @@ class SbModuleImpl;
class SbModule : public SbxObject
{
- friend class TestToolObj; // somit können Module nach laden zur Laufzeit initialisiert werden
+ friend class TestToolObj; // somit k?nen Module nach laden zur Laufzeit initialisiert werden
friend class SbiCodeGen;
friend class SbMethod;
friend class SbiRuntime;
@@ -71,7 +71,7 @@ protected:
const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT&,
BOOL bFollowJumps, const SbiImage* pImg=NULL ) const;
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
virtual BOOL LoadCompleted();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
diff --git a/binfilter/inc/bf_basic/sbstar.hxx b/binfilter/inc/bf_basic/sbstar.hxx
index 0174d96..fa50524 100644
--- a/binfilter/inc/bf_basic/sbstar.hxx
+++ b/binfilter/inc/bf_basic/sbstar.hxx
@@ -79,7 +79,7 @@ private:
BOOL RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
#endif
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
protected:
diff --git a/binfilter/inc/bf_basic/sbx.hxx b/binfilter/inc/bf_basic/sbx.hxx
index a2922b9..ffa4de5 100644
--- a/binfilter/inc/bf_basic/sbx.hxx
+++ b/binfilter/inc/bf_basic/sbx.hxx
@@ -110,7 +110,7 @@ class SbxInfo : public SvRefBase
protected:
BOOL LoadData( SvStream&, USHORT );
- BOOL StoreData( SvStream& ) const;
+ BOOL StoreData( SvStream& ) const {return FALSE;}
virtual ~SbxInfo();
public:
SbxInfo();
@@ -188,7 +188,7 @@ protected:
SbxDataType eType; // Datentyp des Arrays
virtual ~SbxArray();
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
@@ -243,7 +243,7 @@ protected:
UINT32 Offset32( const INT32* );
UINT32 Offset32( SbxArray* );
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
virtual ~SbxDimArray();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
@@ -314,7 +314,7 @@ protected:
BOOL bAddRemoveOk;
virtual ~SbxStdCollection();
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
virtual void CollAdd( SbxArray* pPar );
virtual void CollRemove( SbxArray* pPar );
public:
diff --git a/binfilter/inc/bf_basic/sbxcore.hxx b/binfilter/inc/bf_basic/sbxcore.hxx
index ee7d072..6e78047 100644
--- a/binfilter/inc/bf_basic/sbxcore.hxx
+++ b/binfilter/inc/bf_basic/sbxcore.hxx
@@ -90,7 +90,7 @@ class SbxBase : virtual public SvRefBase
SbxBaseImpl* mpSbxBaseImpl; // Impl data
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
protected:
USHORT nFlags; // Flag-Bits
diff --git a/binfilter/inc/bf_basic/sbxobj.hxx b/binfilter/inc/bf_basic/sbxobj.hxx
index 02f4130..225b544 100644
--- a/binfilter/inc/bf_basic/sbxobj.hxx
+++ b/binfilter/inc/bf_basic/sbxobj.hxx
@@ -58,7 +58,7 @@ protected:
String aClassName; // Klassenname
String aDfltPropName;
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
virtual ~SbxObject();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
diff --git a/binfilter/inc/bf_basic/sbxvar.hxx b/binfilter/inc/bf_basic/sbxvar.hxx
index 84ea2e2..d543f46 100644
--- a/binfilter/inc/bf_basic/sbxvar.hxx
+++ b/binfilter/inc/bf_basic/sbxvar.hxx
@@ -262,7 +262,7 @@ protected:
virtual void Broadcast( ULONG ); // Broadcast-Call
virtual ~SbxValue();
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
TYPEINFO();
@@ -453,7 +453,7 @@ protected:
SbxObject* pParent; // aktuell zugeordnetes Objekt
virtual ~SbxVariable();
virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual BOOL StoreData( SvStream& ) const {return FALSE;}
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
TYPEINFO();
diff --git a/binfilter/inc/bf_svx/editobj.hxx b/binfilter/inc/bf_svx/editobj.hxx
index b999855..91cde32 100644
--- a/binfilter/inc/bf_svx/editobj.hxx
+++ b/binfilter/inc/bf_svx/editobj.hxx
@@ -58,7 +58,7 @@ protected:
EditTextObject( USHORT nWhich );
EditTextObject( const EditTextObject& r );
- virtual void StoreData( SvStream& rOStream ) const;
+ virtual void StoreData( SvStream& rOStream ) const {}
virtual void CreateData( SvStream& rIStream );
public:
commit 8ebe69975e2ad5f9e41905948f94ad3ba6721aa7
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 17 20:22:57 2011 +0200
deletion of unused functions in binfilter/bf_sc
these functions were not called and found grabing for functions
calling Store(...) function, which do not perform anything useful.
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index 1345c04..4282f00 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -858,20 +858,6 @@ using namespace ::com::sun::star;
/*N*/ return bConverted;
/*N*/ }
-/*N*/ void lcl_StoreOldFields( ScFieldChangerEditEngine& rEngine,
-/*N*/ const EditTextObject* pArea, SvStream& rStream )
-/*N*/ {
-/*N*/ rEngine.SetText( *pArea );
-/*N*/ if ( rEngine.ConvertFields() )
-/*N*/ {
-/*N*/ EditTextObject* pObj = rEngine.CreateTextObject();
-/*N*/ pObj->Store( rStream );
-/*N*/ delete pObj;
-/*N*/ }
-/*N*/ else
-/*N*/ pArea->Store( rStream );
-/*N*/ }
-
/*N*/ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
/*N*/ {
/*N*/ delete pLeftArea;
diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
index 7ab6889..310bad9 100644
--- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
@@ -251,51 +251,6 @@ namespace binfilter {
/*N*/ // Formelzellen werden erst bei IsValid angelegt
/*N*/ }
-/*N*/ void ScConditionEntry::StoreCondition(SvStream& rStream, ScMultipleWriteHeader& rHdr) const
-/*N*/ {
-/*N*/ rHdr.StartEntry();
-/*N*/
-/*N*/ // 1) Byte fuer die Operation
-/*N*/ // 2) USHORT fuer Optionen
-/*N*/ // 3) Byte, ob Wert, String oder Formel folgt
-/*N*/ // 4) double, String oder TokenArray
-/*N*/ // 5) je nach Operation 3 und 4 nochmal
-/*N*/ // vor jedem TokenArray noch die Position als ScAddress
-/*N*/
-/*N*/ rStream << (BYTE) eOp;
-/*N*/ rStream << nOptions;
-/*N*/
-/*N*/ ScConditionValType eType =
-/*N*/ pFormula1 ? SC_VAL_FORMULA : ( bIsStr1 ? SC_VAL_STRING : SC_VAL_VALUE );
-/*N*/ rStream << (BYTE) eType;
-/*N*/ if ( eType == SC_VAL_FORMULA )
-/*N*/ {
-/*N*/ rStream << aSrcPos;
-/*N*/ pFormula1->Store( rStream, aSrcPos );
-/*N*/ }
-/*N*/ else if ( eType == SC_VAL_VALUE )
-/*N*/ rStream << nVal1;
-/*N*/ else
-/*?*/ rStream.WriteByteString( aStrVal1, rStream.GetStreamCharSet() );
-/*N*/
-/*N*/ if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
-/*N*/ {
-/*?*/ eType = pFormula2 ? SC_VAL_FORMULA : ( bIsStr2 ? SC_VAL_STRING : SC_VAL_VALUE );
-/*?*/ rStream << (BYTE) eType;
-/*?*/ if ( eType == SC_VAL_FORMULA )
-/*?*/ {
-/*?*/ rStream << aSrcPos;
-/*?*/ pFormula2->Store( rStream, aSrcPos );
-/*?*/ }
-/*?*/ else if ( eType == SC_VAL_VALUE )
-/*?*/ rStream << nVal2;
-/*?*/ else
-/*?*/ rStream.WriteByteString( aStrVal2, rStream.GetStreamCharSet() );
-/*N*/ }
-/*N*/
-/*N*/ rHdr.EndEntry();
-/*N*/ }
-
/*N*/ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2,
/*N*/ BOOL bEnglish, BOOL bCompileXML, BOOL bTextToReal )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index aefc868..f046cd3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -319,47 +319,6 @@ namespace binfilter {
#define SPELL_MAXTEST_ALL 3
#define SPELL_MAXCELLS 256
-//------------------------------------------------------------------------
-
-/*N*/ void ScDocument::SaveDdeLinks(SvStream& rStream) const
-/*N*/ {
-/*N*/ // bei 4.0-Export alle mit Modus != DEFAULT weglassen
-/*N*/ BOOL bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 );
-/*N*/
-/*N*/ const ::binfilter::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-/*N*/ USHORT nCount = rLinks.Count();
-/*N*/
-/*N*/ // erstmal zaehlen...
-/*N*/
-/*N*/ USHORT nDdeCount = 0;
-/*N*/ USHORT i;
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ {
-/*N*/ ::binfilter::SvBaseLink* pBase = *rLinks[i];
-/*N*/ if (pBase->ISA(ScDdeLink))
-/*?*/ if ( !bExport40 || ((ScDdeLink*)pBase)->GetMode() == SC_DDE_DEFAULT )
-/*?*/ ++nDdeCount;
-/*N*/ }
-/*N*/
-/*N*/ // Header
-/*N*/
-/*N*/ ScMultipleWriteHeader aHdr( rStream );
-/*N*/ rStream << nDdeCount;
-/*N*/
-/*N*/ // Links speichern
-/*N*/
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ {
-/*N*/ ::binfilter::SvBaseLink* pBase = *rLinks[i];
-/*N*/ if (pBase->ISA(ScDdeLink))
-/*N*/ {
-/*?*/ ScDdeLink* pLink = (ScDdeLink*)pBase;
-/*?*/ if ( !bExport40 || pLink->GetMode() == SC_DDE_DEFAULT )
-/*?*/ pLink->Store( rStream, aHdr );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ void ScDocument::LoadDdeLinks(SvStream& rStream)
/*N*/ {
/*N*/ ScMultipleReadHeader aHdr( rStream );
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index 023b134..6f95736 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -252,19 +252,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScDocument::StoreDrawLayer(SvStream& rStream) const
-/*N*/ {
-/*N*/ if (pDrawLayer)
-/*N*/ {
-/*N*/
-/*N*/ pDrawLayer->SetSaveCompressed( FALSE );
-/*N*/ pDrawLayer->SetSaveNative( FALSE );
-/*N*/
-/*N*/ pDrawLayer->GetItemPool().SetFileFormatVersion( (USHORT)rStream.GetVersion() );
-/*N*/ pDrawLayer->Store(rStream);
-/*N*/ }
-/*N*/ }
-
/*N*/ BOOL ScDocument::DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const
/*N*/ {
/*N*/ return pDrawLayer->GetPrintArea( rRange, bSetHor, bSetVer );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 8785366..e88e719 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2707,83 +2707,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bRet;
/*N*/ }
-
-/*N*/ BOOL ScDocument::SavePool( SvStream& rStream ) const
-/*N*/ {
-/*N*/ xPoolHelper->GetDocPool()->SetFileFormatVersion( (USHORT)rStream.GetVersion() );
-/*N*/
-/*N*/ USHORT nOldBufSize = rStream.GetBufferSize();
-/*N*/ rStream.SetBufferSize( 32768 );
-/*N*/ CharSet eOldSet = rStream.GetStreamCharSet();
-/*N*/ CharSet eStoreCharSet = ::GetSOStoreTextEncoding(
-/*N*/ gsl_getSystemTextEncoding(), (USHORT)rStream.GetVersion() );
-/*N*/ rStream.SetStreamCharSet( eStoreCharSet );
-/*N*/
-/*N*/ // ::com::press-Mode fuer Grafiken in Brush-Items (Hintergrund im Seitenformat)
-/*N*/
-/*N*/ USHORT nComprMode = rStream.GetCompressMode() & ~(COMPRESSMODE_ZBITMAP | COMPRESSMODE_NATIVE);
-/*N*/ BOOL bNative = FALSE;
-/*N*/ BOOL bCompr = FALSE;
-/*N*/
-/*N*/ if ( rStream.GetVersion() >= SOFFICE_FILEFORMAT_40 && bCompr )
-/*N*/ nComprMode |= COMPRESSMODE_ZBITMAP; // komprimiert ab 4.0
-/*N*/ if ( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 && bNative )
-/*N*/ nComprMode |= COMPRESSMODE_NATIVE; // Originalformat ab 5.0
-/*N*/ rStream.SetCompressMode( nComprMode );
-/*N*/
-/*N*/ {
-/*N*/ rStream << (USHORT) SCID_NEWPOOLS;
-/*N*/ ScWriteHeader aHdr( rStream );
-/*N*/
-/*N*/ {
-/*N*/ rStream << (USHORT) SCID_CHARSET;
-/*N*/ ScWriteHeader aSetHdr( rStream, 2 );
-/*N*/ rStream << (BYTE) 0 // dummy, old System::GetGUIType()
-/*N*/ << (BYTE) eStoreCharSet;
-/*N*/ }
-/*N*/
-/*N*/ // Force the default style's name to be "Standard" for all languages in the file.
-/*N*/ // This is needed for versions up to 5.1, to find the default pattern's style in
-/*N*/ // the UpdateStyleSheet call.
-/*N*/ // #89078# this has to be set for the DocPool save, too, so the default style name
-/*N*/ // is adjusted for the patterns, or a wrong style would be used if other styles
-/*N*/ // match the default style's name after CharacterSet conversion.
-/*N*/
-/*N*/ String aFileStdName = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD));
-/*N*/ if ( aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
-/*N*/ xPoolHelper->GetStylePool()->SetForceStdName( &aFileStdName );
-/*N*/
-/*N*/ {
-/*N*/ rStream << (USHORT) SCID_DOCPOOL;
-/*N*/ ScWriteHeader aDocPoolHdr( rStream );
-/*N*/ xPoolHelper->GetDocPool()->Store( rStream );
-/*N*/ }
-/*N*/
-/*N*/ {
-/*N*/ rStream << (USHORT) SCID_STYLEPOOL;
-/*N*/ ScWriteHeader aStylePoolHdr( rStream );
-/*N*/ xPoolHelper->GetStylePool()->SetSearchMask( SFX_STYLE_FAMILY_ALL );
-/*N*/
-/*N*/ xPoolHelper->GetStylePool()->Store( rStream, FALSE );
-/*N*/ }
-/*N*/
-/*N*/ xPoolHelper->GetStylePool()->SetForceStdName( NULL );
-/*N*/
-/*N*/ if ( rStream.GetVersion() >= SOFFICE_FILEFORMAT_50 )
-/*N*/ {
-/*N*/ rStream << (USHORT) SCID_EDITPOOL;
-/*N*/ ScWriteHeader aEditPoolHdr( rStream );
-/*N*/ xPoolHelper->GetEditPool()->SetFileFormatVersion( (USHORT)rStream.GetVersion() );
-/*N*/ xPoolHelper->GetEditPool()->Store( rStream );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ rStream.SetStreamCharSet( eOldSet );
-/*N*/ rStream.SetBufferSize( nOldBufSize );
-/*N*/ return TRUE;
-/*N*/ }
-
-
/*N*/ long ScDocument::GetCellCount() const
/*N*/ {
/*N*/ long nCellCount = 0L;
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index cb6626a..ed835ac 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -540,55 +540,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ BOOL ScDPObject::StoreNew( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
-/*N*/ {
-/*N*/ // save all data
-/*N*/
-/*N*/ rHdr.StartEntry();
-/*N*/
-/*N*/ if ( pImpDesc )
-/*N*/ {
-/*N*/ rStream << (BYTE) SC_DP_SOURCE_DATABASE;
-/*N*/ rStream.WriteByteString( pImpDesc->aDBName, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( pImpDesc->aObject, rStream.GetStreamCharSet() );
-/*N*/ rStream << pImpDesc->nType; // USHORT
-/*N*/ rStream << pImpDesc->bNative;
-/*N*/ }
-/*N*/ else if ( pServDesc )
-/*N*/ {
-/*N*/ rStream << (BYTE) SC_DP_SOURCE_SERVICE;
-/*N*/ rStream.WriteByteString( pServDesc->aServiceName, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( pServDesc->aParSource, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( pServDesc->aParName, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( pServDesc->aParUser, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( pServDesc->aParPass, rStream.GetStreamCharSet() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if (!pSheetDesc)
-/*N*/ {
-/*N*/ OSL_FAIL("no source descriptor");
-/*N*/ ((ScDPObject*)this)->pSheetDesc = new ScSheetSourceDesc; // dummy defaults
-/*N*/ }
-/*N*/
-/*N*/ rStream << (BYTE) SC_DP_SOURCE_SHEET;
-/*N*/ rStream << pSheetDesc->aSourceRange;
-/*N*/ pSheetDesc->aQueryParam.Store( rStream );
-/*N*/ }
-/*N*/
-/*N*/ rStream << aOutRange;
-/*N*/
-/*N*/ DBG_ASSERT(pSaveData, "ScDPObject::StoreNew no SaveData");
-/*N*/ pSaveData->Store( rStream );
-/*N*/
-/*N*/ // additional data starting from 561b
-/*N*/ rStream.WriteByteString( aTableName, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( aTableTag, rStream.GetStreamCharSet() );
-/*N*/
-/*N*/ rHdr.EndEntry();
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/
/*N*/ BOOL ScDPObject::LoadNew(SvStream& rStream, ScMultipleReadHeader& rHdr )
/*N*/ {
/*N*/ rHdr.StartEntry();
@@ -647,84 +598,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return TRUE;
/*N*/ }
-/*N*/ BOOL ScDPObject::StoreOld( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
-/*N*/ {
-/*N*/ // write compatible data for office 5.1 and below
-/*N*/
-/*N*/ DBG_ASSERT( pSheetDesc, "StoreOld: !pSheetDesc" );
-/*N*/ ScRange aStoreRange;
-/*N*/ ScQueryParam aStoreQuery;
-/*N*/ if (pSheetDesc)
-/*N*/ {
-/*N*/ aStoreRange = pSheetDesc->aSourceRange;
-/*N*/ aStoreQuery = pSheetDesc->aQueryParam;
-/*N*/ }
-/*N*/
-/*N*/ ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers
-/*N*/
-/*N*/ rHdr.StartEntry();
-/*N*/
-/*N*/ rStream << (BOOL) TRUE; // bHasHeader
-/*N*/
-/*N*/ rStream << aStoreRange.aStart.Col();
-/*N*/ rStream << aStoreRange.aStart.Row();
-/*N*/ rStream << aStoreRange.aEnd.Col();
-/*N*/ rStream << aStoreRange.aEnd.Row();
-/*N*/ rStream << aStoreRange.aStart.Tab();
-/*N*/
-/*N*/ //! make sure aOutRange is initialized
-/*N*/
-/*N*/ rStream << aOutRange.aStart.Col();
-/*N*/ rStream << aOutRange.aStart.Row();
-/*N*/ rStream << aOutRange.aEnd.Col();
-/*N*/ rStream << aOutRange.aEnd.Row();
-/*N*/ rStream << aOutRange.aStart.Tab();
-/*N*/
-/*N*/ BOOL bAddData = ( lcl_GetDataGetOrientation( xSource ) == sheet::DataPilotFieldOrientation_HIDDEN );
-/*N*/
-/*N*/ lcl_SaveOldFieldArr( rStream, xSource, sheet::DataPilotFieldOrientation_ROW, aStoreRange.aStart.Col(), bAddData );
-/*N*/ lcl_SaveOldFieldArr( rStream, xSource, sheet::DataPilotFieldOrientation_COLUMN, aStoreRange.aStart.Col(), FALSE );
-/*N*/ lcl_SaveOldFieldArr( rStream, xSource, sheet::DataPilotFieldOrientation_DATA, aStoreRange.aStart.Col(), FALSE );
-/*N*/
-/*N*/ aStoreQuery.Store( rStream );
-/*N*/
-/*N*/ BOOL bColumnGrand = TRUE;
-/*N*/ BOOL bRowGrand = TRUE;
-/*N*/ BOOL bIgnoreEmpty = FALSE;
-/*N*/ BOOL bRepeatIfEmpty = FALSE;
-/*N*/
-/*N*/ uno::Reference<beans::XPropertySet> xProp( xSource, uno::UNO_QUERY );
-/*N*/ if (xProp.is())
-/*N*/ {
-/*N*/ bColumnGrand = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), TRUE );
-/*N*/ bRowGrand = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), TRUE );
-/*N*/
-/*N*/ // following properties may be missing for external sources
-/*N*/ bIgnoreEmpty = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)) );
-/*N*/ bRepeatIfEmpty = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)) );
-/*N*/ }
-/*N*/
-/*N*/ rStream << bIgnoreEmpty; // bIgnoreEmpty
-/*N*/ rStream << bRepeatIfEmpty; // bDetectCat
-/*N*/
-/*N*/ rStream << bColumnGrand; // bMakeTotalCol
-/*N*/ rStream << bRowGrand; // bMakeTotalRow
-/*N*/
-/*N*/ if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 )
-/*N*/ {
-/*N*/ rStream.WriteByteString( aTableName, rStream.GetStreamCharSet() );
-/*N*/ rStream.WriteByteString( aTableTag, rStream.GetStreamCharSet() );
-/*N*/ rStream << (USHORT)0; // nColNameCount
-/*N*/ }
-/*N*/
-/*N*/ rHdr.EndEntry();
-/*N*/ return TRUE;
-/*N*/ }
-
/*N*/ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
/*N*/ {
/*N*/ ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers
@@ -952,45 +825,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
-/*N*/ BOOL ScDPCollection::StoreOld( SvStream& rStream ) const
-/*N*/ {
-/*N*/ BOOL bSuccess = TRUE;
-/*N*/
-/*N*/ USHORT nSheetCount = 0;
-/*N*/ USHORT i;
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ if ( ((const ScDPObject*)At(i))->IsSheetData() )
-/*N*/ ++nSheetCount;
-/*N*/
-/*N*/ ScMultipleWriteHeader aHdr( rStream );
-/*N*/
-/*N*/ rStream << nSheetCount; // only tables from sheet data
-/*N*/
-/*N*/ for (i=0; i<nCount && bSuccess; i++)
-/*N*/ {
-/*N*/ const ScDPObject* pObj = (const ScDPObject*)At(i);
-/*N*/ if ( pObj->IsSheetData() )
-/*N*/ bSuccess = pObj->StoreOld( rStream, aHdr );
-/*N*/ }
-/*N*/
-/*N*/ return bSuccess;
-/*N*/ }
-
-/*N*/ BOOL ScDPCollection::StoreNew( SvStream& rStream ) const
-/*N*/ {
-/*N*/ BOOL bSuccess = TRUE;
-/*N*/
-/*N*/ ScMultipleWriteHeader aHdr( rStream );
-/*N*/
-/*N*/ rStream << (long)SC_DP_VERSION_CURRENT;
-/*N*/ rStream << (long)nCount;
-/*N*/
-/*N*/ for (USHORT i=0; i<nCount && bSuccess; i++)
-/*N*/ bSuccess = ((const ScDPObject*)At(i))->StoreNew( rStream, aHdr );
-/*N*/
-/*N*/ return bSuccess;
-/*N*/ }
-/*N*/
/*N*/ BOOL ScDPCollection::LoadNew( SvStream& rStream )
/*N*/ {
/*N*/ BOOL bSuccess = TRUE;
diff --git a/binfilter/inc/bf_sc/conditio.hxx b/binfilter/inc/bf_sc/conditio.hxx
index fb69047..a54caf6 100644
--- a/binfilter/inc/bf_sc/conditio.hxx
+++ b/binfilter/inc/bf_sc/conditio.hxx
@@ -106,8 +106,6 @@ class ScConditionEntry
protected:
ScConditionEntry( SvStream& rStream, ScMultipleReadHeader& rHdr,
ScDocument* pDocument );
- void StoreCondition(SvStream& rStream, ScMultipleWriteHeader& rHdr) const;
-
public:
ScConditionEntry( ScConditionMode eOper,
const String& rExpr1, const String& rExpr2,
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index 9613d98..d0f66e0 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -1021,7 +1021,6 @@ public:
ScRange GetRange( USHORT nTab, const Rectangle& rMMRect );
BOOL LoadPool( SvStream& rStream, BOOL bLoadRefCounts );
- BOOL SavePool( SvStream& rStream ) const;
BOOL Load( SvStream& rStream, ScProgress* pProgress );
BOOL Save( SvStream& , ScProgress* ) const {return false;}
@@ -1293,14 +1292,12 @@ private: // CLOOK-Impl-Methoden
void DeleteDrawLayer();
void DeleteColorTable();
void LoadDrawLayer(SvStream& rStream);
- void StoreDrawLayer(SvStream& rStream) const;
BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const;
void UpdateDrawPrinter();
void UpdateDrawLanguages();
void LoadDdeLinks(SvStream& rStream);
- void SaveDdeLinks(SvStream& rStream) const;
void LoadAreaLinks(SvStream& rStream);
void SaveAreaLinks(SvStream& rStream) const;
diff --git a/binfilter/inc/bf_sc/dpobject.hxx b/binfilter/inc/bf_sc/dpobject.hxx
index c3dbbfc..022c2da 100644
--- a/binfilter/inc/bf_sc/dpobject.hxx
+++ b/binfilter/inc/bf_sc/dpobject.hxx
@@ -137,10 +137,6 @@ public:
void SetTag(const String& rNew);
const String& GetTag() const { return aTableTag; }
-
-
- BOOL StoreOld(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
- BOOL StoreNew(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
BOOL LoadNew(SvStream& rStream, ScMultipleReadHeader& rHdr );
BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const;
void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource);
@@ -173,8 +169,6 @@ public:
ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);}
- BOOL StoreOld( SvStream& rStream ) const;
- BOOL StoreNew( SvStream& rStream ) const;
BOOL LoadNew( SvStream& rStream );
void ConvertOldTables( ScPivotCollection& rOldColl );
commit 4a75de0ebf1a87d52b7e9de3204495acc78661cc
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Apr 16 22:57:55 2011 +0200
deactivation of Store function in binfilter
the last active functions Store have been deactivated, performing
nothing more and just returning, or returning FALSE if bool is
awaited
deactivation of Store function in binfilter
the last active functions Store have been deactivated, performing
nothing more and just returning, or returning FALSE if bool is
awaited
diff --git a/binfilter/bf_sch/source/core/sch_stlsheet.cxx b/binfilter/bf_sch/source/core/sch_stlsheet.cxx
index 66a59cb..a628162 100644
--- a/binfilter/bf_sch/source/core/sch_stlsheet.cxx
+++ b/binfilter/bf_sch/source/core/sch_stlsheet.cxx
@@ -79,16 +79,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Store
-|*
-\************************************************************************/
-
-/*N*/ void SchStyleSheet::Store(SvStream&)
-/*N*/ {
-/*N*/ }
-
-/*************************************************************************
-|*
|* Parent setzen
|*
\************************************************************************/
diff --git a/binfilter/bf_sd/source/core/sd_stlsheet.cxx b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
index 9941017..aa9cde7 100644
--- a/binfilter/bf_sd/source/core/sd_stlsheet.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
@@ -96,17 +96,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Store
-|*
-\************************************************************************/
-
-/*N*/ void SdStyleSheet::Store(SvStream& rOut)
-/*N*/ {
-/*N*/ SfxStyleSheetBase::Store(rOut);
-/*N*/ }
-
-/*************************************************************************
-|*
|* Parent setzen
|*
\************************************************************************/
diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index fefc0e2..3e0810f 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -232,11 +232,6 @@ void SfxEventConfiguration::RegisterEvent(USHORT nId, const String& rName)
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
-/*?*/ BOOL SfxEventConfigItem_Impl::Store( SotStorage& /*rStorage*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*?*/ }
-
-
//==========================================================================
/*N*/ SfxEventConfigItem_Impl::~SfxEventConfigItem_Impl()
diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
index 86b0b20..a11a015 100644
--- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
+++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
@@ -95,19 +95,6 @@ namespace binfilter {
//--------------------------------------------------------------------
-/*N*/ SvStream& SfxPrinter::Store( SvStream& rStream ) const
-
-/* [Beschreibung]
-
- Speichert das verwendete JobSetup des <SfxPrinter>s.
-*/
-
-/*N*/ {
-/*N*/ return ( rStream << GetJobSetup() );
-/*N*/ }
-
-//--------------------------------------------------------------------
-
/*N*/ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
/* [Beschreibung]
diff --git a/binfilter/inc/bf_sch/stlsheet.hxx b/binfilter/inc/bf_sch/stlsheet.hxx
index 98f5c73..ab7eaa8 100644
--- a/binfilter/inc/bf_sch/stlsheet.hxx
+++ b/binfilter/inc/bf_sch/stlsheet.hxx
@@ -41,7 +41,7 @@ class SchStyleSheet : public SfxStyleSheet
{
protected:
virtual void Load (SvStream& rIn, USHORT nVersion);
- virtual void Store(SvStream& rOut);
+ virtual void Store(SvStream& rOut) {}
public:
TYPEINFO();
diff --git a/binfilter/inc/bf_sd/stlsheet.hxx b/binfilter/inc/bf_sd/stlsheet.hxx
index 6a6c722..42b5405 100644
--- a/binfilter/inc/bf_sd/stlsheet.hxx
+++ b/binfilter/inc/bf_sd/stlsheet.hxx
@@ -38,7 +38,7 @@ class SdStyleSheet : public SfxStyleSheet
{
protected:
virtual void Load (SvStream& rIn, USHORT nVersion);
- virtual void Store(SvStream& rOut);
+ virtual void Store(SvStream& rOut) {}
virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType);
diff --git a/binfilter/inc/bf_sfx2/evntconf.hxx b/binfilter/inc/bf_sfx2/evntconf.hxx
index e0921f5..b0d3eba 100644
--- a/binfilter/inc/bf_sfx2/evntconf.hxx
+++ b/binfilter/inc/bf_sfx2/evntconf.hxx
@@ -155,7 +155,7 @@ public:
void Init( SfxConfigManager* );
virtual int Load(SotStorage&);
- virtual BOOL Store(SotStorage&);
+ virtual BOOL Store(SotStorage&) {return FALSE;}
virtual String GetStreamName() const;
virtual void UseDefault();
void ConfigureEvent( USHORT nPos, SvxMacro* );
diff --git a/binfilter/inc/bf_sfx2/frmdescr.hxx b/binfilter/inc/bf_sfx2/frmdescr.hxx
index 11e1ab6..6ad4445 100644
--- a/binfilter/inc/bf_sfx2/frmdescr.hxx
+++ b/binfilter/inc/bf_sfx2/frmdescr.hxx
@@ -297,9 +297,6 @@ public:
UniString &rText, const ::IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- //virtual SfxPoolItem* Create(SvStream &, USHORT) const;
- //virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- //virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
const SfxFrameProperties& GetProperties() const
{ return aProperties; }
diff --git a/binfilter/inc/bf_sfx2/msgnodei.hxx b/binfilter/inc/bf_sfx2/msgnodei.hxx
index d2241a8..31c8f1b 100644
--- a/binfilter/inc/bf_sfx2/msgnodei.hxx
+++ b/binfilter/inc/bf_sfx2/msgnodei.hxx
@@ -89,7 +89,7 @@ public:
SfxMsgReceiverList_Impl(const SfxMsgReceiverList_Impl&);
void Load( SvStream& );
- void Store( SvStream& ) const;
+ void Store( SvStream& ) const {}
void IncRef() { nRef++; }
void DecRef() { nRef--; if( !nRef ) delete this; }
ULONG GetRefCount() const { return nRef; }
@@ -124,7 +124,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
+ virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const {}
};
@@ -143,7 +143,7 @@ public:
int operator==( const SfxMsgAttachFileList_Impl& rRec ) const;
SfxMsgAttachFile* GetReceiver(ULONG nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
void Load( SvStream& );
- void Store( SvStream& ) const;
+ void Store( SvStream& ) const {}
void IncRef() { nRef++; }
void DecRef() { nRef--; if( !nRef ) delete this; }
ULONG GetRefCount() const { return nRef; }
@@ -177,7 +177,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
+ virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const {}
};
@@ -200,7 +200,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool=0 ) const;
virtual SfxPoolItem* Create( SvStream&, USHORT ) const;
- virtual SvStream& Store( SvStream&, USHORT ) const;
+ virtual SvStream& Store( SvStream&, USHORT ) const {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresentationMetric,
diff --git a/binfilter/inc/bf_sfx2/printer.hxx b/binfilter/inc/bf_sfx2/printer.hxx
index 1453f81..6b04f0c 100644
--- a/binfilter/inc/bf_sfx2/printer.hxx
+++ b/binfilter/inc/bf_sfx2/printer.hxx
@@ -102,7 +102,7 @@ public:
static SfxPrinter* Create( SvStream &rStream, SfxItemSet *pOptions );
- SvStream& Store( SvStream &rStream ) const;
+ SvStream& Store( SvStream &rStream ) const {}
const SfxItemSet& GetOptions() const { return *pOptions; }
diff --git a/binfilter/inc/bf_sfx2/saveopt.hxx b/binfilter/inc/bf_sfx2/saveopt.hxx
index 460165c..f8386c2 100644
--- a/binfilter/inc/bf_sfx2/saveopt.hxx
+++ b/binfilter/inc/bf_sfx2/saveopt.hxx
@@ -78,7 +78,7 @@ private:
protected:
virtual int Load(SvStream&);
- virtual BOOL Store(SvStream&);
+ virtual BOOL Store(SvStream&) {}
virtual void UseDefault();
public:
commit 3daed23c01825bae5f9853949005a9b1e8b73936
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Apr 16 22:41:13 2011 +0200
deactivate Store function in binfilter/bf_svx
these functions do nothing, just return or return FALSE if the
return value should be bool
diff --git a/binfilter/bf_svx/source/editeng/editdoc.hxx b/binfilter/bf_svx/source/editeng/editdoc.hxx
index bbc056e..1095c76 100644
--- a/binfilter/bf_svx/source/editeng/editdoc.hxx
+++ b/binfilter/bf_svx/source/editeng/editdoc.hxx
@@ -709,7 +709,7 @@ public:
EditEngineItemPool( BOOL bPersistenRefCounts );
~EditEngineItemPool();
- virtual SvStream& Store( SvStream& rStream ) const;
+ virtual SvStream& Store( SvStream& rStream ) const {}
};
}//end of namespace binfilter
diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx
index 1141a14..3c2f38d 100644
--- a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx
@@ -1280,7 +1280,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ ContentNode* pNode = GetObject( nNode );
/*N*/ nLen += pNode->Len();
-/*N*/ // Felder k”nnen laenger sein als der Platzhalter im Node.
+/*N*/ // Felder k?nnen laenger sein als der Platzhalter im Node.
/*N*/ const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
/*N*/ for ( USHORT nAttr = rAttrs.Count(); nAttr; )
/*N*/ {
@@ -1965,26 +1965,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ }
-/*N*/ SvStream& EditEngineItemPool::Store( SvStream& rStream ) const
-/*N*/ {
-/*N*/ // Bei einem 3.1-Export muess ein Hack eingebaut werden, da BUG im
-/*N*/ // SfxItemSet::Load, aber nicht nachtraeglich in 3.1 fixbar.
-/*N*/
-/*N*/ // Der eingestellte Range muss nach Store erhalten bleiben, weil dann
-/*N*/ // erst die ItemSets gespeichert werden...
-/*N*/
-/*N*/ long nVersion = rStream.GetVersion();
-/*N*/ BOOL b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) )
-/*N*/ ? TRUE : FALSE;
-/*N*/
-/*N*/ EditEngineItemPool* pThis = (EditEngineItemPool*)this;
-/*N*/ if ( b31Format )
-/*N*/ pThis->SetStoringRange( 3997, 4022 );
-/*N*/ else
-/*N*/ pThis->SetStoringRange( EE_ITEMS_START, EE_ITEMS_END );
-/*N*/
-/*N*/ return SfxItemPool::Store( rStream );
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index a27d056..38f547a 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -327,33 +327,6 @@ void EditTextObject::SetVertical( BOOL /*bVertical*/ )
-BOOL EditTextObject::Store( SvStream& rOStream ) const
-{
- if ( rOStream.GetError() )
- return FALSE;
-
- // Vorspann:
- ULONG nStartPos = rOStream.Tell();
-
- USHORT nLclWhich = Which();
- rOStream << nLclWhich;
-
- sal_uInt32 nStructSz = 0;
- rOStream << nStructSz;
-
- // Eigene Daten:
- StoreData( rOStream );
-
- // Nachspann:
- ULONG nEndPos = rOStream.Tell();
- nStructSz = nEndPos - nStartPos - sizeof( nLclWhich ) - sizeof( nStructSz );
- rOStream.Seek( nStartPos + sizeof( nLclWhich ) );
- rOStream << nStructSz;
- rOStream.Seek( nEndPos );
-
- return rOStream.GetError() ? FALSE : TRUE;
-}
-
EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
{
ULONG nStartPos = rIStream.Tell();
diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx
index 962543c..7d57ed5 100644
--- a/binfilter/bf_svx/source/items/svx_algitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_algitem.cxx
@@ -434,18 +434,6 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const
-/*N*/ {
-/*N*/ rStream << nLeftMargin;
-/*N*/ rStream << nTopMargin;
-/*N*/ rStream << nRightMargin;
-/*N*/ rStream << nBottomMargin;
-/*N*/ return rStream;
-/*N*/ }
-
-
-//------------------------------------------------------------------------
-
/*N*/ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index c20ddfd..54c94d7 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -301,66 +301,6 @@ namespace binfilter {
/*N*/ return 1;
/*N*/ }
-// -----------------------------------------------------------------------
-
-/*N*/ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ // Korrektur bei leerer Bitmap
-/*N*/ if( ( nStyle == BS_BMP ) &&
-/*N*/ ( !pGraphicObject || ( GRAPHIC_NONE == pGraphicObject->GetType() ) || ( GRAPHIC_DEFAULT == pGraphicObject->GetType() ) ) )
-/*N*/ {
-/*?*/ if( pGraphicObject )
-/*?*/ {
-/*?*/ delete( const_cast< SvxBulletItem* >( this )->pGraphicObject );
-/*?*/ const_cast< SvxBulletItem* >( this )->pGraphicObject = NULL;
-/*?*/ }
-/*?*/
-/*?*/ const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE;
-/*N*/ }
-/*N*/
-/*N*/ rStrm << nStyle;
-/*N*/
-/*N*/ if( nStyle != BS_BMP )
-/*N*/ StoreFont( rStrm, aFont );
-/*N*/ else
-/*N*/ {
-/*?*/ ULONG _nStart = rStrm.Tell();
-/*?*/
-/*?*/ // Kleine Vorab-Schaetzung der Groesse...
-/*?*/ USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
-/*?*/ const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() );
-/*?*/ ULONG nBytes = aBmp.GetSizeBytes();
-/*?*/ if ( nBytes < ULONG(0xFF00*nFac) )
-/*?*/ rStrm << aBmp;
-/*?*/
-/*?*/ ULONG nEnd = rStrm.Tell();
-/*?*/ // #67581# Item darf mit Overhead nicht mehr als 64K schreiben,
-/*?*/ // sonst platzt der SfxMultiRecord
-/*?*/ // Dann lieber auf die Bitmap verzichten, ist nur fuer Outliner
-/*?*/ // und auch nur fuer <= 5.0 wichtig.
-/*?*/ // Beim Einlesen merkt der Stream-Operator der Bitmap, dass dort keine steht.
-/*?*/ // Hiermit funktioniert jetzt der Fall das die grosse Bitmap aus einem anderen
-/*?*/ // Fileformat entstanden ist, welches keine 64K belegt, aber wenn eine
-/*?*/ // Bitmap > 64K verwendet wird, hat das SvxNumBulletItem beim Laden ein Problem,
-/*?*/ // stuerzt aber nicht ab.
-/*?*/
-/*?*/ if ( (nEnd-_nStart) > 0xFF00 )
-/*?*/ rStrm.Seek( _nStart );
-/*N*/ }
-/*N*/ rStrm << nWidth;
-/*N*/ rStrm << nStart;
-/*N*/ rStrm << nJustify;
-/*N*/ rStrm << (char)ByteString::ConvertFromUnicode( cSymbol, aFont.GetCharSet() );
-/*N*/ rStrm << nScale;
-/*N*/
-/*N*/ // UNICODE: rStrm << aPrevText;
-/*N*/ rStrm.WriteByteString(aPrevText);
-/*N*/
-/*N*/ // UNICODE: rStrm << aFollowText;
-/*N*/ rStrm.WriteByteString(aFollowText);
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
}
diff --git a/binfilter/bf_svx/source/items/svx_chrtitem.cxx b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
index ee44117..8921743 100644
--- a/binfilter/bf_svx/source/items/svx_chrtitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
@@ -280,13 +280,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
-/*N*/ {
-/*N*/ rOut << fVal;
-/*N*/ return rOut;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ rVal <<= fVal;
diff --git a/binfilter/bf_svx/source/items/svx_e3ditem.cxx b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
index 2e88358..ef7ef5c 100644
--- a/binfilter/bf_svx/source/items/svx_e3ditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
@@ -103,18 +103,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxVector3DItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const
-/*N*/ {
-/*N*/ DBG_CHKTHIS(SvxVector3DItem, 0);
-/*N*/
-/*N*/ // ## if (nItemVersion)
-/*N*/ rStream << aVal;
-/*N*/
-/*N*/ return rStream;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ drawing::Direction3D aDirection;
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index bd731f6..b67fc26 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -166,27 +166,6 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFieldItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ DBG_ASSERT( pField, "SvxFieldItem::Store: Feld?!" );
-/*N*/ SvPersistStream aPStrm( GetClassManager(), &rStrm );
-/*N*/ // Das ResetError in der obigen Create-Methode gab es in 3.1 noch nicht,
-/*N*/ // deshalb duerfen beim 3.x-Export neuere Items nicht gespeichert werden!
-/*N*/ if ( ( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_31 ) && pField &&
-/*N*/ pField->GetClassId() == 50 /* SdrMeasureField */ )
-/*N*/ {
-/*N*/ // SvxFieldData reicht nicht, weil auch nicht am ClassMgr angemeldet
-/*?*/ SvxURLField aDummyData;
-/*?*/ aPStrm << &aDummyData;
-/*N*/ }
-/*N*/ else
-/*N*/ aPStrm << pField;
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
/*N*/ {
/*N*/ DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
index 954e0eb..d3c465f 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -181,14 +181,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 nBin;
@@ -308,16 +300,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << aSize.Width();
-/*N*/ rStrm << aSize.Height();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
-
/*N*/ SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ long nWidth, nHeight;
@@ -514,60 +496,6 @@ using namespace ::com::sun::star;
#define BULLETLR_MARKER 0x599401FE
-/*N*/ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
-/*N*/ {
-/*N*/ short nSaveFI = nFirstLineOfst;
-/*N*/ if ( IsBulletFI() )
-/*N*/ ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin wird mitmanipuliert, siehe Create()
-/*N*/
-/*N*/ sal_uInt16 nMargin = 0;
-/*N*/ if( nLeftMargin > 0 )
-/*N*/ nMargin = sal_uInt16( nLeftMargin );
-/*N*/ rStrm << nMargin;
-/*N*/ rStrm << nPropLeftMargin;
-/*N*/ if( nRightMargin > 0 )
-/*N*/ nMargin = sal_uInt16( nRightMargin );
-/*N*/ else
-/*N*/ nMargin = 0;
-/*N*/ rStrm << nMargin;
-/*N*/ rStrm << nPropRightMargin;
-/*N*/ rStrm << nFirstLineOfst;
-/*N*/ rStrm << nPropFirstLineOfst;
-/*N*/ if( nTxtLeft > 0 )
-/*N*/ nMargin = sal_uInt16( nTxtLeft );
-/*N*/ else
-/*N*/ nMargin = 0;
-/*N*/ rStrm << nMargin;
-/*N*/ if( nItemVersion >= LRSPACE_AUTOFIRST_VERSION )
-/*N*/ {
-/*N*/ sal_Int8 nAutoFirst = bAutoFirst ? 1 : 0;
-/*N*/ if( nItemVersion >= LRSPACE_NEGATIVE_VERSION &&
-/*N*/ ( nLeftMargin < 0 || nRightMargin < 0 || nTxtLeft < 0 ) )
-/*N*/ nAutoFirst |= 0x80;
-/*N*/ rStrm << nAutoFirst;
-/*N*/
-/*N*/ if ( IsBulletFI() )
-/*N*/ {
-/*N*/ // Ab 6.0 keine Magicnumber schreiben...
-/*N*/ DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "MT: Fileformat SvxLRSpaceItem aendern!" );
-/*N*/ rStrm << (sal_uInt32) BULLETLR_MARKER;
-/*N*/ rStrm << nSaveFI;
-/*N*/ }
-/*N*/ if( 0x80 & nAutoFirst )
-/*N*/ {
-/*N*/ rStrm << nLeftMargin;
-/*N*/ rStrm << nRightMargin;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if ( IsBulletFI() )
-/*N*/ ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( nSaveFI );
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
/*N*/ {
/*N*/ sal_uInt16 left, prpleft, right, prpright, prpfirstline, txtleft;
@@ -751,17 +679,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << GetUpper()
-/*N*/ << GetPropUpper()
-/*N*/ << GetLower()
-/*N*/ << GetPropLower();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
/*N*/ {
/*N*/ sal_uInt16 upper, lower, nPL = 0, nPU = 0;
@@ -802,14 +719,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 bIsPrint;
@@ -829,13 +738,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
@@ -906,17 +808,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ sal_Int8 cProt = 0;
-/*N*/ if( IsPosProtected() ) cProt |= 0x01;
-/*N*/ if( IsSizeProtected() ) cProt |= 0x02;
-/*N*/ if( IsCntntProtected() ) cProt |= 0x04;
-/*N*/ rStrm << (sal_Int8) cProt;
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
@@ -1085,19 +976,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8) GetLocation()
-/*N*/ << (sal_uInt16) GetWidth()
-/*N*/ << (sal_Bool)(aShadowColor.GetTransparency() > 0)
-/*N*/ << GetColor()
-/*N*/ << GetColor()
-/*N*/ << (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 cLoc;
@@ -1432,51 +1310,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
-/*N*/ {
-/*N*/ rStrm << (sal_uInt16) GetDistance();
-/*N*/ const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom
-/*N*/ pLine[ 0 ] = GetTop();
-/*N*/ pLine[ 1 ] = GetLeft();
-/*N*/ pLine[ 2 ] = GetRight();
-/*N*/ pLine[ 3 ] = GetBottom();
-/*N*/
-/*N*/ for( int i = 0; i < 4; i++ )
-/*N*/ {
-/*N*/ const SvxBorderLine* l = pLine[ i ];
-/*N*/ if( l )
-/*N*/ {
-/*N*/ rStrm << (sal_Int8) i
-/*N*/ << l->GetColor()
-/*N*/ << (sal_uInt16) l->GetOutWidth()
-/*N*/ << (sal_uInt16) l->GetInWidth()
-/*N*/ << (sal_uInt16) l->GetDistance();
-/*N*/ }
-/*N*/ }
-/*N*/ sal_Int8 cLine = 4;
-/*N*/ if( nItemVersion >= BOX_4DISTS_VERSION &&
-/*N*/ !(nTopDist == nLeftDist &&
-/*N*/ nTopDist == nRightDist &&
-/*N*/ nTopDist == nBottomDist) )
-/*N*/ {
-/*?*/ cLine |= 0x10;
-/*N*/ }
-/*N*/
-/*N*/ rStrm << cLine;
-/*N*/
-/*N*/ if( nItemVersion >= BOX_4DISTS_VERSION && (cLine & 0x10) != 0 )
-/*N*/ {
-/*N*/ rStrm << (sal_uInt16)nTopDist
-/*N*/ << (sal_uInt16)nLeftDist
-/*N*/ << (sal_uInt16)nRightDist
-/*?*/ << (sal_uInt16)nBottomDist;
-/*N*/ }
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const
/*N*/ {
/*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -1756,39 +1589,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ sal_Int8 cFlags = 0;
-/*N*/
-/*N*/ if ( IsTable() )
-/*N*/ cFlags |= 0x01;
-/*N*/ if ( IsDist() )
-/*N*/ cFlags |= 0x02;
-/*N*/ if ( IsMinDist() )
-/*N*/ cFlags |= 0x04;
-/*N*/ rStrm << (sal_Int8) cFlags
-/*N*/ << (sal_uInt16) GetDefDist();
-/*N*/ const SvxBorderLine* pLine[ 2 ];
-/*N*/ pLine[ 0 ] = GetHori();
-/*N*/ pLine[ 1 ] = GetVert();
-/*N*/
-/*N*/ for( int i = 0; i < 2; i++ )
-/*N*/ {
-/*N*/ const SvxBorderLine* l = pLine[ i ];
-/*N*/ if( l )
-/*N*/ {
-/*N*/ rStrm << (char) i
-/*N*/ << l->GetColor()
-/*N*/ << (short) l->GetOutWidth()
-/*N*/ << (short) l->GetInWidth()
-/*?*/ << (short) l->GetDistance();
-/*N*/ }
-/*N*/ }
-/*N*/ rStrm << (char) 2;
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
@@ -1903,16 +1703,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8)GetValue();
-/*N*/ if( FMTBREAK_NOAUTO > nItemVersion )
-/*N*/ rStrm << (sal_Int8)0x01;
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
/*N*/ {
/*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -1950,14 +1740,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 bIsKeep;
@@ -2567,41 +2349,6 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStream << (sal_Bool)sal_False;
-/*N*/ rStream << aColor;
-/*N*/ rStream << aColor;
-/*N*/ rStream << (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
-/*N*/
-/*N*/ sal_uInt16 nDoLoad = 0;
-/*N*/
-/*N*/ if ( pImpl->pGraphicObject && !pStrLink )
-/*N*/ nDoLoad |= LOAD_GRAPHIC;
-/*N*/ if ( pStrLink )
-/*N*/ nDoLoad |= LOAD_LINK;
-/*N*/ if ( pStrFilter )
-/*N*/ nDoLoad |= LOAD_FILTER;
-/*N*/ rStream << nDoLoad;
-/*N*/
-/*N*/ if ( pImpl->pGraphicObject && !pStrLink )
-/*N*/ rStream << pImpl->pGraphicObject->GetGraphic();
-/*N*/ if ( pStrLink )
-/*N*/ {
-/*N*/ String aRel = ::binfilter::StaticBaseUrl::AbsToRel( *pStrLink );
-/*N*/ // UNICODE: rStream << aRel;
-/*N*/ rStream.WriteByteString(aRel);
-/*N*/ }
-/*N*/ if ( pStrFilter )
-/*N*/ {
-/*N*/ // UNICODE: rStream << *pStrFilter;
-/*?*/ rStream.WriteByteString(*pStrFilter);
-/*N*/ }
-/*N*/ rStream << (sal_Int8)eGraphicPos;
-/*N*/ return rStream;
-/*N*/ }
-
-// -----------------------------------------------------------------------
// const wegcasten, da const als logisches const zu verstehen ist
// wenn GetGraphic() gerufen wird, soll sich das Item darum kuemmern,
// eine gelinkte Grafik zu holen.
@@ -2785,13 +2532,6 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ )
return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
}
-/*N*/ SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
-/*N*/ {
-/*N*/ sal_uInt16 nValue = GetValue();
-/*N*/ rStrm << nValue;
-/*N*/ return rStrm;
-/*N*/ }
-
/*N*/ USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const
/*N*/ {
/*N*/ return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
diff --git a/binfilter/bf_svx/source/items/svx_grfitem.cxx b/binfilter/bf_svx/source/items/svx_grfitem.cxx
index 6401ece..eb2f25d 100644
--- a/binfilter/bf_svx/source/items/svx_grfitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_grfitem.cxx
@@ -106,20 +106,6 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
/*N*/ }
-/*N*/ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
-/*N*/ {
-/*N*/ INT32 left = GetLeft(), right = GetRight(),
-/*N*/ top = GetTop(), bottom = GetBottom();
-/*N*/ if( GRFCROP_VERSION_SWDEFAULT == nVersion )
-/*N*/ top = -top, bottom = -bottom, left = -left, right = -right;
-/*N*/
-/*N*/ rStrm << top << left << right << bottom;
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-
-
/*N*/ bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index 284c5f7..973ef3d 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -277,70 +277,6 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ }
-/*N*/ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)
-/*N*/ {
-/*N*/ if(pConverter && pBulletFont)
-/*N*/ {
-/*N*/ cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
-/*N*/ String sFontName = GetFontToSubsFontName(pConverter);
-/*N*/ pBulletFont->SetName(sFontName);
-/*N*/ }
-/*N*/
-/*N*/ rStream << (USHORT)NUMITEM_VERSION_03;
-/*N*/
-/*N*/ rStream << (USHORT)GetNumberingType();
-/*N*/ rStream << (USHORT)eNumAdjust;
-/*N*/ rStream << (USHORT)nInclUpperLevels;
-/*N*/ rStream << nStart;
-/*N*/ rStream << (USHORT)cBullet;
-/*N*/
-/*N*/ rStream << nFirstLineOffset;
-/*N*/ rStream << nAbsLSpace;
-/*N*/ rStream << nLSpace;
-/*N*/
-/*N*/ rStream << nCharTextDistance;
-/*N*/ rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
-/*N*/ rStream.WriteByteString(sPrefix, eEnc);
-/*N*/ rStream.WriteByteString(sSuffix, eEnc);
-/*N*/ rStream.WriteByteString(sCharStyleName, eEnc);
-/*N*/ if(pGraphicBrush)
-/*N*/ {
-/*?*/ rStream << (USHORT)1;
-/*?*/
-/*?*/ // #75113# in SD or SI force bullet itself to be stored,
-/*?*/ // for that purpose throw away link when link and graphic
-/*?*/ // are present, so Brush save is forced
-/*?*/ if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic())
-/*?*/ {
-/*?*/ String aEmpty;
-/*?*/ pGraphicBrush->SetGraphicLink(aEmpty);
-/*?*/ }
-/*?*/
-/*?*/ pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
-/*N*/ }
-/*N*/ else
-/*N*/ rStream << (USHORT)0;
-/*N*/
-/*N*/ rStream << (USHORT)eVertOrient;
-/*N*/ if(pBulletFont)
-/*N*/ {
-/*N*/ rStream << (USHORT)1;
-/*N*/ rStream << *pBulletFont;
-/*N*/ }
-/*N*/ else
-/*N*/ rStream << (USHORT)0;
-/*N*/ rStream << aGraphicSize;
-/*N*/
-/*N*/ Color nTempColor = nBulletColor;
-/*N*/ if(COL_AUTO == nBulletColor.GetColor())
-/*N*/ nTempColor = COL_BLACK;
-/*N*/ rStream << nTempColor;
-/*N*/ rStream << nBulletRelSize;
-/*N*/ rStream << (USHORT)IsShowSymbol();
-/*N*/ return rStream;
-/*N*/ }
-
-
/*N*/ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
/*N*/ {
/*N*/ SetNumberingType(rFormat.GetNumberingType());
@@ -635,44 +571,6 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
-/*N*/ SvStream& SvxNumRule::Store(SvStream &rStream)
-/*N*/ {
-/*N*/ rStream<<(USHORT)NUMITEM_VERSION_03;
-/*N*/ rStream<<nLevelCount;
-/*N*/ //first save of nFeatureFlags for old versions
-/*N*/ rStream<<(USHORT)nFeatureFlags;
-/*N*/ rStream<<(USHORT)bContinuousNumbering;
-/*N*/ rStream<<(USHORT)eNumberingType;
-/*N*/
-/*N*/ FontToSubsFontConverter pConverter = 0;
-/*N*/ BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
-/*N*/ for(USHORT i = 0; i < SVX_MAX_NUM; i++)
-/*N*/ {
-/*N*/ if(aFmts[i])
-/*N*/ {
-/*N*/ rStream << USHORT(1);
-/*N*/ if(bConvertBulletFont && aFmts[i]->GetBulletFont())
-/*N*/ {
-/*N*/ if(!pConverter)
-/*N*/ pConverter =
-/*N*/ CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
-/*N*/ FONTTOSUBSFONT_EXPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
-/*N*/ }
-/*N*/ aFmts[i]->Store(rStream, pConverter);
-/*N*/ }
-/*N*/ else
-/*N*/ rStream << USHORT(0);
-/*N*/ }
-/*N*/ //second save of nFeatureFlags for new versions
-/*N*/ rStream<<(USHORT)nFeatureFlags;
-/*N*/ if(pConverter)
-/*N*/ DestroyFontToSubsFontConverter(pConverter);
-/*N*/
-/*N*/ return rStream;
-/*N*/ }
-
-
-
/*N*/ SvxNumRule::~SvxNumRule()
/*N*/ {
/*N*/ for(USHORT i = 0; i < SVX_MAX_NUM; i++)
@@ -820,13 +718,6 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ }
-/*N*/ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
-/*N*/ {
-/*N*/ pNumRule->Store(rStream);
-/*N*/ return rStream;
-/*N*/ }
-
-
/*N*/ USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return NUMITEM_VERSION_03;
diff --git a/binfilter/bf_svx/source/items/svx_pageitem.cxx b/binfilter/bf_svx/source/items/svx_pageitem.cxx
index 415ac1d..7870c61 100644
--- a/binfilter/bf_svx/source/items/svx_pageitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx
@@ -220,17 +220,6 @@ using namespace ::com::sun::star;
/*N*/ return pPage;
/*N*/ }
-//------------------------------------------------------------------------
-
-/*N*/ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ // UNICODE: rStrm << aDescName;
-/*N*/ rStrm.WriteByteString(aDescName);
-/*N*/
-/*N*/ rStrm << (BYTE)eNumType << bLandscape << eUse;
-/*N*/ return rStrm;
-/*N*/ }
-
/*--------------------------------------------------------------------
Beschreibung: HeaderFooterSet
--------------------------------------------------------------------*/
@@ -266,13 +255,6 @@ using namespace ::com::sun::star;
/*N*/ return new SvxSetItem( Which(), *_pSet );
/*N*/ }
-/*N*/ SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const
-/*N*/ {
-/*N*/ GetItemSet().Store( rStrm, nItemVersion );
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
}
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 6e5e5ba..9381fc9 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -305,18 +305,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8) GetPropLineSpace()
-/*N*/ << (short) GetInterLineSpace()
-/*N*/ << (sal_uInt16) GetLineHeight()
-/*N*/ << (sal_Int8) GetLineSpaceRule()
-/*N*/ << (sal_Int8) GetInterLineSpaceRule();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*?*/ sal_uInt16 SvxLineSpacingItem::GetValueCount() const
/*?*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return SVX_LINESPACE_END;
@@ -485,23 +473,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
-/*N*/ {
-/*N*/ rStrm << (char)GetAdjust();
-/*N*/ if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION )
-/*N*/ {
-/*N*/ sal_Int8 nFlags = 0;
-/*N*/ if ( bOneBlock )
-/*N*/ nFlags |= 0x0001;
-/*N*/ if ( bLastCenter )
-/*N*/ nFlags |= 0x0002;
-/*N*/ if ( bLastBlock )
-/*N*/ nFlags |= 0x0004;
-/*N*/ rStrm << (sal_Int8) nFlags;
-/*N*/ }
-/*N*/ return rStrm;
-/*N*/ }
-
// class SvxWidowsItem ---------------------------------------------------
/*N*/ SvxWidowsItem::SvxWidowsItem(const BYTE nL, const USHORT nId ) :
@@ -663,16 +634,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8) IsHyphen()
-/*N*/ << (sal_Int8) IsPageEnd()
-/*N*/ << (sal_Int8) GetMinLead()
-/*N*/ << (sal_Int8) GetMinTrail()
-/*N*/ << (sal_Int8) GetMaxHyphens();
-/*N*/ return rStrm;
-/*N*/ }
-
// class SvxTabStop ------------------------------------------------------
/*N*/ SvxTabStop::SvxTabStop()
@@ -960,63 +921,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ //MA 05. Sep. 96: Default-Tabs werden nur noch fuer das default-Attr
-/*N*/ //expandiert. Fuer vollstaendige Rueckwaertskompatibilitaet (<=304)
-/*N*/ //muessten alle Tabs expandiert werden, dass blaeht aber das File u.U.
-/*N*/ //enorm auf.
-/*N*/ //Alles nur SWG!
-/*N*/
-/*N*/ const SfxItemPool *pPool = SfxItemPool::GetStoringPool();
-/*N*/ const bool bStoreDefTabs = pPool
-/*N*/ && pPool->GetName().EqualsAscii("SWG")
-/*N*/ && binfilter::IsDefaultItem( this );
-/*N*/
-/*N*/ const short nTabs = Count();
-/*N*/ sal_uInt16 nCount = 0, nDefDist = 0;
-/*N*/ long nNew = 0;
-/*N*/
-/*N*/ if( bStoreDefTabs )
-/*N*/ {
-/*N*/ const SvxTabStopItem& rDefTab = (const SvxTabStopItem &)
-/*N*/ pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, sal_False ) );
-/*N*/ nDefDist = sal_uInt16( rDefTab.GetStart()->GetTabPos() );
-/*N*/ const long nPos = nTabs > 0 ? (*this)[nTabs-1].GetTabPos() : 0;
-/*N*/ nCount = (sal_uInt16)(nPos / nDefDist);
-/*N*/ nNew = (nCount + 1) * nDefDist;
-/*N*/
-/*N*/ if( nNew <= nPos + 50 )
-/*N*/ nNew += nDefDist;
-/*N*/
-/*N*/ nCount = nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0;
-/*N*/ }
-/*N*/
-/*N*/ rStrm << (sal_Int8) ( nTabs + nCount );
-/*N*/ for ( short i = 0; i < nTabs; i++ )
-/*N*/ {
-/*N*/ const SvxTabStop& rTab = (*this)[ i ];
-/*N*/ rStrm << (long) rTab.GetTabPos()
-/*N*/ << (sal_Int8) rTab.GetAdjustment()
-/*N*/ << (unsigned char) rTab.GetDecimal()
-/*N*/ << (unsigned char) rTab.GetFill();
-/*N*/ }
-/*N*/
-/*N*/ if ( bStoreDefTabs )
-/*N*/ for( ; nCount; --nCount )
-/*N*/ {
-/*N*/ SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT);
-/*N*/ rStrm << (long) aSwTabStop.GetTabPos()
-/*N*/ << (sal_Int8) aSwTabStop.GetAdjustment()
-/*N*/ << (unsigned char) aSwTabStop.GetDecimal()
-/*N*/ << (unsigned char) aSwTabStop.GetFill();
-/*N*/ nNew += nDefDist;
-/*N*/ }
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ sal_Bool SvxTabStopItem::Insert( const SvxTabStop& rTab )
/*N*/ {
/*N*/ sal_uInt16 nTabPos = GetPos(rTab);
@@ -1040,14 +944,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Int8)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-/*N*/
/*N*/ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 bIsSplit;
@@ -1055,19 +951,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-
-
-//------------------------------------------------------------------------
-
/*N*/ SvxScriptSpaceItem::SvxScriptSpaceItem( sal_Bool bOn, const sal_uInt16 nId )
/*N*/ : SfxBoolItem( nId, bOn )
/*N*/ {
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 9d2d4d9..26163f0 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -331,38 +331,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ BOOL bToBats =
-/*N*/ GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
-/*N*/ GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 );
-/*N*/
-/*N*/ // #90477# rStrm << (BYTE) GetFamily()
-/*N*/ // << (BYTE) GetPitch()
-/*N*/ // << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) );
-/*N*/ rStrm << (BYTE) GetFamily() << (BYTE) GetPitch()
-/*N*/ << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
-/*N*/
-/*N*/ String aStoreFamilyName( GetFamilyName() );
-/*N*/ if( bToBats )
-/*N*/ aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US );
-/*N*/ rStrm.WriteByteString(aStoreFamilyName);
-/*N*/ rStrm.WriteByteString(GetStyleName());
-/*N*/
-/*N*/ // #96441# Kach for EditEngine, only set while creating clipboard stream.
-/*N*/ if ( bEnableStoreUnicodeNames )
-/*N*/ {
-/*N*/ sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
-/*N*/ rStrm << nMagic;
-/*N*/ rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE );
-/*N*/ rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
-/*N*/ }
-/*N*/
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE _eFamily, eFontPitch, eFontTextEncoding;
@@ -430,14 +398,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nPosture;
@@ -555,14 +515,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nWeight;
@@ -642,26 +594,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
-/*N*/ {
-/*N*/ rStrm << (USHORT)GetHeight();
-/*N*/
-/*N*/ if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
-/*N*/ rStrm << GetProp() << (USHORT)GetPropUnit();
-/*N*/ else
-/*N*/ {
-/*N*/ // beim Export in alte Versionen geht die relative
-/*N*/ // Angabe verloren, wenn es keine Prozentuale ist
-/*N*/ USHORT _nProp = GetProp();
-/*N*/ if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
-/*N*/ _nProp = 100;
-/*N*/ rStrm << _nProp;
-/*N*/ }
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
/*N*/ USHORT nVersion ) const
/*N*/ {
@@ -936,14 +868,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxUnderlineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nState;
@@ -1063,14 +987,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE)GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE eCross;
@@ -1139,14 +1055,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE) GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nState;
@@ -1173,14 +1081,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (BYTE) GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nState;
@@ -1208,14 +1108,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Bool) GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ sal_Bool bValue;
@@ -1242,13 +1134,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
-/*N*/ rStrm << (sal_Bool) GetValue();
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
/*N*/ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
@@ -1377,18 +1262,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
-/*N*/ {
-/*N*/ if( VERSION_USEAUTOCOLOR == nItemVersion &&
-/*N*/ COL_AUTO == mColor.GetColor() )
-/*N*/ rStrm << Color( COL_BLACK );
-/*N*/ else
-/*N*/ rStrm << mColor;
-/*N*/ return rStrm;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new SvxColorItem( rStrm, Which() );
@@ -1434,17 +1307,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
-/*N*/ {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list