[Libreoffice-commits] .: 20 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Tue Apr 5 10:53:30 PDT 2011
binfilter/bf_basic/source/classes/image.cxx | 124 --------
binfilter/bf_basic/source/inc/codegen.hxx | 24 -
binfilter/bf_basic/source/inc/image.hxx | 2
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 44 --
binfilter/bf_sc/source/core/data/sc_cell.cxx | 66 ----
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 50 ---
binfilter/bf_sc/source/core/data/sc_column2.cxx | 153 ----------
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 240 ----------------
binfilter/bf_sc/source/core/data/sc_documen5.cxx | 2
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 5
binfilter/bf_sc/source/core/data/sc_table2.cxx | 152 ----------
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 106 -------
binfilter/bf_sc/source/core/tool/sc_docoptio.cxx | 33 --
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 61 ----
binfilter/bf_sc/source/core/tool/sc_zforauto.cxx | 12
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 39 --
binfilter/bf_sc/source/ui/inc/docsh.hxx | 2
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 135 ---------
binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 28 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 281 -------------------
binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx | 23 -
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx | 12
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 6
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 11
binfilter/bf_sfx2/source/doc/timestamp.cxx | 47 ---
binfilter/bf_so3/source/inplace/applet2.cxx | 38 --
binfilter/bf_so3/source/inplace/embobj.cxx | 20 -
binfilter/bf_so3/source/inplace/outplace.cxx | 79 -----
binfilter/bf_so3/source/inplace/plugin.cxx | 46 ---
binfilter/bf_so3/source/ole/socont.cxx | 68 ----
binfilter/bf_so3/source/ole/socont.h | 2
binfilter/bf_so3/source/persist/persist.cxx | 228 ---------------
binfilter/bf_starmath/source/starmath_document.cxx | 39 --
binfilter/bf_svtools/source/config/svt_searchopt.cxx | 30 --
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 37 --
binfilter/bf_svx/source/items/svx_flditem.cxx | 86 -----
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 30 --
binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx | 9
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 19 -
binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx | 30 --
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 26 -
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 13
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 13
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 13
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 13
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 26 -
binfilter/inc/bf_sc/attarray.hxx | 2
binfilter/inc/bf_sc/autoform.hxx | 6
binfilter/inc/bf_sc/cell.hxx | 10
binfilter/inc/bf_sc/column.hxx | 3
binfilter/inc/bf_sc/docoptio.hxx | 2
binfilter/inc/bf_sc/document.hxx | 2
binfilter/inc/bf_sc/table.hxx | 2
binfilter/inc/bf_sc/viewopti.hxx | 2
binfilter/inc/bf_sc/zforauto.hxx | 2
binfilter/inc/bf_sch/docshell.hxx | 2
binfilter/inc/bf_sd/docshell.hxx | 2
binfilter/inc/bf_sfx2/docinf.hxx | 6
binfilter/inc/bf_sfx2/frameobj.hxx | 2
binfilter/inc/bf_sfx2/interno.hxx | 2
binfilter/inc/bf_sfx2/objsh.hxx | 2
binfilter/inc/bf_sfx2/timestamp.hxx | 2
binfilter/inc/bf_so3/applet.hxx | 2
binfilter/inc/bf_so3/embobj.hxx | 2
binfilter/inc/bf_so3/outplace.hxx | 2
binfilter/inc/bf_so3/persist.hxx | 6
binfilter/inc/bf_so3/plugin.hxx | 2
binfilter/inc/bf_starmath/document.hxx | 2
binfilter/inc/bf_svtools/zforlist.hxx | 2
binfilter/inc/bf_svx/xtable.hxx | 22 -
binfilter/inc/bf_sw/docsh.hxx | 13
72 files changed, 73 insertions(+), 2554 deletions(-)
New commits:
commit 6ea3426468fed380f09a38c5efd109d3a5e89deb
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Tue Apr 5 19:04:29 2011 +0200
deactivate void Save in binfilter bf_svx
these functions does not do anything, just return when called
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index 2c7ea0a..df9fd38 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -96,9 +96,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ void SvxFieldData::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxFieldData::Save( SvPersistStream & /*rStm*/ ) {}
/*?*/ MetaAction* SvxFieldData::createBeginComment() const
@@ -264,12 +262,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ void SvxDateField::Save( SvPersistStream & rStm )
-/*N*/ {
-/*N*/ rStm << nFixDate;
-/*N*/ rStm << (USHORT)eType;
-/*N*/ rStm << (USHORT)eFormat;
-/*N*/ }
+/*N*/ void SvxDateField::Save( SvPersistStream & rStm ) {}
// -----------------------------------------------------------------------
@@ -364,29 +357,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ void SvxURLField::Save( SvPersistStream & rStm )
-/*N*/ {
-/*N*/ // Relatives Speichern der URL
-/*N*/ String aTmpURL = ::binfilter::StaticBaseUrl::AbsToRel( aURL );
-/*N*/
-/*N*/ rStm << (USHORT)eFormat;
-/*N*/
-/*N*/ // UNICODE: rStm << aTmpURL;
-/*N*/ rStm.WriteByteString(aTmpURL);
-/*N*/
-/*N*/ // UNICODE: rStm << aRepresentation;
-/*N*/ rStm.WriteByteString(aRepresentation);
-/*N*/
-/*N*/ rStm << FRAME_MARKER;
-/*N*/
-/*N*/ // UNICODE: rStm << aTargetFrame;
-/*N*/ rStm.WriteByteString(aTargetFrame);
-/*N*/
-/*N*/ rStm << CHARSET_MARKER;
-/*N*/
-/*N*/ // #90477# rStm << (USHORT)GetStoreCharSet(gsl_getSystemTextEncoding(), rStm.GetVersion());
-/*N*/ rStm << (USHORT)GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rStm.GetVersion());
-/*N*/ }
+/*N*/ void SvxURLField::Save( SvPersistStream & rStm ) {}
// =================================================================
@@ -409,9 +380,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SvxPageField::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxPageField::Save( SvPersistStream & /*rStm*/ ) {}
@@ -431,9 +400,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SvxPagesField::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxPagesField::Save( SvPersistStream & /*rStm*/ ) {}
/*N*/ SV_IMPL_PERSIST1( SvxTimeField, SvxFieldData );
@@ -451,9 +418,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SvxTimeField::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxTimeField::Save( SvPersistStream & /*rStm*/ ) {}
/*N*/ SV_IMPL_PERSIST1( SvxFileField, SvxFieldData );
@@ -472,9 +437,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SvxFileField::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxFileField::Save( SvPersistStream & /*rStm*/ ) {}
/*N*/ SV_IMPL_PERSIST1( SvxTableField, SvxFieldData );
@@ -492,9 +455,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SvxTableField::Save( SvPersistStream & /*rStm*/ )
-/*N*/ {
-/*N*/ }
+/*N*/ void SvxTableField::Save( SvPersistStream & /*rStm*/ ) {}
//----------------------------------------------------------------------------
// SvxExtTimeField
@@ -556,12 +517,7 @@ namespace binfilter {
//----------------------------------------------------------------------------
-/*N*/ void SvxExtTimeField::Save( SvPersistStream & rStm )
-/*N*/ {
-/*N*/ rStm << nFixTime;
-/*N*/ rStm << (USHORT) eType;
-/*N*/ rStm << (USHORT) eFormat;
-/*N*/ }
+/*N*/ void SvxExtTimeField::Save( SvPersistStream & rStm ) {}
//----------------------------------------------------------------------------
@@ -626,14 +582,7 @@ namespace binfilter {
//----------------------------------------------------------------------------
-/*N*/ void SvxExtFileField::Save( SvPersistStream & rStm )
-/*N*/ {
-/*N*/ // UNICODE: rStm << aFile;
-/*N*/ rStm.WriteByteString(aFile);
-/*N*/
-/*N*/ rStm << (USHORT) eType;
-/*N*/ rStm << (USHORT) eFormat;
-/*N*/ }
+/*N*/ void SvxExtFileField::Save( SvPersistStream & rStm ) {}
//----------------------------------------------------------------------------
@@ -709,20 +658,7 @@ namespace binfilter {
//----------------------------------------------------------------------------
-/*N*/ void SvxAuthorField::Save( SvPersistStream & rStm )
-/*N*/ {
-/*N*/ // UNICODE: rStm << aName;
-/*N*/ rStm.WriteByteString(aName);
-/*N*/
-/*N*/ // UNICODE: rStm << aFirstName;
-/*N*/ rStm.WriteByteString(aFirstName);
-/*N*/
-/*N*/ // UNICODE: rStm << aShortName;
-/*N*/ rStm.WriteByteString(aShortName);
-/*N*/
-/*N*/ rStm << (USHORT) eType;
-/*N*/ rStm << (USHORT) eFormat;
-/*N*/ }
+/*N*/ void SvxAuthorField::Save( SvPersistStream & rStm ) {}
//----------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index 20fce0f..0b05e00 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -306,35 +306,7 @@ namespace binfilter {
/*N*/ if (pLineColorMerk !=NULL) delete pLineColorMerk;
/*N*/ }
-/*N*/ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
-/*N*/ {
-/*N*/ if (pFarbMerk!=NULL)
-/*N*/ {
-/*N*/ delete pFarbMerk;
-/*N*/ pFarbMerk=NULL;
-/*N*/ }
-/*N*/ if (pClipMerk!=NULL)
-/*N*/ {
-/*N*/ delete pClipMerk;
-/*N*/ pClipMerk=NULL;
-/*N*/ }
-/*N*/ if (pLineColorMerk !=NULL)
-/*N*/ {
-/*N*/ delete pLineColorMerk ;
-/*N*/ pLineColorMerk =NULL;
-/*N*/ }
-/*N*/ if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
-/*N*/ pClipMerk=new ImpClipMerk(rOut);
-/*N*/
-/*N*/ USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
-/*N*/
-/*N*/ if (nCol==SDRHDC_SAVEPEN)
-/*N*/ pLineColorMerk=new Color( rOut.GetLineColor() );
-/*N*/ else if (nCol==SDRHDC_SAVEPENANDBRUSHANDFONT)
-/*N*/ pFarbMerk=new ImpColorMerk(rOut);
-/*N*/ else if (nCol!=0)
-/*N*/ pFarbMerk=new ImpColorMerk(rOut,nCol);
-/*N*/ }
+/*N*/ void ImpSdrHdcMerk::Save(const OutputDevice& rOut) {}
/*N*/ void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const
/*N*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index cc313db..5caf865 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -87,14 +87,7 @@ namespace binfilter {
/*N*/ eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
/*N*/ }
-/*N*/ void SdrMeasureField::Save(SvPersistStream& rOut)
-/*N*/ {
-/*N*/ SdrDownCompat aCompat(rOut,STREAM_WRITE); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("SdrMeasureField");
-/*N*/ #endif
-/*N*/ rOut<<(UINT16)eMeasureFieldKind;
-/*N*/ }
+/*N*/ void SdrMeasureField::Save(SvPersistStream& rOut) {}
/*?*/ void SdrMeasureField::TakeRepresentation(const SdrMeasureObj& rObj, XubString& rStr) const
/*?*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index fc4269e..f074c7d 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -811,24 +811,7 @@ using namespace ::com::sun::star;
-/*N*/ void SdrObjList::Save(SvStream& rOut) const
-/*N*/ {
-/*N*/ bool bNotPersist=pPage!=NULL && pPage->IsObjectsNotPersistent();
-/*N*/ bool bNoOLE=pModel!=NULL && pModel->IsStreamingSdrModel();
-/*N*/ if (!bNotPersist) {
-/*N*/ SdrObjListIter aIter(*this,IM_FLAT);
-/*N*/ while (aIter.IsMore()) {
-/*N*/ SdrObject* pObj=aIter.Next();
-/*N*/ bool bThisObjNot=pObj->IsNotPersistent();
-/*N*/ if (!bThisObjNot && bNoOLE && pObj->ISA(SdrOle2Obj)) {
-/*N*/ bThisObjNot=TRUE;
-/*N*/ }
-/*N*/ if (!bThisObjNot) rOut<<*pObj;
-/*N*/ if (pModel!=NULL) pModel->IncProgress();
-/*N*/ }
-/*N*/ }
-/*N*/ SdrIOHeader(rOut,STREAM_WRITE,SdrIOEndeID); // Endemarke
-/*N*/ }
+/*N*/ void SdrObjList::Save(SvStream& rOut) const {}
/*N*/ void SdrObjList::Load(SvStream& rIn, SdrPage& rPage)
/*N*/ {
commit 79a14143c5ddbe09ac6b5acb9097130dbdb76a10
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Tue Apr 5 09:04:00 2011 +0200
deactivate void Save functions in binfilter bf_sc
these functions do not perform any code more, just returns after
being called
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index 1a4a630..7b6ff97 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -1537,49 +1537,7 @@ DBG_BF_ASSERT(0, "STRIP");
-//------------------------------------------------------------------------
-//
-// Laden / Speichern
-//
-
-
-/*N*/ void ScAttrArray::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ ScWriteHeader aHdr( rStream, 8 );
-/*N*/
-/*N*/ ScDocumentPool* pDocPool = pDocument->GetPool();
-/*N*/
-/*N*/ USHORT nSaveCount = nCount;
-/*N*/ USHORT nSaveMaxRow = pDocument->GetSrcMaxRow();
-/*N*/ if ( nSaveMaxRow != MAXROW )
-/*N*/ {
-/*?*/ if ( nSaveCount > 1 && pData[nSaveCount-2].nRow >= nSaveMaxRow )
-/*?*/ {
-/*?*/ pDocument->SetLostData(); // Warnung ausgeben
-/*?*/ do
-/*?*/ --nSaveCount;
-/*?*/ while ( nSaveCount > 1 && pData[nSaveCount-2].nRow >= nSaveMaxRow );
-/*?*/ }
-/*N*/ }
-/*N*/
-/*N*/ rStream << nSaveCount;
-/*N*/
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ for (USHORT i=0; i<nSaveCount; i++)
-/*N*/ {
-/*N*/ rStream << Min( pData[i].nRow, nSaveMaxRow );
-/*N*/
-/*N*/ const ScPatternAttr* pPattern = pData[i].pPattern;
-/*N*/ pDocPool->StoreSurrogate( rStream, pPattern );
-/*N*/
-/*N*/ // FALSE, weil ATTR_CONDITIONAL (noch) nicht in Vorlagen:
-/*N*/ if (pPattern->GetItemSet().GetItemState(ATTR_CONDITIONAL,FALSE,&pItem) == SFX_ITEM_SET)
-/*N*/ pDocument->SetConditionalUsed( ((const SfxUInt32Item*)pItem)->GetValue() );
-/*N*/
-/*N*/ if (pPattern->GetItemSet().GetItemState(ATTR_VALIDDATA,FALSE,&pItem) == SFX_ITEM_SET)
-/*N*/ pDocument->SetValidationUsed( ((const SfxUInt32Item*)pItem)->GetValue() );
-/*N*/ }
-/*N*/ }
+// Laden
/*N*/ void ScAttrArray::Load( SvStream& rStream )
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 76bc4e7..9e68005 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -808,72 +808,6 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void ScFormulaCell::Save( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
-/*N*/ {
-/*N*/ USHORT nSaveMaxRow = pDocument->GetSrcMaxRow();
-/*N*/ if ( nSaveMaxRow < MAXROW && lcl_IsBeyond( pCode, nSaveMaxRow ) )
-/*N*/ {
-/*?*/ // Zelle mit Ref-Error erzeugen und speichern
-/*?*/ // StartEntry/EndEntry passiert beim Speichern der neuen Zelle
-/*?*/
-/*?*/ SingleRefData aRef;
-/*?*/ aRef.InitAddress(ScAddress());
-/*?*/ aRef.SetColRel(TRUE);
-/*?*/ aRef.SetColDeleted(TRUE);
-/*?*/ aRef.SetRowRel(TRUE);
-/*?*/ aRef.SetRowDeleted(TRUE);
-/*?*/ aRef.CalcRelFromAbs(aPos);
-/*?*/ ScTokenArray aArr;
-/*?*/ aArr.AddSingleReference(aRef);
-/*?*/ aArr.AddOpCode(ocStop);
-/*?*/ ScFormulaCell* pErrCell = new ScFormulaCell( pDocument, aPos, &aArr );
-/*?*/ pErrCell->Save( rStream, rHdr );
-/*?*/ delete pErrCell;
-/*?*/
-/*?*/ pDocument->SetLostData(); // Warnung ausgeben
-/*?*/ return;
-/*N*/ }
-/*N*/
-/*N*/ rHdr.StartEntry();
-/*N*/
-/*N*/ if ( bIsValue && !pCode->GetError() && !::rtl::math::isFinite( nErgValue ) )
-/*N*/ {
-/*N*/ DBG_ERRORFILE( msgDbgInfinity );
-/*N*/ pCode->SetError( errIllegalFPOperation );
-/*N*/ }
-/*N*/ BYTE cFlags = cMatrixFlag & 0x03;
-/*N*/ if( bDirty )
-/*N*/ cFlags |= 0x04;
-/*N*/ // Daten speichern?
-/*N*/ if( pCode->IsRecalcModeNormal() && !pCode->GetError() )
-/*N*/ cFlags |= bIsValue ? 0x08 : 0x10;
-/*N*/ if ( bSubTotal )
-/*N*/ cFlags |= 0x20;
-/*N*/ #ifdef DBG_UTIL
-/*N*/ static BOOL bShown = 0;
-/*N*/ if ( !bShown && rStream.GetVersion() > SOFFICE_FILEFORMAT_50 )
-/*N*/ {
-/*N*/ bShown = 1;
-/*N*/ DBG_ERRORFILE( "bei inkompatiblem FileFormat den FormatIndex umheben!" );
-/*N*/ }
-/*N*/ // rStream << (BYTE) 0x00;
-/*N*/ #endif
-/*N*/ if ( nFormatIndex )
-/*N*/ rStream << (BYTE) (0x10 | sizeof(UINT32)) << static_cast<sal_uInt32>(nFormatIndex);
-/*N*/ else
-/*N*/ rStream << (BYTE) 0x00;
-/*N*/ rStream << cFlags << (UINT16) nFormatType;
-/*N*/ if( cFlags & 0x08 )
-/*N*/ rStream << nErgValue;
-/*N*/ if( cFlags & 0x10 )
-/*N*/ rStream.WriteByteString( aErgString, rStream.GetStreamCharSet() );
-/*N*/ pCode->Store( rStream, aPos );
-/*N*/ if ( cMatrixFlag == MM_FORMULA )
-/*N*/ rStream << nMatCols << nMatRows;
-/*N*/
-/*N*/ rHdr.EndEntry();
-/*N*/ }
-
/*N*/ ScBaseCell* ScFormulaCell::Clone( ScDocument* pDoc, const ScAddress& rPos,
/*N*/ BOOL bNoListening ) const
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 0c64d86..3203868 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -150,24 +150,6 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ rString.Erase();
/*N*/ }
-/*N*/ void ScEditCell::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ DBG_ASSERT(pData,"StoreTextObject(NULL)");
-/*N*/ rStream << (BYTE) 0x00;
-/*N*/ if ( rStream.GetVersion() < SOFFICE_FILEFORMAT_50 )
-/*N*/ { // jedem seinen eigenen Pool
-/*?*/ ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE );
-/*?*/ // #52396# richtige Metric schreiben
-/*?*/ aEngine.SetRefMapMode( MAP_100TH_MM );
-/*?*/ aEngine.SetText( *pData );
-/*?*/ EditTextObject* pTmp = aEngine.CreateTextObject();
-/*?*/ pTmp->Store( rStream );
-/*?*/ delete pTmp;
-/*N*/ }
-/*N*/ else
-/*N*/ pData->Store( rStream );
-/*N*/ }
-
/*N*/ void ScEditCell::SetTextObject( const EditTextObject* pObject,
/*N*/ const SfxItemPool* pFromPool )
/*N*/ {
@@ -817,11 +799,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() )
/*N*/ rStream >> aValue;
/*N*/ }
-/*N*/ void ScValueCell::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ rStream << (BYTE) 0x00 << aValue;
-/*N*/ }
-
/*N*/ ScStringCell::ScStringCell( SvStream& rStream, USHORT nVer ) :
/*N*/ ScBaseCell( CELLTYPE_STRING )
/*N*/ {
@@ -835,25 +812,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() )
/*N*/ rStream.ReadByteString( aString, rStream.GetStreamCharSet() );
/*N*/ }
-/*N*/ void ScStringCell::Save( SvStream& rStream, FontToSubsFontConverter hConv ) const
-/*N*/ {
-/*N*/ rStream << (BYTE) 0x00;
-/*N*/ if ( !hConv )
-/*N*/ rStream.WriteByteString( aString, rStream.GetStreamCharSet() );
-/*N*/ else
-/*N*/ {
-/*N*/ String aTmp( aString );
-/*N*/ sal_Unicode* p = aTmp.GetBufferAccess();
-/*N*/ sal_Unicode const * const pStop = p + aTmp.Len();
-/*N*/ for ( ; p < pStop; ++p )
-/*N*/ {
-/*N*/ *p = ConvertFontToSubsFontChar( hConv, *p );
-/*N*/ }
-/*N*/ aTmp.ReleaseBufferAccess();
-/*N*/ rStream.WriteByteString( aTmp, rStream.GetStreamCharSet() );
-/*N*/ }
-/*N*/ }
-
/*N*/ void ScStringCell::ConvertFont( FontToSubsFontConverter hConv )
/*N*/ {
/*N*/ if ( hConv )
@@ -880,14 +838,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() )
/*N*/ }
/*N*/ }
-/*N*/ void ScNoteCell::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ rStream << (BYTE) 0x00;
-/*N*/ }
-
-
-
-
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
index d390900..58df5e6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
@@ -103,39 +103,6 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
//------------------------------------------------------------------------
-/*N*/ void ScDocOptions::Save(SvStream& rStream, BOOL bConfig) const
-/*N*/ {
-/*N*/ ScWriteHeader aHdr( rStream, 28 );
-/*N*/
-/*N*/ rStream << bIsIgnoreCase;
-/*N*/ rStream << bIsIter;
-/*N*/ rStream << nIterCount;
-/*N*/ rStream << fIterEps;
-/*N*/ rStream << nPrecStandardFormat;
-/*N*/ rStream << nDay;
-/*N*/ rStream << nMonth;
-/*N*/ rStream << nYear;
-/*N*/ rStream << nTabDistance;
-/*N*/ rStream << bCalcAsShown;
-/*N*/ rStream << bMatchWholeCell;
-/*N*/ rStream << bDoAutoSpell;
-/*N*/ rStream << bLookUpColRowNames;
-/*N*/
-/*N*/ if ( bConfig || rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export
-/*N*/ {
-/*N*/ if ( !bConfig && 1901 <= nYear2000 && nYear2000 <= 1999 )
-/*N*/ { // fuer SO5 auf altes Format zweistellig abbilden
-/*N*/ rStream << (USHORT) (nYear2000 - 1901);
-/*N*/ }
-/*N*/ else
-/*N*/ { // neues Format vierstellig, beliebiges Jahrhundert
-/*N*/ // erzeugt in SO5 vor src513e ein Warning beim Laden
-/*N*/ rStream << (USHORT) 29; // Dummy, alter SO5 Default
-/*N*/ rStream << nYear2000; // echter Wert
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ void ScDocOptions::Load(SvStream& rStream)
/*N*/ {
/*N*/ ScReadHeader aHdr( rStream );
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index 4d2c223..f454eb3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -299,67 +299,6 @@ using ::rtl::OUString;
/*N*/ return rStream;
/*N*/ }
-//------------------------------------------------------------------------
-
-/*N*/ void ScViewOptions::Save(SvStream& rStream, BOOL bConfig) const
-/*N*/ {
-/*N*/ USHORT i;
-/*N*/
-/*N*/ ScWriteHeader aHdr( rStream, 68 );
-/*N*/
-/*N*/ for ( i=0; i<=VOPT_GRID; i++ ) // kompatibel bleiben -> nur bis VOPT_GRID
-/*N*/ rStream << aOptArr[i];
-/*N*/
-/*N*/ for ( i=0; i<MAX_TYPE; i++ )
-/*N*/ rStream << (BYTE)aModeArr[i];
-/*N*/
-/*N*/ rStream << aGridCol;
-/*N*/ rStream.WriteByteString( aGridColName, rStream.GetStreamCharSet() );
-/*N*/ rStream << aOptArr[VOPT_HELPLINES];
-/*N*/ rStream << aGridOpt;
-/*N*/ rStream << bHideAutoSpell;
-/*N*/ rStream << aOptArr[VOPT_ANCHOR];
-/*N*/ rStream << aOptArr[VOPT_PAGEBREAKS];
-/*N*/ rStream << aOptArr[VOPT_SOLIDHANDLES];
-/*N*/
-/*N*/ if ( bConfig || rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export
-/*N*/ {
-/*N*/ rStream << aOptArr[VOPT_CLIPMARKS];
-/*N*/
-/*N*/ // big handles are not saved in 5.0-documents to avoid warning messages
-/*N*/ //! save to files after 5.0 !!!
-/*N*/
-/*N*/ if ( bConfig )
-/*N*/ rStream << aOptArr[VOPT_BIGHANDLES];
-/*N*/ }
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-
-//========================================================================
-// ScTpViewItem - Daten fuer die ViewOptions-TabPage
-//========================================================================
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
//==================================================================
// Config Item containing view options
//==================================================================
diff --git a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
index ac5eaa9..7f31b3b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
@@ -69,18 +69,6 @@ static const sal_Char pStandardName[] = "Standard";
/*N*/ eSysLnge = Application::GetSettings().GetLanguage();
/*N*/ }
-/*N*/ void ScNumFormatAbbrev::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ rStream.WriteByteString( sFormatstring, rStream.GetStreamCharSet() );
-/*N*/ rStream << (USHORT) eSysLnge << (USHORT) eLnge;
-/*N*/ }
-
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/attarray.hxx b/binfilter/inc/bf_sc/attarray.hxx
index f289e06..52b7486 100644
--- a/binfilter/inc/bf_sc/attarray.hxx
+++ b/binfilter/inc/bf_sc/attarray.hxx
@@ -152,7 +152,7 @@ public:
void DeleteHardAttr( USHORT nStartRow, USHORT nEndRow );
- void Save( SvStream& rStream ) const;
+ void Save( SvStream& rStream ) const {}
void Load( SvStream& rStream );
void ConvertFontsAfterLoad(); // old binary file format
};
diff --git a/binfilter/inc/bf_sc/cell.hxx b/binfilter/inc/bf_sc/cell.hxx
index 9a4ad13..7805710 100644
--- a/binfilter/inc/bf_sc/cell.hxx
+++ b/binfilter/inc/bf_sc/cell.hxx
@@ -146,7 +146,7 @@ public:
void SetValue( const double& rValue );
double GetValue() const;
- void Save( SvStream& rStream ) const;
+ void Save( SvStream& rStream ) const {}
};
@@ -173,7 +173,7 @@ public:
void SetString( const String& rString );
void GetString( String& rString ) const;
- void Save( SvStream& rStream, FontToSubsFontConverter hConv = 0 ) const;
+ void Save( SvStream& rStream, FontToSubsFontConverter hConv = 0 ) const {}
// convert symbol font after loading binary format
void ConvertFont( FontToSubsFontConverter hConv );
};
@@ -213,7 +213,7 @@ public:
const EditTextObject* GetData() const { return pData; }
- void Save( SvStream& rStream ) const;
+ void Save( SvStream& rStream ) const {}
};
enum ScMatrixMode {
@@ -285,7 +285,7 @@ public:
void GetEnglishFormula( String& rFormula, BOOL bCompileXML = FALSE ) const;
void GetEnglishFormula( ::rtl::OUStringBuffer& rBuffer, BOOL bCompileXML = FALSE ) const;
- void Save( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
+ void Save( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const {}
void SetDirty();
inline void SetDirtyVar() { bDirty = TRUE; }
@@ -396,7 +396,7 @@ public:
ScNoteCell( SvStream& rStream, USHORT nVer );
ScBaseCell* Clone() const;
- void Save( SvStream& rStream ) const;
+ void Save( SvStream& rStream ) const {}
};
diff --git a/binfilter/inc/bf_sc/docoptio.hxx b/binfilter/inc/bf_sc/docoptio.hxx
index a994d4d..965b407 100644
--- a/binfilter/inc/bf_sc/docoptio.hxx
+++ b/binfilter/inc/bf_sc/docoptio.hxx
@@ -88,7 +88,7 @@ public:
void ResetDocOptions();
inline void CopyTo(ScDocOptions& rOpt);
void Load(SvStream& rStream);
- void Save(SvStream& rStream, BOOL bConfig = FALSE) const;
+ void Save(SvStream& rStream, BOOL bConfig = FALSE) const {}
inline const ScDocOptions& operator=( const ScDocOptions& rOpt );
inline int operator==( const ScDocOptions& rOpt ) const;
diff --git a/binfilter/inc/bf_sc/viewopti.hxx b/binfilter/inc/bf_sc/viewopti.hxx
index 4b36ec3..2fda358 100644
--- a/binfilter/inc/bf_sc/viewopti.hxx
+++ b/binfilter/inc/bf_sc/viewopti.hxx
@@ -129,7 +129,7 @@ public:
friend SvStream& operator>> ( SvStream& rStream, ScViewOptions& rOpt );
- void Save(SvStream& rStream, BOOL bConfig = FALSE) const;
+ void Save(SvStream& rStream, BOOL bConfig = FALSE) const {}
private:
BOOL aOptArr [MAX_OPT];
diff --git a/binfilter/inc/bf_sc/zforauto.hxx b/binfilter/inc/bf_sc/zforauto.hxx
index 44ce104..4de95d0 100644
--- a/binfilter/inc/bf_sc/zforauto.hxx
+++ b/binfilter/inc/bf_sc/zforauto.hxx
@@ -47,7 +47,7 @@ public:
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
ScNumFormatAbbrev(ULONG /*nFormat*/, SvNumberFormatter& /*rFormatter*/) {DBG_BF_ASSERT(0, "STRIP"); }
void Load( SvStream& rStream ); // Laden der Zahlenformate
- void Save( SvStream& rStream ) const; // Speichern der Zahlenformate
+ void Save( SvStream& rStream ) const {} // Speichern der Zahlenformate
};
commit 94af916b383a82373854e1d83a372c2def891aff
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Tue Apr 5 08:51:28 2011 +0200
deactivate void Save in binfilter / bf_so3
these functions does not perform anything more, are just returning with
an empty body
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index 5301cb7..1527f1d 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -129,14 +129,7 @@ void SvEmbeddedInfoObject::Load( SvPersistStream & rStm )
}
}
-void SvEmbeddedInfoObject::Save( SvPersistStream & rStm )
-{
- SvInfoObject::Save( rStm );
- rStm << (BYTE)INFO_VERSION;
- BOOL bIsLink = FALSE;
- rStm << bIsLink;
- rStm << GetVisArea();
-}
+void SvEmbeddedInfoObject::Save( SvPersistStream & rStm ) {}
/************************************************************************
|* SvEmbeddedInfoObject::SetObj()
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index c25ec9a..1c766c9 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -143,25 +143,7 @@ void SvInfoObject::Load( SvPersistStream & rStm )
}
}
-void SvInfoObject::Save( SvPersistStream & rStm )
-{
- BYTE nVer = BYTE(INFO_OBJECT_VER_AKT);
- rStm << nVer;
- String aStgName = GetStorageName();
- DBG_ASSERT( aStgName.Len(), "kein Storage-Name" );
- rStm.WriteByteString( aStgName, gsl_getSystemTextEncoding() );
- String aStr( GetObjName() );
- if( aStgName == aStr )
- aStr = String(); // kleine Optimierung
- rStm.WriteByteString( aStr, gsl_getSystemTextEncoding() );
- SvGlobalName aSvClass = SvFactory::GetSvClass( rStm.GetVersion(), GetClassName() );
- if( rStm.GetVersion() <= SOFFICE_FILEFORMAT_40
- && aSvClass == *SvOutPlaceObject::ClassFactory() )
- //old ole-wrapper
- aSvClass = *SvInPlaceObject::ClassFactory();
- rStm << aSvClass;
- rStm << bDeleted;
-}
+void SvInfoObject::Save( SvPersistStream & rStm ) {}
void SvInfoObject::SetObj( SvPersist * pObj )
{
commit 01a988f58e7df610a466d9d6c2256a879ea989b2
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Mon Apr 4 21:56:41 2011 +0200
deactivate ULONG Save functions in binfilter
and return the value 1 directly (as an error ) without performing
any other action
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 7960cf8..b611ca7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -127,19 +127,10 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ SfxPSCodePageProperty_Impl( CharSet nCharSet ) : SfxPSProperty_Impl( 1, VT_I2 ), nEncoding( nCharSet ) {}
/*N*/ virtual ~SfxPSCodePageProperty_Impl() {}
/*N*/
-/*N*/ virtual ULONG Save( SvStream& rStream );
+/*N*/ virtual ULONG Save( SvStream& rStream ) {return 1;}
/*N*/ virtual ULONG Len();
/*N*/ };
-/*N*/ ULONG SfxPSCodePageProperty_Impl::Save( SvStream& rStream )
-/*N*/ {
-/*N*/ sal_uInt32 nCodePage = rtl_getWindowsCodePageFromTextEncoding(nEncoding);
-/*N*/ if (nCodePage == 0)
-/*N*/ nCodePage = 1252;
-/*N*/ rStream << (UINT16)nCodePage;
-/*N*/ return rStream.GetErrorCode();
-/*N*/ }
-
/*N*/ ULONG SfxPSCodePageProperty_Impl::Len()
/*N*/ {
/*N*/ return sizeof( UINT16 );
@@ -171,7 +162,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/
/*N*/ void SetIsUniCode() { bIsUniCode = TRUE; }
/*N*/
-/*N*/ virtual ULONG Save( SvStream& rStream );
+/*N*/ virtual ULONG Save( SvStream& rStream ) {return 1;}
/*N*/ virtual ULONG Load( SvStream& rStream );
/*N*/ virtual ULONG Len();
/*N*/
@@ -180,23 +171,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
//-------------------------------------------------------------------------
-/*N*/ ULONG SfxPSStringProperty_Impl::Save( SvStream& rStream )
-/*N*/ {
-/*N*/ // Now we always write property strings with UTF8 encoding, so we
-/*N*/ // can ensure full unicode compatibility. The code page attribute is
-/*N*/ // written with UTF8 set!
-/*N*/ // Force nEncoding set to UTF8!
-/*N*/ ByteString aTemp( aString, RTL_TEXTENCODING_UTF8 );
-/*N*/ nEncoding = RTL_TEXTENCODING_UTF8;
-/*N*/ UINT32 nLen = aTemp.Len();
-/*N*/ rStream << (UINT32)( nLen + 1 );
-/*N*/ rStream.Write( aTemp.GetBuffer(), nLen );
-/*N*/ rStream << '\0';
-/*N*/ return rStream.GetErrorCode();
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ ULONG SfxPSStringProperty_Impl::Load( SvStream& rStream )
/*N*/ {
/*N*/ UINT32 nLen;
@@ -286,20 +260,12 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ , aInt( aIntP )
/*N*/ {}
/*N*/
-/*N*/ virtual ULONG Save( SvStream& rStream );
+/*N*/ virtual ULONG Save( SvStream& rStream ) {return 1;}
/*N*/ virtual ULONG Len();
/*N*/ };
//-------------------------------------------------------------------------
-/*N*/ ULONG SfxPSUINT32Property_Impl::Save( SvStream& rStream )
-/*N*/ {
-/*N*/ rStream << aInt;
-/*N*/ return rStream.GetErrorCode();
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ ULONG SfxPSUINT32Property_Impl::Len()
/*N*/ {
/*N*/ return 4;
@@ -320,7 +286,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ SfxPSDateTimeProperty_Impl( UINT32 nIdP ) :
/*N*/ SfxPSProperty_Impl( nIdP, VT_FILETIME ) {};
/*N*/
-/*N*/ virtual ULONG Save( SvStream& rStream );
+/*N*/ virtual ULONG Save( SvStream& rStream ) {return 1;}
/*N*/ virtual ULONG Load( SvStream& rStream );
/*N*/ virtual ULONG Len();
/*N*/
@@ -329,33 +295,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
//-------------------------------------------------------------------------
-/*N*/ ULONG SfxPSDateTimeProperty_Impl::Save(SvStream &rStream)
-/*N*/ {
-/*N*/ // Nicht Valid ist das gleiche, wie bei MS, nur nicht konvertiert
-/*N*/ if( aDateTime.IsValid() )
-/*N*/ aDateTime.ConvertToUTC();
-/*N*/ BigInt a100nPerSecond(10000000L);
-/*N*/ BigInt a100nPerDay=a100nPerSecond*BigInt(60L*60*24);
-/*N*/ USHORT nYears=aDateTime.GetYear()-1601;
-/*N*/ long nDays=
-/*N*/ nYears*365+nYears/4-nYears/100+nYears/400+
-/*N*/ aDateTime.GetDayOfYear()-1;
-/*N*/ BigInt aTime=
-/*N*/ a100nPerDay*BigInt(nDays)+a100nPerSecond*
-/*N*/ BigInt((long)( aDateTime.GetSec() +
-/*N*/ 60* aDateTime.GetMin() +
-/*N*/ 60L*60* aDateTime.GetHour() ));
-/*N*/
-/*N*/ BigInt aUlongMax(SAL_MAX_UINT32);
-/*N*/ aUlongMax += 1;
-/*N*/
-/*N*/ rStream<<rStream<<static_cast<sal_uInt32>(static_cast<ULONG>(aTime % aUlongMax));
-/*N*/ rStream<<rStream<<static_cast<sal_uInt32>(static_cast<ULONG>(aTime / aUlongMax));
-/*N*/ return rStream.GetErrorCode();
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ ErrCode SfxPSDateTimeProperty_Impl::Load( SvStream& rStream )
/*N*/ {
/*N*/ UINT32 nLow, nHigh;
@@ -408,7 +347,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ {
/*N*/ SvGlobalName aId;
/*N*/ SfxPSPropertyArr_Impl aProperties;
-/*N*/ ULONG Save(SvStream &rStream);
+/*N*/ ULONG Save(SvStream &rStream) {return 1;}
/*N*/ };
//=========================================================================
@@ -423,7 +362,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ void SetSectionName(const SvGlobalName& aIdP);
/*N*/ void AddProperty( SfxPSProperty_Impl* pProp);
/*N*/
-/*N*/ ULONG Save(SvStream &rStream);
+/*N*/ ULONG Save(SvStream &rStream) {return 1;}
/*N*/ };
@@ -457,69 +396,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ }
-/*N*/ ULONG SfxPS_Impl::Save(SvStream &rStream)
-/*N*/ {
-/*N*/ SvGlobalName aName;
-/*N*/ rStream << (UINT16) 0xfffe // ByteOrder
-/*N*/ << (UINT16) 0 // version
-/*N*/ << (UINT16) 1 // Os MinorVersion
-/*N*/ << (UINT16) // Os Type
-/*N*/ #if defined(MAC)
-/*N*/ 1
-/*N*/ #elif defined(WNT)
-/*N*/ 2
-/*N*/ #else
-/*N*/ 0
-/*N*/ #endif
-/*N*/ << aName
-/*N*/ << (UINT32)1; // Immer eine Section
-/*N*/ return aSection.Save(rStream);
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
-/*N*/ ULONG SfxPSSection_Impl::Save(SvStream &rStream)
-/*N*/ {
-/*N*/
-/*N*/ //Nur eine Section schreiben: ( Use of more than 1 section is discouraged
-/*N*/ //and will not be supported in future windows apis).
-/*N*/
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ nPos += 20;
-/*N*/ rStream << aId << (UINT32)nPos; //Offset
-/*N*/
-/*N*/
-/*N*/ //SectionHeader Schreiben
-/*N*/ ULONG nLen=8;
-/*N*/ USHORT n;
-/*N*/ for(n=0;n<aProperties.Count();n++)
-/*N*/ nLen+=(((aProperties[n]->Len() + 3) >> 2) << 2)+12;
-/*N*/ rStream << (UINT32) nLen << (UINT32) aProperties.Count();
-/*N*/
-/*N*/ //PropertyId/Offsetpaare schreiben
-/*N*/
-/*N*/ nLen=8+aProperties.Count()*8;
-/*N*/ for(n=0;n<aProperties.Count();n++)
-/*N*/ {
-/*N*/ rStream << aProperties[n]->GetId() << (UINT32)nLen;
-/*N*/ nLen+=(((aProperties[n]->Len() + 3) >> 2) << 2) + 4;
-/*N*/ }
-/*N*/
-/*N*/ //Inhalte schreiben
-/*N*/ for(n=0;n<aProperties.Count();n++)
-/*N*/ {
-/*N*/ rStream << (UINT32) aProperties[n]->GetType();
-/*N*/ aProperties[n]->Save(rStream);
-/*N*/ nLen=aProperties[n]->Len();
-/*N*/ while(nLen++%4) //Auffuellen auf DWORD Grenze
-/*N*/ rStream << (UINT8) 0;
-/*N*/ }
-/*N*/
-/*N*/ return rStream.GetErrorCode();
-/*N*/ }
-
-//========================================================================
-
/*N*/ SvStream& PaddWithBlanks_Impl(SvStream &rStream, USHORT nCount)
/*N*/ {
/*N*/ for ( USHORT n = nCount; n; --n )
@@ -547,7 +423,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ nVersion( nV ), bPasswd( bPass ) { aHeader = String::CreateFromAscii( pHeader ); }
/*N*/ FileHeader( SvStream& rStream );
/*N*/
-/*N*/ void Save( SvStream& rStream ) const;
+/*N*/ void Save( SvStream& rStream ) const ;
/*N*/ };
//-------------------------------------------------------------------------
@@ -566,18 +442,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
//-------------------------------------------------------------------------
-/*N*/ void FileHeader::Save( SvStream& rStream ) const
-/*N*/ {
-/*N*/ long nVer = rStream.GetVersion();
-/*N*/ rStream.SetVersion( SOFFICE_FILEFORMAT_40 );
-/*N*/ rStream.WriteByteString( aHeader );
-/*N*/ rStream.SetVersion( nVer );
-/*N*/ rStream << nVersion;
-/*N*/ rStream << (BYTE)bPasswd;
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
/*N*/ BOOL SfxDocUserKey::Load(SvStream &rStream)
/*N*/ {
/*N*/ rStream.ReadByteString( aTitle );
commit 73f851b2e674323c88bb1deb8896f8a2c8ac0d2e
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 22:12:01 2011 +0200
various commented out code deletion
diff --git a/binfilter/bf_basic/source/inc/codegen.hxx b/binfilter/bf_basic/source/inc/codegen.hxx
index 290c5a9..743b152 100644
--- a/binfilter/bf_basic/source/inc/codegen.hxx
+++ b/binfilter/bf_basic/source/inc/codegen.hxx
@@ -36,33 +36,9 @@ class SbiParser;
class SbModule;
class SbiCodeGen { // Code-Erzeugung:
-/*?*/ // SbiParser* pParser; // fuer Fehlermeldungen, Line, Column etc.
-/*?*/ // SbModule& rMod; // aktuelles Modul
-/*?*/ // SbiBuffer aCode; // Code-Puffer
-/*?*/ // short nLine, nCol; // Zeile, Spalte fuer Stmnt-Befehl
-/*?*/ // short nForLevel; // #29955 for-Schleifen-Ebene
-/*?*/ // BOOL bStmnt; // TRUE: Statement-Opcode liegt an
public:
-/*?*/ // SbiCodeGen( SbModule&, SbiParser*, short );
-/*?*/ // SbiParser* GetParser() { return pParser; }
-/*?*/ // UINT32 Gen( SbiOpcode );
-/*?*/ // UINT32 Gen( SbiOpcode, UINT32 );
-/*?*/ // UINT32 Gen( SbiOpcode, UINT32, UINT32 );
-/*?*/ // void Patch( UINT32 o, UINT32 v ){ aCode.Patch( o, v ); }
-/*?*/ // void BackChain( UINT32 off ) { aCode.Chain( off ); }
-/*?*/ // void Statement();
-/*?*/ // void GenStmnt(); // evtl. Statement-Opcode erzeugen
-/*?*/ // UINT32 GetPC();
-/*?*/ // UINT32 GetOffset() { return GetPC() + 1; }
-/*?*/ // void Save();
-/*?*/ //
-/*?*/ // // #29955 for-Schleifen-Ebene pflegen
-/*?*/ // void IncForLevel( void ) { nForLevel++; }
-/*?*/ // void DecForLevel( void ) { nForLevel--; }
-/*?*/ //
static UINT32 calcNewOffSet( BYTE* pCode, UINT16 nOffset );
static UINT16 calcLegacyOffSet( BYTE* pCode, UINT32 nOffset );
-/*?*/ //
};
template < class T, class S >
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index b9cddf1..e17707e 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -441,8 +441,6 @@ void ScDocument::UpdateChartListenerCollection()
// pro memoria, waiting that all the if is cleaned out
// the same for DoSaveCompleted()
DBG_BF_ASSERT(0, "return value of DoSave() and DoSaveComleted was not checked here!");
- //aIPObj->DoSave();
- //aIPObj->DoSaveCompleted();
}
}
}
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index 471336e..023b134 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -107,8 +107,6 @@ namespace binfilter {
/*N*/ if (pDocShell && !pShell)
/*N*/ pShell = pDocShell;
/*N*/
-/*N*/ // DBG_ASSERT(pShell,"InitDrawLayer ohne Shell");
-/*N*/
/*N*/ if (!pDrawLayer)
/*N*/ {
/*N*/ String aName;
@@ -258,9 +256,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if (pDrawLayer)
/*N*/ {
-/*N*/ // SetSavePortable wird mit VCL nicht mehr gebraucht
-/*N*/ //BOOL bIndep = SFX_APP()->GetOptions().IsIndepGrfFmt();
-/*N*/ //pDrawLayer->SetSavePortable( bIndep );
/*N*/
/*N*/ pDrawLayer->SetSaveCompressed( FALSE );
/*N*/ pDrawLayer->SetSaveNative( FALSE );
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index 66308e4..c8be253 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -172,8 +172,6 @@ using namespace ::com::sun::star::uno;
/*N*/ if( pImp->bIsSaving )
/*N*/ {
/*N*/ //!! kein Aufruf der Basisklasse wegen doppeltem Aufruf in Persist
-/*N*/ //if(!SfxObjectShell::Save())
-/*N*/ // return FALSE;
/*N*/ SvStorageRef aRef = GetMedium()->GetStorage();
/*N*/ if ( aRef.Is() )
/*N*/ {
@@ -355,9 +353,6 @@ using namespace ::com::sun::star::uno;
/*N*/ void SfxObjectShell::SetConfigManager(SfxConfigManager *pMgr)
/*N*/ {
-/*N*/ // if ( pImp->pCfgMgr == SFX_CFGMANAGER() && pMgr)
-/*N*/ // pMgr->Activate(pImp->pCfgMgr);
-/*N*/
/*N*/ if ( pImp->pCfgMgr && pImp->pCfgMgr != pMgr )
/*?*/ delete pImp->pCfgMgr;
/*N*/
@@ -368,7 +363,6 @@ using namespace ::com::sun::star::uno;
/*N*/ BOOL SfxObjectShell::HasTemplateConfig() const
/*N*/ {
-/*N*/ //!MBA return pImp->bTemplateConfig;
/*N*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 3704bed..58d31f6 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -372,8 +372,6 @@ sal_False Das Objekt konnte nicht geladen werden
xPer->DoOwnerLoad(xStor);
xPer->CleanUp();
DBG_ASSERT( 0, "DoSave() and DoSaveCompleted() return value is not checked here, seems buggy" );
- //xPer->DoSave();
- //xPer->DoSaveCompleted( 0 );
}
if ( xStor.Is() )
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
index 340d7f4..9e72a31 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
@@ -640,8 +640,6 @@ BOOL SdrOle2Obj::Unload()
if( pO->IsModified() )
{
DBG_BF_ASSERT(0, "return value of DoSave() or DoSaveCompleted() is not checked here");
- //pO->DoSave();
- //pO->DoSaveCompleted();
}
ppObjRef->Clear();
if (pPersist->Unload(pO))
commit 941526ab619dff9512bfac4c971af09fe647ab2f
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 21:57:12 2011 +0200
deactivate bool Save in binfilter / bf_sch
and returns false without executing code
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index 3d3c2e9..d59276a 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -593,141 +593,6 @@ using namespace ::com::sun::star;
/*N*/ return bRet;
/*N*/ }
-// ------------------------------------------------------------
-
-/*N*/ BOOL SchChartDocShell::Save() throw()
-/*N*/ {
-/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR (context, "sch", "af119097", "::SchChartDocShell::Save");
-/*N*/
-/*N*/ SvStorage* pStor = GetStorage();
-/*N*/ DBG_ASSERT( pStor, "Save() without Storage called!" );
- if (!pStor)
- return FALSE;
-/*N*/
-/*N*/ long nFileFormat = pStor->GetVersion();
-/*N*/ sal_Bool bIsXML = nFileFormat >= SOFFICE_FILEFORMAT_60;
-/*N*/ BOOL bRet = FALSE;
-/*N*/
-/*N*/ if( bIsXML )
-/*N*/ {
-/*N*/ RTL_LOGFILE_CONTEXT_TRACE (context, "XML format");
-/*N*/ bRet = SfxInPlaceObject::Save();
-/*N*/
- /**********************************************************************
- * StarOffice XML-Filter Export
- **********************************************************************/
-/*N*/ Reference< ::com::sun::star::frame::XModel> xModel(GetModel());
-/*N*/ SchXMLWrapper aFilter( xModel, *pStor,
-/*N*/ GetCreateMode() != SFX_CREATE_MODE_EMBEDDED );
-/*N*/
-/*N*/ // update user info before writing
-/*N*/ UpdateDocInfoForSave();
-/*N*/
-/*N*/ bRet = aFilter.Export();
-
- FinishedLoading( SFX_LOADED_ALL );
-/*N*/ }
-/*N*/ else // binary format <= 5.0
-/*N*/ {
-/*N*/ pChDoc->PrepareAxisStorage();
-/*N*/ SvStorageStreamRef rDocumentStream = pStor->OpenStream( aStarChartDoc );
-/*N*/
-/*N*/ if( rDocumentStream.Is() && ! rDocumentStream->GetError() )
-/*N*/ {
-/*N*/ rDocumentStream->SetVersion( pStor->GetVersion() );
-/*N*/
-/*N*/ if( nFileFormat <= SOFFICE_FILEFORMAT_40 && pChDoc->IsReal3D())
-/*N*/ {
-/*?*/ CHART_TRACE( "Fileformat 4.0" );
-/*?*/ pChDoc->PrepareOld3DStorage();
-/*N*/ }
-/*N*/
-/*N*/ bRet = SfxInPlaceObject::Save();
-/*N*/
-/*N*/ // komprimiert/native speichern?
-/*N*/ const BOOL bSaveNative = FALSE;
-/*N*/ const BOOL bSaveCompressed = FALSE;
-/*N*/
-/*N*/ pChDoc->SetSaveCompressed( bSaveCompressed );
-/*N*/ pChDoc->SetSaveNative( bSaveNative );
-/*N*/
-/*N*/ if( bRet )
-/*N*/ {
-/*N*/ pChDoc->PreSave();
-/*N*/
-/*N*/ SetWaitCursor( TRUE );
-/*N*/
-/*N*/ SvStorageStreamRef rPoolStream = pStor->OpenStream( SCH_STYLE_SHEET_NAME );
-/*N*/ if( ! rPoolStream->GetError())
-/*N*/ {
-/*N*/ rPoolStream->SetSize( 0 );
-/*N*/ rPoolStream->SetBufferSize( POOL_BUFFER_SIZE );
-/*N*/ GetPool().Store( *rPoolStream );
-/*N*/
-/*N*/
-/*N*/ // the style sheet pool uses next() and first() methods without resetting
-/*N*/ // the search mask (?) so it has to be done here
-/*N*/ GetStyleSheetPool()->SetSearchMask( SFX_STYLE_FAMILY_ALL );
-/*N*/ // FALSE = also save unused style sheets
-/*N*/ GetStyleSheetPool()->Store( *rPoolStream, FALSE );
-/*N*/ rPoolStream->SetBufferSize( 0 );
-/*N*/
-/*N*/ }
-/*N*/ else bRet = FALSE;
-/*N*/ if (bRet)
-/*N*/ bRet = rPoolStream->GetError() == 0;
-/*N*/ DBG_ASSERT(bRet, "Fehler beim Schreiben der Pools");
-/*N*/
-/*N*/ if( ! rDocumentStream->GetError())
-/*N*/ {
- // #i56310# set SomeData strings according to
- // ChartRange in MemChart like it is done in SaveAs
- SvPersist* pLclParent = GetParent();
- if( pLclParent )
- {
- // determine which is parent application
- SvGlobalName aGlobalName;
- ULONG nLclFileFormat;
- String aAppName, aFullName, aShortName;
- pLclParent->FillClass( &aGlobalName, &nLclFileFormat,
- &aAppName, &aFullName, &aShortName,
- SOFFICE_FILEFORMAT_60 );
-
- if( nLclFileFormat == SOT_FORMATSTR_ID_STARCALC_60 )
- pChDoc->GetChartData()->ConvertChartRangeForCalc( FALSE );
- else if( nLclFileFormat == SOT_FORMATSTR_ID_STARWRITER_60 )
- pChDoc->GetChartData()->ConvertChartRangeForWriter( FALSE );
- }
-/*N*/ rDocumentStream->SetSize( 0 );
-/*N*/ rDocumentStream->SetBufferSize( DOCUMENT_BUFFER_SIZE );
-/*N*/ *rDocumentStream << *pChDoc;
-/*N*/ rDocumentStream->SetBufferSize( 0 );
-/*N*/ }
-/*N*/ else
-/*N*/ bRet = FALSE;
-/*N*/
-/*N*/ if (bRet)
-/*N*/ bRet = rDocumentStream->GetError() == 0;
-/*N*/ DBG_ASSERT(bRet, "Fehler beim Schreiben des Models");
-/*N*/
-/*N*/ // finished
-/*N*/
-/*N*/ SetWaitCursor( FALSE );
-/*N*/
-/*N*/ pChDoc->PostSave();
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ if(nFileFormat <= SOFFICE_FILEFORMAT_40 && pChDoc->IsReal3D())
-/*N*/ {
-/*?*/ pChDoc->CleanupOld3DStorage();
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ return bRet;
-/*N*/ }
-
/*************************************************************************
|*
|* Tabellenzeiger auffrischen
diff --git a/binfilter/inc/bf_sch/docshell.hxx b/binfilter/inc/bf_sch/docshell.hxx
index 4bb4b6a..2dbebd4 100644
--- a/binfilter/inc/bf_sch/docshell.hxx
+++ b/binfilter/inc/bf_sch/docshell.hxx
@@ -103,7 +103,7 @@ class SchChartDocShell: public SfxObjectShell, public SfxInPlaceObject
virtual BOOL InitNew(SvStorage*) throw();
virtual BOOL Load(SvStorage*) throw();
- virtual BOOL Save() throw();
+ virtual BOOL Save() throw() {return false;}
virtual Rectangle GetVisArea(USHORT nAspect) const throw();
virtual void SetVisArea(const Rectangle& rRect) throw();
commit 41e67f3a28552fa4bdc06ffe3a32bf6abbdea770
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 21:33:11 2011 +0200
remove function SaveElement in binfilter
since not called any more
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 32e6c7f..c25ec9a 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1306,101 +1306,6 @@ void SvPersist::SaveContent( SvStream & rStm, BOOL bOwner_ )
// nichts tun bei Fremd-Format
}
-BOOL SvPersist::SaveElement( SvStorage* pStor, SvInfoObject* pEle )
-{
- BOOL bRet = TRUE;
- BOOL bLoad = FALSE;
-
- // create OLE substorages as default
- // only internal objects stored into XML format should be UCB substorages
- SvStorageRef aSrcEleStor = GetObjectStorage( pEle );
- if ( pEle->GetClassName() == SvGlobalName() )
- pEle->SetClassName( aSrcEleStor->GetClassName() );
-
- DBG_ASSERT( aSrcEleStor.Is(), "no object storage" );
- long nObjVersion = aSrcEleStor->GetVersion();
-
- // element must be saved as OLEStorage if it currently has an OLE storage or
- // the target storage is an OLEStorage
-#ifdef DBG_UTIL
- BOOL bOLESubStorage = pStor->IsOLEStorage() || aSrcEleStor->IsOLEStorage();
-#endif
- BOOL bIntern = SvFactory::IsIntern( aSrcEleStor->GetClassName(), &nObjVersion );
- if( nObjVersion >= SOFFICE_FILEFORMAT_60 )
- {
- ULONG nFormat = aSrcEleStor->GetFormat();
- switch( nFormat )
- {
- case SOT_FORMATSTR_ID_STARWRITER_8:
- case SOT_FORMATSTR_ID_STARWRITERWEB_8:
- case SOT_FORMATSTR_ID_STARWRITERGLOB_8:
- case SOT_FORMATSTR_ID_STARDRAW_8:
- case SOT_FORMATSTR_ID_STARIMPRESS_8:
- case SOT_FORMATSTR_ID_STARCALC_8:
- case SOT_FORMATSTR_ID_STARCHART_8:
- case SOT_FORMATSTR_ID_STARMATH_8:
- nObjVersion = SOFFICE_FILEFORMAT_8;
- break;
- default:
- break;
- }
- }
-
- bLoad = (nObjVersion != pStor->GetVersion() );
-
- // load object if neccessary
- if( bLoad && !pEle->GetPersist() )
- CreateObjectFromStorage( pEle, aSrcEleStor );
-
- SvPseudoObjectRef xPO( pEle->GetPersist() );
- if ( !pStor->IsOLEStorage() && xPO.Is() && ( xPO->GetMiscStatus() & SVOBJ_MISCSTATUS_SPECIALOBJECT ) )
- // these object are saved into the document stream
- return TRUE;
-
- SvStorageRef aEleStor;
- if( !bIntern || pStor->IsOLEStorage() )
- aEleStor = pStor->OpenOLEStorage( pEle->GetStorageName() );
- else
- aEleStor = pStor->OpenUCBStorage( pEle->GetStorageName() );
-
- if( !aEleStor.Is() )
- return FALSE;
-
- aEleStor->SetVersion( pStor->GetVersion() );
-
- BOOL bSave = ( pEle->GetPersist() != 0 );
- if ( bSave && !bLoad )
- {
- bSave = pEle->GetPersist()->IsModified();
- if ( !bSave )
- {
- SvStorageInfoList aList;
- aSrcEleStor->FillInfoList( &aList );
- bSave = !aList.Count();
- }
- }
-
- if( bSave )
- {
- DBG_ASSERT( bOLESubStorage || ( xPO->GetMiscStatus() & SVOBJ_MISCSTATUS_SPECIALOBJECT ) == 0, "Trying to save special object" );
- bRet = false;
- }
- else
- {
- bRet = aSrcEleStor->CopyTo( aEleStor );
- if ( pEle->GetPersist() )
- pEle->GetPersist()->bOpSaveAs = TRUE;
- }
-
- if( bRet )
- {
- // always commit child objects
- bRet = aEleStor->Commit();
- }
-
- return bRet;
-}
-
/*************************************************************************
|* SvPersist::CleanUp()
|*
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index 7472508..4125a17 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -139,7 +139,6 @@ private:
SO3_DLLPRIVATE SvInfoObjectMemberList *GetInfoList();
SO3_DLLPRIVATE void CountModified( BOOL bDirection );
SO3_DLLPRIVATE void dtorClear();
- SO3_DLLPRIVATE BOOL SaveElement( SvStorage*, SvInfoObject* );
SO3_DLLPRIVATE SvPersistRef CreateObjectFromStorage( SvInfoObject*, const SvStorageRef& );
SO3_DLLPRIVATE BOOL ImplCopy( SvPersist*, const String&, BOOL );
commit f4ce344f17f0aff2e0732d51c1515338b2c53594
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 20:47:05 2011 +0200
delete function SaveChilds in binfilter
since this function is not called anymore
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 5f6be4a..32e6c7f 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1306,32 +1306,6 @@ void SvPersist::SaveContent( SvStream & rStm, BOOL bOwner_ )
// nichts tun bei Fremd-Format
}
-BOOL SvPersist::SaveChilds()
-{
- BOOL bRet = TRUE;
- if( pChildList )
- {
- for( ULONG i = 0; i < pChildList->Count(); i++ )
- {
- SvInfoObject * pEle = pChildList->GetObject( i );
- if( pEle->GetPersist() && !pEle->IsDeleted() )
- {
- if ( pEle->pImp->GetRealStorageName().Len() )
- {
- // element is currently stored in an external storage
- // save it into my storage
- bRet = SaveElement( GetStorage(), pEle );
- }
- else
- bRet = FALSE;
- }
-
- pEle = pChildList->Next();
- }
- }
- return bRet;
-}
-
BOOL SvPersist::SaveElement( SvStorage* pStor, SvInfoObject* pEle )
{
BOOL bRet = TRUE;
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index f2cba9d..7472508 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -168,7 +168,6 @@ protected:
SO3_DLLPRIVATE BOOL DoSaveContent( SvStorage *, BOOL bOwner );
virtual void SaveContent( SvStream & rStm, BOOL bOwner );
- BOOL SaveChilds(); // Rekursiv
SO3_DLLPRIVATE BOOL HasStorage() const { return aStorage.Is(); }
public:
SvPersist();
commit 556885962495a171818b80553a87ee282af98bb8
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 20:39:07 2011 +0200
delete function SaveCompletedChilds in binfilter
since this was not called by any other function anymore
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index f6d0fbe..f2cba9d 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -169,7 +169,6 @@ protected:
virtual void SaveContent( SvStream & rStm, BOOL bOwner );
BOOL SaveChilds(); // Rekursiv
- BOOL SaveCompletedChilds( SvStorage * ); // Rekursiv
SO3_DLLPRIVATE BOOL HasStorage() const { return aStorage.Is(); }
public:
SvPersist();
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index aabf785..9ded94b 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -146,7 +146,6 @@ public:
// globaler IO
virtual BOOL Save() {return false;}
- inline BOOL SaveCompletedChilds( SvStorage *pStor );
// fuer VorlagenPI
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
@@ -209,10 +208,6 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
};
-inline BOOL SwDocShell::SaveCompletedChilds( SvStorage *pStor )
-{
- return SfxInPlaceObject::SaveCompletedChilds( pStor );
-}
} //namespace binfilter
#endif
commit 2f4efd419619d7a8eacc7f2e3ce8ce6f42e297c8
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 20:24:34 2011 +0200
delete SaveAsChilds function in binfilter
since this function was not called anymore
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 8bbd7a9..5f6be4a 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1427,71 +1427,6 @@ BOOL SvPersist::SaveElement( SvStorage* pStor, SvInfoObject* pEle )
return bRet;
}
-BOOL SvPersist::SaveAsChilds( SvStorage * pStor )
-{
- BOOL bRet = TRUE;
- if( pChildList )
- {
- for( ULONG i=0; bRet && i<pChildList->Count(); i++ )
- {
- SvInfoObject * pEle = pChildList->GetObject( i );
- if ( !pEle->IsDeleted() )
- bRet = SaveElement( pStor, pEle );
- }
- }
-
- // for the 6.0 documents save all alien folders that are registered
- // in manifest.xml with nonempty mediatype
-
- if( GetStorage() && pStor
- && aStorage->GetVersion() >= SOFFICE_FILEFORMAT_60
- && pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 )
- {
- SvStorageInfoList aChildren;
- aStorage->FillInfoList( &aChildren );
-
- for( ULONG i=0; bRet && i < aChildren.Count(); i++ )
- {
- SvStorageInfo& rEle = aChildren.GetObject( i );
- SvInfoObjectRef rObj;
- if( pChildList )
- {
- rObj = pChildList->First();
- while( rObj.Is() )
- {
- if( rObj->GetStorageName() == rEle.GetName() )
- break;
- rObj = pChildList->Next();
- }
- }
-
- if( !rObj.Is() && rEle.IsStorage() )
- {
- ::com::sun::star::uno::Any aAny;
- ::rtl::OUString aMediaType;
- ::rtl::OUString aPropNameStr( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ));
-
- GetStorage()->GetProperty( rEle.GetName(), aPropNameStr, aAny );
- if( ( aAny >>= aMediaType ) && aMediaType.getLength()
- && aMediaType.compareToAscii( "application/vnd.sun.star.oleobject" ) != COMPARE_EQUAL
- && rEle.GetClassName() == SvGlobalName() )
- {
- SvStorageRef aEleStor = pStor->OpenUCBStorage( rEle.GetName() );
- SvStorageRef aSrcEleStor = GetStorage()->OpenUCBStorage( rEle.GetName() );
- bRet = aSrcEleStor->CopyTo( aEleStor );
- if( bRet )
- {
- aEleStor->SetProperty( aPropNameStr, aAny );
- bRet = aEleStor->Commit();
- }
- }
- }
- }
- }
-
- return bRet;
-}
-
/*************************************************************************
|* SvPersist::CleanUp()
|*
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index 78d4dd6..f6d0fbe 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -169,7 +169,6 @@ protected:
virtual void SaveContent( SvStream & rStm, BOOL bOwner );
BOOL SaveChilds(); // Rekursiv
- BOOL SaveAsChilds( SvStorage * pNewStg );// Rekursiv
BOOL SaveCompletedChilds( SvStorage * ); // Rekursiv
SO3_DLLPRIVATE BOOL HasStorage() const { return aStorage.Is(); }
public:
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index 1debec7..aabf785 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -146,7 +146,6 @@ public:
// globaler IO
virtual BOOL Save() {return false;}
- inline BOOL SaveAsChilds( SvStorage *pStor );
inline BOOL SaveCompletedChilds( SvStorage *pStor );
// fuer VorlagenPI
@@ -210,11 +209,6 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
};
-inline BOOL SwDocShell::SaveAsChilds( SvStorage *pStor )
-{
- return SfxInPlaceObject::SaveAsChilds( pStor );
-}
-
inline BOOL SwDocShell::SaveCompletedChilds( SvStorage *pStor )
{
return SfxInPlaceObject::SaveCompletedChilds( pStor );
commit 7832c2afe2f3ab3696641df0a8cdaedbdd73a830
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 17:14:08 2011 +0200
deactivate bool Save in binfilter bf_svx
the function returns only false, without performing any action
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index 787e13b..5347deb 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -97,13 +97,6 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XBitmapTable::Save()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XBitmapTable::Create()
/*N*/ {
/*N*/ return( FALSE );
@@ -235,30 +228,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ return( FALSE );
/*N*/ }
-/************************************************************************/
-
-/*N*/ BOOL XBitmapList::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, TRUE );
- aMedium.IsRemote();
-
- SvStream* pStream = aMedium.GetOutStream();
- if( !pStream )
- return( FALSE );
-
- // UNICODE: *pStream << String( pszChckBitmap1, 4 );
- pStream->WriteByteString(String( pszChckBitmap1, 4 ));
- ImpStore( *pStream );
-
- aMedium.Close();
- aMedium.Commit();
- return( aMedium.GetError() == 0 );
-*/
-/*N*/ }
-
-/************************************************************************/
// Umgestellt auf XBitmap
/*N*/ BOOL XBitmapList::Create()
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index 74d74d5..403fac0 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -169,32 +169,6 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XColorTable::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-
-/*
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, TRUE );
- aMedium.IsRemote();
-
- SvStream* pStream = aMedium.GetOutStream();
- if( !pStream )
- return( FALSE );
-
- // UNICODE: *pStream << String( pszChckColor0, 4 );
- pStream->WriteByteString(String( pszChckColor0, 4 ));
-
-
- ImpStore( *pStream );
-
- aMedium.Close();
- aMedium.Commit();
-
- return( aMedium.GetError() == 0 );
-*/
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XColorTable::Create()
/*N*/ {
/*N*/ XubString aStr;
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index 1489912..eea899c 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -105,13 +105,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XDashTable::Save()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XDashTable::Create()
/*N*/ {
/*N*/ return( FALSE );
@@ -251,12 +244,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XDashList::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XDashList::Create()
/*N*/ {
/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index 07dd80a..40c6e29 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -105,13 +105,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XGradientTable::Save()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XGradientTable::Create()
/*N*/ {
/*N*/ return( FALSE );
@@ -250,12 +243,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XGradientList::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XGradientList::Create()
/*N*/ {
/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index ae09938..03fbec3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -103,13 +103,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XHatchTable::Save()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XHatchTable::Create()
/*N*/ {
/*N*/ return( FALSE );
@@ -248,12 +241,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XHatchList::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XHatchList::Create()
/*N*/ {
/*N*/ XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
index d33060c..0cf2284 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
@@ -110,13 +110,6 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XLineEndTable::Save()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XLineEndTable::Create()
/*N*/ {
/*N*/ return( FALSE );
@@ -256,12 +249,6 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ BOOL XLineEndList::Save()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ BOOL XLineEndList::Create()
/*N*/ {
/*N*/ XPolygon aTriangle(3);
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index c68554f..28c4ff0 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -311,7 +311,7 @@ public:
XColorEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -335,7 +335,7 @@ public:
XLineEndEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -369,7 +369,7 @@ public:
XLineEndEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -393,7 +393,7 @@ public:
XDashEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -427,7 +427,7 @@ public:
XDashEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -451,7 +451,7 @@ public:
XHatchEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -484,7 +484,7 @@ public:
XHatchEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -508,7 +508,7 @@ public:
XGradientEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -541,7 +541,7 @@ public:
XGradientEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -565,7 +565,7 @@ public:
XBitmapEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
@@ -594,7 +594,7 @@ public:
XBitmapEntry* Get(long nIndex) const;
virtual BOOL Load();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual BOOL Create();
virtual BOOL CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
commit 509d2cd17487119ac1267c37415c6d3cd4fa9f2c
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 17:05:14 2011 +0200
deactivate bool Save function in binfilter bf_svtools
and return directly false, without performing anything
diff --git a/binfilter/bf_svtools/source/config/svt_searchopt.cxx b/binfilter/bf_svtools/source/config/svt_searchopt.cxx
index 030ddd2..6ad7ceb 100644
--- a/binfilter/bf_svtools/source/config/svt_searchopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_searchopt.cxx
@@ -70,7 +70,7 @@ protected:
using ConfigItem::SetModified;
void SetModified( BOOL bVal );
BOOL Load();
- BOOL Save();
+ BOOL Save() {return false;}
Sequence< OUString > GetPropertyNames() const;
@@ -240,34 +240,6 @@ BOOL SvtSearchOptions_Impl::Load()
}
-BOOL SvtSearchOptions_Impl::Save()
-{
- BOOL bSucc = FALSE;
-
- const Sequence< OUString > aNames = GetPropertyNames();
- INT32 nProps = aNames.getLength();
-
- Sequence< Any > aValues( nProps );
- Any *pValue = aValues.getArray();
-
- DBG_ASSERT( nProps == MAX_FLAGS_OFFSET + 1,
- "unexpected size of index" );
- if (nProps && nProps == MAX_FLAGS_OFFSET + 1)
- {
- for (USHORT i = 0; i < nProps; ++i)
- pValue[i] <<= (BOOL) GetFlag(i);
- bSucc |= PutProperties( aNames, aValues );
- }
-
- if (bSucc)
- SetModified( FALSE );
-
- return bSucc;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-
SvtSearchOptions::SvtSearchOptions()
{
pImpl = new SvtSearchOptions_Impl;
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index a3c0606..b87bdc8 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -782,43 +782,6 @@ BOOL SvNumberFormatter::Load( SvStream& rStream )
return TRUE;
}
-BOOL SvNumberFormatter::Save( SvStream& rStream ) const
-{
- ImpSvNumMultipleWriteHeader aHdr( rStream );
- // ab 364i wird gespeichert was SYSTEM wirklich war, vorher hart LANGUAGE_SYSTEM
- rStream << (USHORT) SV_NUMBERFORMATTER_VERSION;
- rStream << (USHORT) Application::GetSettings().GetLanguage() << (USHORT) IniLnge;
- SvNumberFormatTable* pTable = (SvNumberFormatTable*) &aFTable;
- SvNumberformat* pEntry = (SvNumberformat*) pTable->First();
- while (pEntry)
- {
- // Gespeichert werden alle markierten, benutzerdefinierten Formate und
- // jeweils das Standardformat zu allen angewaehlten CL-Kombinationen
- // sowie NewStandardDefined
- if ( pEntry->GetUsed() || (pEntry->GetType() & NUMBERFORMAT_DEFINED) ||
- pEntry->GetNewStandardDefined() ||
- (pTable->GetCurKey() % SV_COUNTRY_LANGUAGE_OFFSET == 0) )
- {
- rStream << static_cast<sal_uInt32>(pTable->GetCurKey())
- << (USHORT) LANGUAGE_SYSTEM
- << (USHORT) pEntry->GetLanguage();
- pEntry->Save(rStream, aHdr);
- }
- pEntry = (SvNumberformat*) pTable->Next();
- }
- rStream << NUMBERFORMAT_ENTRY_NOT_FOUND; // EndeKennung
-
- // ab SV_NUMBERFORMATTER_VERSION_YEAR2000
- aHdr.StartEntry();
- rStream << (UINT16) GetYear2000();
- aHdr.EndEntry();
-
- if (rStream.GetError())
- return FALSE;
- else
- return TRUE;
-}
-
// static
void SvNumberFormatter::SkipNumberFormatterInStream( SvStream& rStream )
{
diff --git a/binfilter/inc/bf_svtools/zforlist.hxx b/binfilter/inc/bf_svtools/zforlist.hxx
index 1014bf4..74905ec 100644
--- a/binfilter/inc/bf_svtools/zforlist.hxx
+++ b/binfilter/inc/bf_svtools/zforlist.hxx
@@ -452,7 +452,7 @@ public:
/// Load all formats from a stream
BOOL Load( SvStream& rStream );
/// Save all formats to a stream
- BOOL Save( SvStream& rStream ) const;
+ BOOL Save( SvStream& rStream ) const {return false;}
/// Get additional info of a format index, e.g. for dialog box
void GetFormatSpecialInfo(sal_uInt32 nFormat, BOOL& bThousand, BOOL& IsRed,
commit ef956b3a36f9c265844721a28b1233190a468663
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 16:52:32 2011 +0200
deactivate bool save function in binfilter bf_startmath
just return false as value without performing anything
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index c72c6a8..1c1af5c 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -509,45 +509,6 @@ static const char pStarMathDoc[] = "StarMathDocument";
/*N*/ << '\0';
/*N*/ }
-/*N*/ BOOL SmDocShell::Save()
-/*N*/ {
-/*N*/ //! apply latest changes if necessary
-/*N*/ UpdateText();
-/*N*/
-/*N*/ if ( SfxInPlaceObject::Save() )
-/*N*/ {
-/*N*/ if( !pTree )
-/*N*/ Parse();
-/*N*/ if( pTree && !IsFormulaArranged() )
-/*N*/ ArrangeFormula();
-/*N*/
-/*N*/ SvStorage *pStor = GetStorage();
-/*N*/ if(pStor->GetVersion() >= SOFFICE_FILEFORMAT_60)
-/*N*/ {
-/*N*/ // a math package as a storage
-/*N*/ Reference< ::com::sun::star::frame::XModel> xModel(GetModel());
-/*N*/ SmXMLWrapper aEquation(xModel);
-/*N*/ SfxMedium aMedium(pStor);
-/*N*/ aEquation.SetFlat(sal_False);
-/*N*/ return aEquation.Export(aMedium);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ aDocStream = pStor->OpenStream(String::CreateFromAscii(pStarMathDoc));
-/*?*/ aDocStream->SetVersion (pStor->GetVersion ());
-/*?*/ GetPool().SetFileFormatVersion(USHORT(pStor->GetVersion()));
-/*?*/
-/*?*/ aDocStream->Seek(0);
-/*?*/ ImplSave( aDocStream );
-/*?*/
-/*?*/ aDocStream.Clear();
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ return FALSE;
-/*N*/ }
-
-
/*N*/ void SmDocShell::UpdateText()
/*N*/ {
/*N*/ if (pEditEngine && pEditEngine->IsModified())
diff --git a/binfilter/inc/bf_starmath/document.hxx b/binfilter/inc/bf_starmath/document.hxx
index 6ccbe32..3be69e4 100644
--- a/binfilter/inc/bf_starmath/document.hxx
+++ b/binfilter/inc/bf_starmath/document.hxx
@@ -148,7 +148,7 @@ class SmDocShell : public SfxObjectShell, public SfxInPlaceObject,
virtual BOOL InitNew(SvStorage *);
virtual BOOL Load(SvStorage *);
void ImplSave( SvStorageStreamRef xStrm );
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual void HandsOff();
Printer *GetPrt();
commit 86bd8654c2d543b806f86ed89bc374f53d4ceb35
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 16:49:56 2011 +0200
deactivate bool Save in binfilter bf_so3
these functions return directly false, without performing any
action.
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index 66e3b7a..5a9f761 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -639,44 +639,6 @@ BOOL SvAppletObject::Load
}
//=========================================================================
-BOOL SvAppletObject::Save()
-/* [Beschreibung]
-
- Der Inhalt des Objektes wird in den, in <SvAppletObject::InitNew>
- oder <SvAppletObject::Load> "ubergebenen Storage, geschrieben.
-
- [R"uckgabewert]
-
- BOOL TRUE, das Objekt wurde geschreiben.
- FALSE, das Objekt wurde nicht geschrieben. Es muss
- die in der Klasse <SvPersist> beschrieben
- Fehlerbehandlung erfolgen.
-
- [Querverweise]
-
- <SvPersist::Save>
-*/
-{
- if( SvInPlaceObject::Save() )
- {
- SvStorageStreamRef xStm;
- xStm = GetStorage()->OpenStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( DOCNAME ) ),
- STREAM_STD_WRITE | STREAM_TRUNC );
- xStm->SetVersion( GetStorage()->GetVersion() );
- xStm->SetBufferSize( 8192 );
-
- *xStm << (BYTE)APPLET_VERS;
- *xStm << pImpl->aCmdList;
- xStm->WriteByteString( pImpl->aClass, RTL_TEXTENCODING_ASCII_US );
- xStm->WriteByteString( pImpl->aName, RTL_TEXTENCODING_ASCII_US );
- xStm->WriteByteString( pImpl->aCodeBase, RTL_TEXTENCODING_ASCII_US );
- *xStm << pImpl->bMayScript;
- return xStm->GetError() == ERRCODE_NONE;
- }
- return FALSE;
-}
-
-//=========================================================================
void SvAppletObject::HandsOff()
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index 7cedce1..5301cb7 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -292,17 +292,6 @@ BOOL SvEmbeddedObject::Load( SvStorage * pStor )
}
/*************************************************************************
-|* SvEmbeddedObject::Save()
-|*
-|* Beschreibung
-*************************************************************************/
-BOOL SvEmbeddedObject::Save()
-{
- return SvPersist::Save();
-}
-
-
-/*************************************************************************
|* SvEmbeddedObject::LoadContent()
|*
|* Beschreibung
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 800ae53..3005263 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -1315,85 +1315,6 @@ BOOL SvOutPlaceObject::Load
}
//=========================================================================
-BOOL SvOutPlaceObject::Save()
-/* [Beschreibung]
-
- Der Inhalt des Objektes wird in den, in <SvOutPlaceObject::InitNew>
- oder <SvOutPlaceObject::Load> "ubergebenen Storage, geschrieben.
-
- [R"uckgabewert]
-
- BOOL TRUE, das Objekt wurde geschreiben.
- FALSE, das Objekt wurde nicht geschrieben. Es muss
- die in der Klasse <SvPersist> beschrieben
- Fehlerbehandlung erfolgen.
-
- [Querverweise]
-
- <SvPersist::Save>
-*/
-{
- if( SvInPlaceObject::Save() )
- {
- SvStorage * pStor = pImpl->xWorkingStg;
- SvStorageStreamRef xStm;
- xStm = pStor->OpenStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( DOCNAME ) ),
- STREAM_STD_WRITE | STREAM_TRUNC );
- xStm->SetVersion( pStor->GetVersion() );
- xStm->SetBufferSize( 128 );
-
- // write Length
- *xStm << (UINT16)(2 + 5 );
-#ifdef WNT
- if( pImpl->pSO_Cont )
- {
- WIN_BOOL fSetExtent;
- pImpl->pSO_Cont->GetInfo( pImpl->dwAspect, fSetExtent );
- pImpl->bSetExtent = fSetExtent;
-
- pImpl->pSO_Cont->Save( pStor );
- }
-#endif
- *xStm << pImpl->dwAspect;
- *xStm << sal::static_int_cast< BOOL >(pImpl->bSetExtent);
-
- if( pStor->GetVersion() <= SOFFICE_FILEFORMAT_40 )
- {
- SotStorageStreamRef xOleObjStm =
- pImpl->xWorkingStg->OpenSotStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ),
- STREAM_STD_READ );
- if( xOleObjStm->GetError() )
- return FALSE;
-
- SvCacheStream aStm;
- aStm << *xOleObjStm;
- aStm.Seek( 0 );
- SotStorageRef xOleObjStor = new SotStorage( aStm );
- if( xOleObjStor->GetError() )
- return FALSE;
-
- // delete all storage entries
- SvStorageInfoList aList;
- pStor->FillInfoList( &aList );
- for( UINT32 i = 0; i < aList.Count(); i++ )
- {
- // workaround a bug in our storage implementation
- String aTmpName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Temp-Delete" ) ) );
- aTmpName += String::CreateFromInt32( nUniqueId++ );
- pStor->Rename( aList[i].GetName(), aTmpName );
- pStor->Remove( aTmpName );
-
- //pStor->Remove( aList[i].GetName() );
- }
- xOleObjStor->CopyTo( GetStorage() );
- }
-
- return xStm->GetError() == ERRCODE_NONE;
- }
- return FALSE;
-}
-
-//=========================================================================
void SvOutPlaceObject::HandsOff()
{
if( HasStorage() && pImpl->xWorkingStg == GetStorage() )
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index a3f9e14..653a395 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -747,52 +747,6 @@ BOOL SvPlugInObject::Load
}
//=========================================================================
-BOOL SvPlugInObject::Save()
-/* [Beschreibung]
-
- Der Inhalt des Objektes wird in den, in <SvPlugInObject::InitNew>
- oder <SvPlugInObject::Load> "ubergebenen Storage, geschrieben.
-
- [R"uckgabewert]
-
- BOOL TRUE, das Objekt wurde geschreiben.
- FALSE, das Objekt wurde nicht geschrieben. Es muss
- die in der Klasse <SvPersist> beschrieben
- Fehlerbehandlung erfolgen.
-
- [Querverweise]
-
- <SvPersist::Save>
-*/
-{
- if( SvInPlaceObject::Save() )
- {
- SvStorageStreamRef xStm;
- xStm = GetStorage()->OpenStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( DOCNAME ) ),
- STREAM_STD_WRITE | STREAM_TRUNC );
- xStm->SetVersion( GetStorage()->GetVersion() );
- xStm->SetBufferSize( 8192 );
-
- *xStm << (BYTE)PLUGIN_VERS;
- *xStm << nPlugInMode;
- *xStm << aCmdList;
- if( pURL )
- {
- *xStm << (BYTE)TRUE;
- String aURL = pURL->GetMainURL( INetURLObject::NO_DECODE );
- if( aURL.Len() )
- aURL = ::binfilter::StaticBaseUrl::AbsToRel( aURL );
- xStm->WriteByteString( aURL, RTL_TEXTENCODING_ASCII_US );
- }
- else
- *xStm << (BYTE)FALSE;
- xStm->WriteByteString( GetMimeType(), RTL_TEXTENCODING_ASCII_US );
- return xStm->GetError() == ERRCODE_NONE;
- }
- return FALSE;
-}
-
-//=========================================================================
void SvPlugInObject::HandsOff()
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/ole/socont.cxx b/binfilter/bf_so3/source/ole/socont.cxx
index 85b1a37..1a2d198 100644
--- a/binfilter/bf_so3/source/ole/socont.cxx
+++ b/binfilter/bf_so3/source/ole/socont.cxx
@@ -409,74 +409,6 @@ UINT CSO_Cont::Create(TENANTTYPE tType, LPVOID pvType
}
-
-/*
- * CSO_Cont::Save
- *
- * Purpose:
- *
- * Parameters:
- * pIStorage LPSTORAGE of the page we live in.
- *
- * Return Value:
- * WIN_BOOL TRUE if successful, FALSE otherwise.
- */
-
-WIN_BOOL CSO_Cont::Save(SotStorage *pIStorage)
- {
- LPPERSISTSTORAGE pIPS;
-
- if (NULL!=m_pIStorage)
- {
- /*
- * We need to OleSave again because we might have changed
- * the size or position of this tenant. We also need to
- * save the rectangle on the page, since that's not known
- * to OLE.
- */
- m_pObj->QueryInterface(IID_IPersistStorage, (PPVOID)&pIPS);
-
- //This fails for static objects...so we improvise if so
- if (FAILED(OleSave(pIPS, m_pIStorage, TRUE)))
- {
- //This is essentially what OleSave does.
- WriteClassStg(m_pIStorage, m_clsID);
- pIPS->Save(m_pIStorage, TRUE);
- }
-
- pIPS->SaveCompleted(NULL);
- pIPS->Release();
- m_pIStorage->Commit(STGC_DEFAULT);
-
- // copy to SotStream
- // Create the stream
- String szTemp = GetStorageName();
- SotStorageStreamRef xStm = pIStorage->OpenSotStream( szTemp, STREAM_STD_READWRITE );
- if( xStm->GetError() )
- return FALSE;
- //We know we only hold one ref from Create or Load
- HGLOBAL hGlobal = NULL;
- GetHGlobalFromILockBytes(
- pTmpStorage, //Pointer to the byte array object
- &hGlobal );//Pointer to the current memory handle for the specified byte array
- if( !hGlobal )
- return FALSE;
- void * pMem = GlobalLock( hGlobal );
- if( !pMem )
- return FALSE;
- xStm->SetSize( 0 );
- ULONG nMaxLen = GlobalSize( hGlobal );
- xStm->Write( pMem, nMaxLen );
- GlobalUnlock( hGlobal );
-
- return TRUE;
- }
-
- return FALSE;
- }
-
-
-
/*
* CSO_Cont::Load
*
diff --git a/binfilter/bf_so3/source/ole/socont.h b/binfilter/bf_so3/source/ole/socont.h
index 27e23e2..7a30c06 100644
--- a/binfilter/bf_so3/source/ole/socont.h
+++ b/binfilter/bf_so3/source/ole/socont.h
@@ -235,7 +235,7 @@ class CSO_Cont : public IUnknown
, LPSIZEL, SotStorage *, PPATRONOBJECT, DWORD);
// UINT Create(TENANTTYPE, LPVOID, LPFORMATETC, PPOINTL
// , LPSIZEL, LPSTORAGE, PPATRONOBJECT, DWORD);
- WIN_BOOL Save(SotStorage * );
+ WIN_BOOL Save(SotStorage * ) {return false;}
WIN_BOOL Load(SotStorage *, DWORD dwAspect, WIN_BOOL fSetExtend, RECTL & rcl );
// WIN_BOOL Load(LPSTORAGE, PTENANTINFO);
void GetInfo(DWORD& rAspect, WIN_BOOL & rSetExtend );
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 90864b5..8bbd7a9 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1165,28 +1165,6 @@ BOOL SvPersist::Load( SvStorage * pStor )
return TRUE;
}
-BOOL SvPersist::Save()
-{
- ASSERT_INIT()
-
- SvGlobalName aNoName; // wegen MAC
- if( GetStorage()->GetClassName() == aNoName )
- // kein Typ im Storage gesetzt
- SetupStorage( GetStorage() );
-
- bOpSave = TRUE;
- if( !IsModified() )
- // keine Aendeungen
- return TRUE;
-
- BOOL bRet = TRUE;
-
- SvStorage *pStor = GetStorage();
- if( SOFFICE_FILEFORMAT_60 > pStor->GetVersion() )
- bRet = DoSaveContent( GetStorage(), TRUE );
- return bRet;
-}
-
void SvPersist::HandsOff()
{
ASSERT_INIT()
diff --git a/binfilter/inc/bf_so3/applet.hxx b/binfilter/inc/bf_so3/applet.hxx
index c77ce16..7d0387e 100644
--- a/binfilter/inc/bf_so3/applet.hxx
+++ b/binfilter/inc/bf_so3/applet.hxx
@@ -86,7 +86,7 @@ protected:
// Laden speichern
SO3_DLLPRIVATE virtual BOOL InitNew( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
- SO3_DLLPRIVATE virtual BOOL Save();
+ SO3_DLLPRIVATE virtual BOOL Save() {return false;}
SO3_DLLPRIVATE virtual void HandsOff();
SO3_DLLPRIVATE ~SvAppletObject();
diff --git a/binfilter/inc/bf_so3/embobj.hxx b/binfilter/inc/bf_so3/embobj.hxx
index e696fee..d7c9f05 100644
--- a/binfilter/inc/bf_so3/embobj.hxx
+++ b/binfilter/inc/bf_so3/embobj.hxx
@@ -87,7 +87,7 @@ protected:
SvEditObjectProtocol aProt; // Referenz auf das Protokoll
~SvEmbeddedObject();
virtual BOOL Load( SvStorage * );
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual void LoadContent( SvStream & rStm, BOOL bOwner_ );
virtual void SaveContent( SvStream & rStm, BOOL bOwner_ );
virtual void Connect( BOOL bConnect );
diff --git a/binfilter/inc/bf_so3/outplace.hxx b/binfilter/inc/bf_so3/outplace.hxx
index fd575de..7cdd1c2 100644
--- a/binfilter/inc/bf_so3/outplace.hxx
+++ b/binfilter/inc/bf_so3/outplace.hxx
@@ -81,7 +81,7 @@ protected:
// Laden speichern
SO3_DLLPRIVATE virtual BOOL InitNew( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
- SO3_DLLPRIVATE virtual BOOL Save();
+ SO3_DLLPRIVATE virtual BOOL Save() {return false;}
SO3_DLLPRIVATE virtual void HandsOff();
SO3_DLLPRIVATE ~SvOutPlaceObject();
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index 2b17021..78d4dd6 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -160,7 +160,7 @@ protected:
virtual BOOL InitNew( SvStorage * ); // Rekursiv
virtual BOOL Load( SvStorage * ); // Rekursiv
- virtual BOOL Save(); // Rekursiv
+ virtual BOOL Save() {return false;} // Rekursiv
virtual void HandsOff(); // Rekursiv
SO3_DLLPRIVATE BOOL DoLoadContent( SvStorage *, BOOL bOwner );
diff --git a/binfilter/inc/bf_so3/plugin.hxx b/binfilter/inc/bf_so3/plugin.hxx
index 12f272b..b918ecc 100644
--- a/binfilter/inc/bf_so3/plugin.hxx
+++ b/binfilter/inc/bf_so3/plugin.hxx
@@ -98,7 +98,7 @@ protected:
// Laden speichern
SO3_DLLPRIVATE virtual BOOL InitNew( SvStorage * );
SO3_DLLPRIVATE virtual BOOL Load( SvStorage * );
- SO3_DLLPRIVATE virtual BOOL Save();
+ SO3_DLLPRIVATE virtual BOOL Save() {return false;}
SO3_DLLPRIVATE virtual void HandsOff();
// Spaeter gerne mal virtuell...
commit b64163799e9c19ded6ca399c83fe578a79c2373f
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 16:04:53 2011 +0200
deactivate bool Save in binfilter bf_sw
and return only false without performing action
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 5503948..8601198 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -95,7 +95,7 @@ using namespace ::com::sun::star::container;
/*N*/ String * pLongUserName,
/*N*/ String * pUserName,
/*N*/ long nFileFormat=SOFFICE_FILEFORMAT_CURRENT ) const;
-/*N*/ virtual BOOL Save();
+/*N*/ virtual BOOL Save() {return false;}
/*N*/ public:
/*N*/ SwTmpPersist( SwDocShell& rDSh ) : pDShell( &rDSh ) {}
/*N*/};
@@ -282,23 +282,6 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
}
/*--------------------------------------------------------------------
- Beschreibung: Sichern des Default-Formats, Stg vorhanden
- --------------------------------------------------------------------*/
-
-
-BOOL SwDocShell::Save()
-{
- //only here for virtual reason, will be deleted
- //this is a virtual fonction from SfxObjectShell (in sfx)
- return false;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Sichern im Defaultformat
- --------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------
Beschreibung: Haende weg
--------------------------------------------------------------------*/
@@ -621,13 +604,6 @@ BOOL SwDocShell::Save()
/*N*/ pLongUserName, pUserName, nFileFormat );
/*N*/ }
-/*N*/ BOOL SwTmpPersist::Save()
-/*N*/{
-/*N*/ if( SaveChilds() )
-/*N*/ return SvPersist::Save();
-/*N*/ return FALSE;
-/*N*/}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/docsh.hxx b/binfilter/inc/bf_sw/docsh.hxx
index 22ea91e..1debec7 100644
--- a/binfilter/inc/bf_sw/docsh.hxx
+++ b/binfilter/inc/bf_sw/docsh.hxx
@@ -145,7 +145,7 @@ public:
// DocumentInfo neu setzen
// globaler IO
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
inline BOOL SaveAsChilds( SvStorage *pStor );
inline BOOL SaveCompletedChilds( SvStorage *pStor );
commit 69cd2eb0b281a2155b7058982d7d064a8383204c
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 12:41:55 2011 +0200
deactivate function bool Save in binfilter bf_sd
and return only the value false, without executing code
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
index f31e0da..93178f2 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
@@ -352,34 +352,6 @@ BOOL SdDrawDocShell::Load( SvStorage* pStore )
return bRet;
}
- BOOL SdDrawDocShell::Save()
- {
- if( GetCreateMode() == SFX_CREATE_MODE_STANDARD )
- SvInPlaceObject::SetVisArea( Rectangle() );
-
- BOOL bRet = SfxInPlaceObject::Save();
-
- if( bRet )
- {
- SvStorage* pStore = GetStorage();
- SfxMedium aMedium( pStore );
- SdFilter* pFilter = NULL;
-
- if( pStore->GetVersion() >= SOFFICE_FILEFORMAT_60 )
- pFilter = new SdXMLFilter( aMedium, *this, sal_True );
- else
- pFilter = new SdBINFilter( aMedium, *this, sal_True );
-
- UpdateDocInfoForSave();
-
- bRet = pFilter ? pFilter->Export() : FALSE;
- delete pFilter;
- }
-
- return bRet;
- }
-
-
void SdDrawDocShell::HandsOff()
{
SfxInPlaceObject::HandsOff();
diff --git a/binfilter/inc/bf_sd/docshell.hxx b/binfilter/inc/bf_sd/docshell.hxx
index ffa7bb0..9f2d21e 100644
--- a/binfilter/inc/bf_sd/docshell.hxx
+++ b/binfilter/inc/bf_sd/docshell.hxx
@@ -93,7 +93,7 @@ public:
virtual BOOL InitNew( SvStorage * );
virtual BOOL Load( SvStorage * );
virtual void HandsOff();
- virtual BOOL Save();
+ virtual BOOL Save() {return false;}
virtual void SetVisArea(const Rectangle& rRect);
virtual Rectangle GetVisArea(USHORT nAspect) const;
virtual Printer* GetDocumentPrinter();
commit ed85c10b2882bbfcacd413d8c12fa94941c0a41d
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 3 12:37:45 2011 +0200
deactivate functions bool Save in binfilter/bf_sfx2
theses functions do not perform anything else than returning
false as value
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 844beee..7960cf8 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -589,28 +589,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
//-------------------------------------------------------------------------
-
-/*N*/ BOOL SfxDocUserKey::Save(SvStream &rStream) const
-/*N*/ {
-/*N*/ DBG_ASSERT( aTitle.Len() <= SFXDOCUSERKEY_LENMAX, "length of user key title overflow" );
-/*N*/ DBG_ASSERT( aWord.Len() <= SFXDOCUSERKEY_LENMAX, "length of user key value overflow" );
-/*N*/
-/*N*/ // save the title of the user key
-/*N*/ String aString = aTitle;
-/*N*/ aString.Erase( SFXDOCUSERKEY_LENMAX );
-/*N*/ rStream.WriteByteString( aString );
-/*N*/ PaddWithBlanks_Impl(rStream, SFXDOCUSERKEY_LENMAX - aString.Len());
-/*N*/
-/*N*/ // save the value of the user key
-/*N*/ aString = aWord;
-/*N*/ aString.Erase( SFXDOCUSERKEY_LENMAX );
-/*N*/ rStream.WriteByteString( aString );
-/*N*/ PaddWithBlanks_Impl(rStream, SFXDOCUSERKEY_LENMAX - aString.Len());
-/*N*/
-/*N*/ return rStream.GetError() == SVSTREAM_OK;
-/*N*/ }
-
-//-------------------------------------------------------------------------
/*N*/ SfxDocUserKey::SfxDocUserKey( const String& rTitle, const String& rWord ) :
/*N*/ aTitle( rTitle ), aWord( rWord )
/*N*/ {
@@ -806,101 +784,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list