diff options
| author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-04-16 22:41:13 +0200 |
|---|---|---|
| committer | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-04-18 21:36:01 +0200 |
| commit | e691e5b077bbc44d87ab2a125b8dcc35c1f2a249 (patch) | |
| tree | f36c1ce9acc05408d09208d158738b7d8fe530b8 | |
| parent | deactivate Store function in binfilter/bf_svtools (diff) | |
| download | binfilter-e691e5b077bbc44d87ab2a125b8dcc35c1f2a249.tar.gz binfilter-e691e5b077bbc44d87ab2a125b8dcc35c1f2a249.zip | |
deactivate Store function in binfilter/bf_svx
these functions do nothing, just return or return FALSE if the
return value should be bool
82 files changed, 80 insertions, 1280 deletions
diff --git a/binfilter/bf_svx/source/editeng/editdoc.hxx b/binfilter/bf_svx/source/editeng/editdoc.hxx index 1e699bb14..91d513b65 100644 --- a/binfilter/bf_svx/source/editeng/editdoc.hxx +++ b/binfilter/bf_svx/source/editeng/editdoc.hxx @@ -709,7 +709,7 @@ public: EditEngineItemPool( BOOL bPersistenRefCounts ); ~EditEngineItemPool(); - virtual SvStream& Store( SvStream& rStream ) const; + virtual SvStream& Store( SvStream& rStream ) const {} }; }//end of namespace binfilter diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx index c781b8d3a..508d190f7 100644 --- a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx @@ -1280,7 +1280,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ ContentNode* pNode = GetObject( nNode ); /*N*/ nLen += pNode->Len(); -/*N*/ // Felder k”nnen laenger sein als der Platzhalter im Node. +/*N*/ // Felder k?nnen laenger sein als der Platzhalter im Node. /*N*/ const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs(); /*N*/ for ( USHORT nAttr = rAttrs.Count(); nAttr; ) /*N*/ { @@ -1965,26 +1965,6 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ } -/*N*/ SvStream& EditEngineItemPool::Store( SvStream& rStream ) const -/*N*/ { -/*N*/ // Bei einem 3.1-Export muess ein Hack eingebaut werden, da BUG im -/*N*/ // SfxItemSet::Load, aber nicht nachtraeglich in 3.1 fixbar. -/*N*/ -/*N*/ // Der eingestellte Range muss nach Store erhalten bleiben, weil dann -/*N*/ // erst die ItemSets gespeichert werden... -/*N*/ -/*N*/ long nVersion = rStream.GetVersion(); -/*N*/ BOOL b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) ) -/*N*/ ? TRUE : FALSE; -/*N*/ -/*N*/ EditEngineItemPool* pThis = (EditEngineItemPool*)this; -/*N*/ if ( b31Format ) -/*N*/ pThis->SetStoringRange( 3997, 4022 ); -/*N*/ else -/*N*/ pThis->SetStoringRange( EE_ITEMS_START, EE_ITEMS_END ); -/*N*/ -/*N*/ return SfxItemPool::Store( rStream ); -/*N*/ } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx index 460aaaa34..0b13a85ea 100644 --- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx @@ -327,33 +327,6 @@ void EditTextObject::SetVertical( BOOL /*bVertical*/ ) -BOOL EditTextObject::Store( SvStream& rOStream ) const -{ - if ( rOStream.GetError() ) - return FALSE; - - // Vorspann: - ULONG nStartPos = rOStream.Tell(); - - USHORT nLclWhich = Which(); - rOStream << nLclWhich; - - sal_uInt32 nStructSz = 0; - rOStream << nStructSz; - - // Eigene Daten: - StoreData( rOStream ); - - // Nachspann: - ULONG nEndPos = rOStream.Tell(); - nStructSz = nEndPos - nStartPos - sizeof( nLclWhich ) - sizeof( nStructSz ); - rOStream.Seek( nStartPos + sizeof( nLclWhich ) ); - rOStream << nStructSz; - rOStream.Seek( nEndPos ); - - return rOStream.GetError() ? FALSE : TRUE; -} - EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool ) { ULONG nStartPos = rIStream.Tell(); diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx index 92a134193..2bd59e243 100644 --- a/binfilter/bf_svx/source/items/svx_algitem.cxx +++ b/binfilter/bf_svx/source/items/svx_algitem.cxx @@ -434,18 +434,6 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -/*N*/ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const -/*N*/ { -/*N*/ rStream << nLeftMargin; -/*N*/ rStream << nTopMargin; -/*N*/ rStream << nRightMargin; -/*N*/ rStream << nBottomMargin; -/*N*/ return rStream; -/*N*/ } - - -//------------------------------------------------------------------------ - /*N*/ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { /*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx index 45b3aa6a4..f6077c961 100644 --- a/binfilter/bf_svx/source/items/svx_bulitem.cxx +++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx @@ -301,66 +301,6 @@ namespace binfilter { /*N*/ return 1; /*N*/ } -// ----------------------------------------------------------------------- - -/*N*/ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ // Korrektur bei leerer Bitmap -/*N*/ if( ( nStyle == BS_BMP ) && -/*N*/ ( !pGraphicObject || ( GRAPHIC_NONE == pGraphicObject->GetType() ) || ( GRAPHIC_DEFAULT == pGraphicObject->GetType() ) ) ) -/*N*/ { -/*?*/ if( pGraphicObject ) -/*?*/ { -/*?*/ delete( const_cast< SvxBulletItem* >( this )->pGraphicObject ); -/*?*/ const_cast< SvxBulletItem* >( this )->pGraphicObject = NULL; -/*?*/ } -/*?*/ -/*?*/ const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE; -/*N*/ } -/*N*/ -/*N*/ rStrm << nStyle; -/*N*/ -/*N*/ if( nStyle != BS_BMP ) -/*N*/ StoreFont( rStrm, aFont ); -/*N*/ else -/*N*/ { -/*?*/ ULONG _nStart = rStrm.Tell(); -/*?*/ -/*?*/ // Kleine Vorab-Schaetzung der Groesse... -/*?*/ USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1; -/*?*/ const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() ); -/*?*/ ULONG nBytes = aBmp.GetSizeBytes(); -/*?*/ if ( nBytes < ULONG(0xFF00*nFac) ) -/*?*/ rStrm << aBmp; -/*?*/ -/*?*/ ULONG nEnd = rStrm.Tell(); -/*?*/ // #67581# Item darf mit Overhead nicht mehr als 64K schreiben, -/*?*/ // sonst platzt der SfxMultiRecord -/*?*/ // Dann lieber auf die Bitmap verzichten, ist nur fuer Outliner -/*?*/ // und auch nur fuer <= 5.0 wichtig. -/*?*/ // Beim Einlesen merkt der Stream-Operator der Bitmap, dass dort keine steht. -/*?*/ // Hiermit funktioniert jetzt der Fall das die grosse Bitmap aus einem anderen -/*?*/ // Fileformat entstanden ist, welches keine 64K belegt, aber wenn eine -/*?*/ // Bitmap > 64K verwendet wird, hat das SvxNumBulletItem beim Laden ein Problem, -/*?*/ // stuerzt aber nicht ab. -/*?*/ -/*?*/ if ( (nEnd-_nStart) > 0xFF00 ) -/*?*/ rStrm.Seek( _nStart ); -/*N*/ } -/*N*/ rStrm << nWidth; -/*N*/ rStrm << nStart; -/*N*/ rStrm << nJustify; -/*N*/ rStrm << (char)ByteString::ConvertFromUnicode( cSymbol, aFont.GetCharSet() ); -/*N*/ rStrm << nScale; -/*N*/ -/*N*/ // UNICODE: rStrm << aPrevText; -/*N*/ rStrm.WriteByteString(aPrevText); -/*N*/ -/*N*/ // UNICODE: rStrm << aFollowText; -/*N*/ rStrm.WriteByteString(aFollowText); -/*N*/ -/*N*/ return rStrm; -/*N*/ } } diff --git a/binfilter/bf_svx/source/items/svx_chrtitem.cxx b/binfilter/bf_svx/source/items/svx_chrtitem.cxx index 980ceb5c9..5bb82d2b1 100644 --- a/binfilter/bf_svx/source/items/svx_chrtitem.cxx +++ b/binfilter/bf_svx/source/items/svx_chrtitem.cxx @@ -280,13 +280,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const -/*N*/ { -/*N*/ rOut << fVal; -/*N*/ return rOut; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ rVal <<= fVal; diff --git a/binfilter/bf_svx/source/items/svx_e3ditem.cxx b/binfilter/bf_svx/source/items/svx_e3ditem.cxx index f1e4954a0..f8569c4ef 100644 --- a/binfilter/bf_svx/source/items/svx_e3ditem.cxx +++ b/binfilter/bf_svx/source/items/svx_e3ditem.cxx @@ -103,18 +103,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxVector3DItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const -/*N*/ { -/*N*/ DBG_CHKTHIS(SvxVector3DItem, 0); -/*N*/ -/*N*/ // ## if (nItemVersion) -/*N*/ rStream << aVal; -/*N*/ -/*N*/ return rStream; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ drawing::Direction3D aDirection; diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx index 2ade88913..f4036e569 100644 --- a/binfilter/bf_svx/source/items/svx_flditem.cxx +++ b/binfilter/bf_svx/source/items/svx_flditem.cxx @@ -166,27 +166,6 @@ namespace binfilter { // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFieldItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ DBG_ASSERT( pField, "SvxFieldItem::Store: Feld?!" ); -/*N*/ SvPersistStream aPStrm( GetClassManager(), &rStrm ); -/*N*/ // Das ResetError in der obigen Create-Methode gab es in 3.1 noch nicht, -/*N*/ // deshalb duerfen beim 3.x-Export neuere Items nicht gespeichert werden! -/*N*/ if ( ( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_31 ) && pField && -/*N*/ pField->GetClassId() == 50 /* SdrMeasureField */ ) -/*N*/ { -/*N*/ // SvxFieldData reicht nicht, weil auch nicht am ClassMgr angemeldet -/*?*/ SvxURLField aDummyData; -/*?*/ aPStrm << &aDummyData; -/*N*/ } -/*N*/ else -/*N*/ aPStrm << pField; -/*N*/ -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const /*N*/ { /*N*/ DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx index 44b084036..cb3b1ee60 100644 --- a/binfilter/bf_svx/source/items/svx_frmitems.cxx +++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx @@ -181,14 +181,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ sal_Int8 nBin; @@ -308,16 +300,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << aSize.Width(); -/*N*/ rStrm << aSize.Height(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - - /*N*/ SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ long nWidth, nHeight; @@ -514,60 +496,6 @@ using namespace ::com::sun::star; #define BULLETLR_MARKER 0x599401FE -/*N*/ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const -/*N*/ { -/*N*/ short nSaveFI = nFirstLineOfst; -/*N*/ if ( IsBulletFI() ) -/*N*/ ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin wird mitmanipuliert, siehe Create() -/*N*/ -/*N*/ sal_uInt16 nMargin = 0; -/*N*/ if( nLeftMargin > 0 ) -/*N*/ nMargin = sal_uInt16( nLeftMargin ); -/*N*/ rStrm << nMargin; -/*N*/ rStrm << nPropLeftMargin; -/*N*/ if( nRightMargin > 0 ) -/*N*/ nMargin = sal_uInt16( nRightMargin ); -/*N*/ else -/*N*/ nMargin = 0; -/*N*/ rStrm << nMargin; -/*N*/ rStrm << nPropRightMargin; -/*N*/ rStrm << nFirstLineOfst; -/*N*/ rStrm << nPropFirstLineOfst; -/*N*/ if( nTxtLeft > 0 ) -/*N*/ nMargin = sal_uInt16( nTxtLeft ); -/*N*/ else -/*N*/ nMargin = 0; -/*N*/ rStrm << nMargin; -/*N*/ if( nItemVersion >= LRSPACE_AUTOFIRST_VERSION ) -/*N*/ { -/*N*/ sal_Int8 nAutoFirst = bAutoFirst ? 1 : 0; -/*N*/ if( nItemVersion >= LRSPACE_NEGATIVE_VERSION && -/*N*/ ( nLeftMargin < 0 || nRightMargin < 0 || nTxtLeft < 0 ) ) -/*N*/ nAutoFirst |= 0x80; -/*N*/ rStrm << nAutoFirst; -/*N*/ -/*N*/ if ( IsBulletFI() ) -/*N*/ { -/*N*/ // Ab 6.0 keine Magicnumber schreiben... -/*N*/ DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "MT: Fileformat SvxLRSpaceItem aendern!" ); -/*N*/ rStrm << (sal_uInt32) BULLETLR_MARKER; -/*N*/ rStrm << nSaveFI; -/*N*/ } -/*N*/ if( 0x80 & nAutoFirst ) -/*N*/ { -/*N*/ rStrm << nLeftMargin; -/*N*/ rStrm << nRightMargin; -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ if ( IsBulletFI() ) -/*N*/ ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( nSaveFI ); -/*N*/ -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const /*N*/ { /*N*/ sal_uInt16 left, prpleft, right, prpright, prpfirstline, txtleft; @@ -751,17 +679,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << GetUpper() -/*N*/ << GetPropUpper() -/*N*/ << GetLower() -/*N*/ << GetPropLower(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const /*N*/ { /*N*/ sal_uInt16 upper, lower, nPL = 0, nPU = 0; @@ -802,14 +719,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ sal_Int8 bIsPrint; @@ -829,13 +738,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { @@ -906,17 +808,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ sal_Int8 cProt = 0; -/*N*/ if( IsPosProtected() ) cProt |= 0x01; -/*N*/ if( IsSizeProtected() ) cProt |= 0x02; -/*N*/ if( IsCntntProtected() ) cProt |= 0x04; -/*N*/ rStrm << (sal_Int8) cProt; -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { @@ -1085,19 +976,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8) GetLocation() -/*N*/ << (sal_uInt16) GetWidth() -/*N*/ << (sal_Bool)(aShadowColor.GetTransparency() > 0) -/*N*/ << GetColor() -/*N*/ << GetColor() -/*N*/ << (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ sal_Int8 cLoc; @@ -1432,51 +1310,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const -/*N*/ { -/*N*/ rStrm << (sal_uInt16) GetDistance(); -/*N*/ const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom -/*N*/ pLine[ 0 ] = GetTop(); -/*N*/ pLine[ 1 ] = GetLeft(); -/*N*/ pLine[ 2 ] = GetRight(); -/*N*/ pLine[ 3 ] = GetBottom(); -/*N*/ -/*N*/ for( int i = 0; i < 4; i++ ) -/*N*/ { -/*N*/ const SvxBorderLine* l = pLine[ i ]; -/*N*/ if( l ) -/*N*/ { -/*N*/ rStrm << (sal_Int8) i -/*N*/ << l->GetColor() -/*N*/ << (sal_uInt16) l->GetOutWidth() -/*N*/ << (sal_uInt16) l->GetInWidth() -/*N*/ << (sal_uInt16) l->GetDistance(); -/*N*/ } -/*N*/ } -/*N*/ sal_Int8 cLine = 4; -/*N*/ if( nItemVersion >= BOX_4DISTS_VERSION && -/*N*/ !(nTopDist == nLeftDist && -/*N*/ nTopDist == nRightDist && -/*N*/ nTopDist == nBottomDist) ) -/*N*/ { -/*?*/ cLine |= 0x10; -/*N*/ } -/*N*/ -/*N*/ rStrm << cLine; -/*N*/ -/*N*/ if( nItemVersion >= BOX_4DISTS_VERSION && (cLine & 0x10) != 0 ) -/*N*/ { -/*N*/ rStrm << (sal_uInt16)nTopDist -/*N*/ << (sal_uInt16)nLeftDist -/*N*/ << (sal_uInt16)nRightDist -/*?*/ << (sal_uInt16)nBottomDist; -/*N*/ } -/*N*/ -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const /*N*/ { /*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -1756,39 +1589,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ sal_Int8 cFlags = 0; -/*N*/ -/*N*/ if ( IsTable() ) -/*N*/ cFlags |= 0x01; -/*N*/ if ( IsDist() ) -/*N*/ cFlags |= 0x02; -/*N*/ if ( IsMinDist() ) -/*N*/ cFlags |= 0x04; -/*N*/ rStrm << (sal_Int8) cFlags -/*N*/ << (sal_uInt16) GetDefDist(); -/*N*/ const SvxBorderLine* pLine[ 2 ]; -/*N*/ pLine[ 0 ] = GetHori(); -/*N*/ pLine[ 1 ] = GetVert(); -/*N*/ -/*N*/ for( int i = 0; i < 2; i++ ) -/*N*/ { -/*N*/ const SvxBorderLine* l = pLine[ i ]; -/*N*/ if( l ) -/*N*/ { -/*N*/ rStrm << (char) i -/*N*/ << l->GetColor() -/*N*/ << (short) l->GetOutWidth() -/*N*/ << (short) l->GetInWidth() -/*?*/ << (short) l->GetDistance(); -/*N*/ } -/*N*/ } -/*N*/ rStrm << (char) 2; -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { @@ -1903,16 +1703,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8)GetValue(); -/*N*/ if( FMTBREAK_NOAUTO > nItemVersion ) -/*N*/ rStrm << (sal_Int8)0x01; -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const /*N*/ { /*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -1950,14 +1740,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ sal_Int8 bIsKeep; @@ -2567,41 +2349,6 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStream << (sal_Bool)sal_False; -/*N*/ rStream << aColor; -/*N*/ rStream << aColor; -/*N*/ rStream << (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID -/*N*/ -/*N*/ sal_uInt16 nDoLoad = 0; -/*N*/ -/*N*/ if ( pImpl->pGraphicObject && !pStrLink ) -/*N*/ nDoLoad |= LOAD_GRAPHIC; -/*N*/ if ( pStrLink ) -/*N*/ nDoLoad |= LOAD_LINK; -/*N*/ if ( pStrFilter ) -/*N*/ nDoLoad |= LOAD_FILTER; -/*N*/ rStream << nDoLoad; -/*N*/ -/*N*/ if ( pImpl->pGraphicObject && !pStrLink ) -/*N*/ rStream << pImpl->pGraphicObject->GetGraphic(); -/*N*/ if ( pStrLink ) -/*N*/ { -/*N*/ String aRel = ::binfilter::StaticBaseUrl::AbsToRel( *pStrLink ); -/*N*/ // UNICODE: rStream << aRel; -/*N*/ rStream.WriteByteString(aRel); -/*N*/ } -/*N*/ if ( pStrFilter ) -/*N*/ { -/*N*/ // UNICODE: rStream << *pStrFilter; -/*?*/ rStream.WriteByteString(*pStrFilter); -/*N*/ } -/*N*/ rStream << (sal_Int8)eGraphicPos; -/*N*/ return rStream; -/*N*/ } - -// ----------------------------------------------------------------------- // const wegcasten, da const als logisches const zu verstehen ist // wenn GetGraphic() gerufen wird, soll sich das Item darum kuemmern, // eine gelinkte Grafik zu holen. @@ -2785,13 +2532,6 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ ) return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() ); } -/*N*/ SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const -/*N*/ { -/*N*/ sal_uInt16 nValue = GetValue(); -/*N*/ rStrm << nValue; -/*N*/ return rStrm; -/*N*/ } - /*N*/ USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const /*N*/ { /*N*/ return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0; diff --git a/binfilter/bf_svx/source/items/svx_grfitem.cxx b/binfilter/bf_svx/source/items/svx_grfitem.cxx index ed17e3375..11f68c7e8 100644 --- a/binfilter/bf_svx/source/items/svx_grfitem.cxx +++ b/binfilter/bf_svx/source/items/svx_grfitem.cxx @@ -106,20 +106,6 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const /*N*/ } -/*N*/ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const -/*N*/ { -/*N*/ INT32 left = GetLeft(), right = GetRight(), -/*N*/ top = GetTop(), bottom = GetBottom(); -/*N*/ if( GRFCROP_VERSION_SWDEFAULT == nVersion ) -/*N*/ top = -top, bottom = -bottom, left = -left, right = -right; -/*N*/ -/*N*/ rStrm << top << left << right << bottom; -/*N*/ -/*N*/ return rStrm; -/*N*/ } - - - /*N*/ bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { /*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx index f40e59cbb..4d5e5fd9f 100644 --- a/binfilter/bf_svx/source/items/svx_numitem.cxx +++ b/binfilter/bf_svx/source/items/svx_numitem.cxx @@ -277,70 +277,6 @@ sal_Int32 SvxNumberType::nRefCount = 0; /*N*/ } -/*N*/ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter) -/*N*/ { -/*N*/ if(pConverter && pBulletFont) -/*N*/ { -/*N*/ cBullet = ConvertFontToSubsFontChar(pConverter, cBullet); -/*N*/ String sFontName = GetFontToSubsFontName(pConverter); -/*N*/ pBulletFont->SetName(sFontName); -/*N*/ } -/*N*/ -/*N*/ rStream << (USHORT)NUMITEM_VERSION_03; -/*N*/ -/*N*/ rStream << (USHORT)GetNumberingType(); -/*N*/ rStream << (USHORT)eNumAdjust; -/*N*/ rStream << (USHORT)nInclUpperLevels; -/*N*/ rStream << nStart; -/*N*/ rStream << (USHORT)cBullet; -/*N*/ -/*N*/ rStream << nFirstLineOffset; -/*N*/ rStream << nAbsLSpace; -/*N*/ rStream << nLSpace; -/*N*/ -/*N*/ rStream << nCharTextDistance; -/*N*/ rtl_TextEncoding eEnc = gsl_getSystemTextEncoding(); -/*N*/ rStream.WriteByteString(sPrefix, eEnc); -/*N*/ rStream.WriteByteString(sSuffix, eEnc); -/*N*/ rStream.WriteByteString(sCharStyleName, eEnc); -/*N*/ if(pGraphicBrush) -/*N*/ { -/*?*/ rStream << (USHORT)1; -/*?*/ -/*?*/ // #75113# in SD or SI force bullet itself to be stored, -/*?*/ // for that purpose throw away link when link and graphic -/*?*/ // are present, so Brush save is forced -/*?*/ if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic()) -/*?*/ { -/*?*/ String aEmpty; -/*?*/ pGraphicBrush->SetGraphicLink(aEmpty); -/*?*/ } -/*?*/ -/*?*/ pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION); -/*N*/ } -/*N*/ else -/*N*/ rStream << (USHORT)0; -/*N*/ -/*N*/ rStream << (USHORT)eVertOrient; -/*N*/ if(pBulletFont) -/*N*/ { -/*N*/ rStream << (USHORT)1; -/*N*/ rStream << *pBulletFont; -/*N*/ } -/*N*/ else -/*N*/ rStream << (USHORT)0; -/*N*/ rStream << aGraphicSize; -/*N*/ -/*N*/ Color nTempColor = nBulletColor; -/*N*/ if(COL_AUTO == nBulletColor.GetColor()) -/*N*/ nTempColor = COL_BLACK; -/*N*/ rStream << nTempColor; -/*N*/ rStream << nBulletRelSize; -/*N*/ rStream << (USHORT)IsShowSymbol(); -/*N*/ return rStream; -/*N*/ } - - /*N*/ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) /*N*/ { /*N*/ SetNumberingType(rFormat.GetNumberingType()); @@ -635,44 +571,6 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0; -/*N*/ SvStream& SvxNumRule::Store(SvStream &rStream) -/*N*/ { -/*N*/ rStream<<(USHORT)NUMITEM_VERSION_03; -/*N*/ rStream<<nLevelCount; -/*N*/ //first save of nFeatureFlags for old versions -/*N*/ rStream<<(USHORT)nFeatureFlags; -/*N*/ rStream<<(USHORT)bContinuousNumbering; -/*N*/ rStream<<(USHORT)eNumberingType; -/*N*/ -/*N*/ FontToSubsFontConverter pConverter = 0; -/*N*/ BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50; -/*N*/ for(USHORT i = 0; i < SVX_MAX_NUM; i++) -/*N*/ { -/*N*/ if(aFmts[i]) -/*N*/ { -/*N*/ rStream << USHORT(1); -/*N*/ if(bConvertBulletFont && aFmts[i]->GetBulletFont()) -/*N*/ { -/*N*/ if(!pConverter) -/*N*/ pConverter = -/*N*/ CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(), -/*N*/ FONTTOSUBSFONT_EXPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS); -/*N*/ } -/*N*/ aFmts[i]->Store(rStream, pConverter); -/*N*/ } -/*N*/ else -/*N*/ rStream << USHORT(0); -/*N*/ } -/*N*/ //second save of nFeatureFlags for new versions -/*N*/ rStream<<(USHORT)nFeatureFlags; -/*N*/ if(pConverter) -/*N*/ DestroyFontToSubsFontConverter(pConverter); -/*N*/ -/*N*/ return rStream; -/*N*/ } - - - /*N*/ SvxNumRule::~SvxNumRule() /*N*/ { /*N*/ for(USHORT i = 0; i < SVX_MAX_NUM; i++) @@ -820,13 +718,6 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0; /*N*/ } -/*N*/ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const -/*N*/ { -/*N*/ pNumRule->Store(rStream); -/*N*/ return rStream; -/*N*/ } - - /*N*/ USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const /*N*/ { /*N*/ return NUMITEM_VERSION_03; diff --git a/binfilter/bf_svx/source/items/svx_pageitem.cxx b/binfilter/bf_svx/source/items/svx_pageitem.cxx index e96956f92..54d02091d 100644 --- a/binfilter/bf_svx/source/items/svx_pageitem.cxx +++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx @@ -220,17 +220,6 @@ using namespace ::com::sun::star; /*N*/ return pPage; /*N*/ } -//------------------------------------------------------------------------ - -/*N*/ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ // UNICODE: rStrm << aDescName; -/*N*/ rStrm.WriteByteString(aDescName); -/*N*/ -/*N*/ rStrm << (BYTE)eNumType << bLandscape << eUse; -/*N*/ return rStrm; -/*N*/ } - /*-------------------------------------------------------------------- Beschreibung: HeaderFooterSet --------------------------------------------------------------------*/ @@ -266,13 +255,6 @@ using namespace ::com::sun::star; /*N*/ return new SvxSetItem( Which(), *_pSet ); /*N*/ } -/*N*/ SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const -/*N*/ { -/*N*/ GetItemSet().Store( rStrm, nItemVersion ); -/*N*/ -/*N*/ return rStrm; -/*N*/ } - } diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx index cec3440bc..6dd3dc99e 100644 --- a/binfilter/bf_svx/source/items/svx_paraitem.cxx +++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx @@ -305,18 +305,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8) GetPropLineSpace() -/*N*/ << (short) GetInterLineSpace() -/*N*/ << (sal_uInt16) GetLineHeight() -/*N*/ << (sal_Int8) GetLineSpaceRule() -/*N*/ << (sal_Int8) GetInterLineSpaceRule(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*?*/ sal_uInt16 SvxLineSpacingItem::GetValueCount() const /*?*/ { /*?*/ DBG_BF_ASSERT(0, "STRIP"); return SVX_LINESPACE_END; @@ -485,23 +473,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const -/*N*/ { -/*N*/ rStrm << (char)GetAdjust(); -/*N*/ if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION ) -/*N*/ { -/*N*/ sal_Int8 nFlags = 0; -/*N*/ if ( bOneBlock ) -/*N*/ nFlags |= 0x0001; -/*N*/ if ( bLastCenter ) -/*N*/ nFlags |= 0x0002; -/*N*/ if ( bLastBlock ) -/*N*/ nFlags |= 0x0004; -/*N*/ rStrm << (sal_Int8) nFlags; -/*N*/ } -/*N*/ return rStrm; -/*N*/ } - // class SvxWidowsItem --------------------------------------------------- /*N*/ SvxWidowsItem::SvxWidowsItem(const BYTE nL, const USHORT nId ) : @@ -663,16 +634,6 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8) IsHyphen() -/*N*/ << (sal_Int8) IsPageEnd() -/*N*/ << (sal_Int8) GetMinLead() -/*N*/ << (sal_Int8) GetMinTrail() -/*N*/ << (sal_Int8) GetMaxHyphens(); -/*N*/ return rStrm; -/*N*/ } - // class SvxTabStop ------------------------------------------------------ /*N*/ SvxTabStop::SvxTabStop() @@ -960,63 +921,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ //MA 05. Sep. 96: Default-Tabs werden nur noch fuer das default-Attr -/*N*/ //expandiert. Fuer vollstaendige Rueckwaertskompatibilitaet (<=304) -/*N*/ //muessten alle Tabs expandiert werden, dass blaeht aber das File u.U. -/*N*/ //enorm auf. -/*N*/ //Alles nur SWG! -/*N*/ -/*N*/ const SfxItemPool *pPool = SfxItemPool::GetStoringPool(); -/*N*/ const bool bStoreDefTabs = pPool -/*N*/ && pPool->GetName().EqualsAscii("SWG") -/*N*/ && binfilter::IsDefaultItem( this ); -/*N*/ -/*N*/ const short nTabs = Count(); -/*N*/ sal_uInt16 nCount = 0, nDefDist = 0; -/*N*/ long nNew = 0; -/*N*/ -/*N*/ if( bStoreDefTabs ) -/*N*/ { -/*N*/ const SvxTabStopItem& rDefTab = (const SvxTabStopItem &) -/*N*/ pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, sal_False ) ); -/*N*/ nDefDist = sal_uInt16( rDefTab.GetStart()->GetTabPos() ); -/*N*/ const long nPos = nTabs > 0 ? (*this)[nTabs-1].GetTabPos() : 0; -/*N*/ nCount = (sal_uInt16)(nPos / nDefDist); -/*N*/ nNew = (nCount + 1) * nDefDist; -/*N*/ -/*N*/ if( nNew <= nPos + 50 ) -/*N*/ nNew += nDefDist; -/*N*/ -/*N*/ nCount = nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0; -/*N*/ } -/*N*/ -/*N*/ rStrm << (sal_Int8) ( nTabs + nCount ); -/*N*/ for ( short i = 0; i < nTabs; i++ ) -/*N*/ { -/*N*/ const SvxTabStop& rTab = (*this)[ i ]; -/*N*/ rStrm << (long) rTab.GetTabPos() -/*N*/ << (sal_Int8) rTab.GetAdjustment() -/*N*/ << (unsigned char) rTab.GetDecimal() -/*N*/ << (unsigned char) rTab.GetFill(); -/*N*/ } -/*N*/ -/*N*/ if ( bStoreDefTabs ) -/*N*/ for( ; nCount; --nCount ) -/*N*/ { -/*N*/ SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT); -/*N*/ rStrm << (long) aSwTabStop.GetTabPos() -/*N*/ << (sal_Int8) aSwTabStop.GetAdjustment() -/*N*/ << (unsigned char) aSwTabStop.GetDecimal() -/*N*/ << (unsigned char) aSwTabStop.GetFill(); -/*N*/ nNew += nDefDist; -/*N*/ } -/*N*/ -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ sal_Bool SvxTabStopItem::Insert( const SvxTabStop& rTab ) /*N*/ { /*N*/ sal_uInt16 nTabPos = GetPos(rTab); @@ -1040,14 +944,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Int8)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- -/*N*/ /*N*/ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const /*N*/ { /*N*/ sal_Int8 bIsSplit; @@ -1055,19 +951,6 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence; /*N*/ return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() ); /*N*/ } -//------------------------------------------------------------------------ - - -// -------------------------------------------------------------------- - - -//------------------------------------------------------------------------ - - - - -//------------------------------------------------------------------------ - /*N*/ SvxScriptSpaceItem::SvxScriptSpaceItem( sal_Bool bOn, const sal_uInt16 nId ) /*N*/ : SfxBoolItem( nId, bOn ) /*N*/ { diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx index 26cbcde55..4e2d3d165 100644 --- a/binfilter/bf_svx/source/items/svx_textitem.cxx +++ b/binfilter/bf_svx/source/items/svx_textitem.cxx @@ -331,38 +331,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ BOOL bToBats = -/*N*/ GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) || -/*N*/ GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 ); -/*N*/ -/*N*/ // #90477# rStrm << (BYTE) GetFamily() -/*N*/ // << (BYTE) GetPitch() -/*N*/ // << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) ); -/*N*/ rStrm << (BYTE) GetFamily() << (BYTE) GetPitch() -/*N*/ << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())); -/*N*/ -/*N*/ String aStoreFamilyName( GetFamilyName() ); -/*N*/ if( bToBats ) -/*N*/ aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ); -/*N*/ rStrm.WriteByteString(aStoreFamilyName); -/*N*/ rStrm.WriteByteString(GetStyleName()); -/*N*/ -/*N*/ // #96441# Kach for EditEngine, only set while creating clipboard stream. -/*N*/ if ( bEnableStoreUnicodeNames ) -/*N*/ { -/*N*/ sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER; -/*N*/ rStrm << nMagic; -/*N*/ rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); -/*N*/ rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); -/*N*/ } -/*N*/ -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE _eFamily, eFontPitch, eFontTextEncoding; @@ -430,14 +398,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nPosture; @@ -555,14 +515,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nWeight; @@ -642,26 +594,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const -/*N*/ { -/*N*/ rStrm << (USHORT)GetHeight(); -/*N*/ -/*N*/ if( FONTHEIGHT_UNIT_VERSION <= nItemVersion ) -/*N*/ rStrm << GetProp() << (USHORT)GetPropUnit(); -/*N*/ else -/*N*/ { -/*N*/ // beim Export in alte Versionen geht die relative -/*N*/ // Angabe verloren, wenn es keine Prozentuale ist -/*N*/ USHORT _nProp = GetProp(); -/*N*/ if( SFX_MAPUNIT_RELATIVE != GetPropUnit() ) -/*N*/ _nProp = 100; -/*N*/ rStrm << _nProp; -/*N*/ } -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, /*N*/ USHORT nVersion ) const /*N*/ { @@ -936,14 +868,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxUnderlineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nState; @@ -1063,14 +987,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE eCross; @@ -1139,14 +1055,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nState; @@ -1173,14 +1081,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nState; @@ -1208,14 +1108,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Bool) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ sal_Bool bValue; @@ -1242,13 +1134,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_Bool) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- /*N*/ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, USHORT) const /*N*/ { @@ -1377,18 +1262,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const -/*N*/ { -/*N*/ if( VERSION_USEAUTOCOLOR == nItemVersion && -/*N*/ COL_AUTO == mColor.GetColor() ) -/*N*/ rStrm << Color( COL_BLACK ); -/*N*/ else -/*N*/ rStrm << mColor; -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const /*N*/ { /*N*/ return new SvxColorItem( rStrm, Which() ); @@ -1434,17 +1307,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ // #90477# rStrm << (BYTE) GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) -/*N*/ // << GetValue(); -/*N*/ rStrm << (BYTE)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()) -/*N*/ << GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE cSet; @@ -1472,20 +1334,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (short) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - - -// ----------------------------------------------------------------------- - - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ short nValue(0); @@ -1540,14 +1388,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE cMap; @@ -1640,23 +1480,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ short _nEsc = GetEsc(); -/*N*/ if( SOFFICE_FILEFORMAT_31 == rStrm.GetVersion() ) -/*N*/ { -/*N*/ if( DFLT_ESC_AUTO_SUPER == _nEsc ) -/*N*/ _nEsc = DFLT_ESC_SUPER; -/*N*/ else if( DFLT_ESC_AUTO_SUB == _nEsc ) -/*N*/ _nEsc = DFLT_ESC_SUB; -/*N*/ } -/*N*/ rStrm << (BYTE) GetProp() -/*N*/ << (short) _nEsc; -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE _nProp; @@ -1782,14 +1605,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (USHORT) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ USHORT nValue(0); @@ -1930,14 +1745,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (BYTE) GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, USHORT) const /*N*/ { /*N*/ BYTE nState; @@ -1965,15 +1772,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, // ----------------------------------------------------------------------- -/*N*/ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, -/*N*/ USHORT /*nItemVersion*/ ) const -/*N*/ { -/*N*/ rStrm << (sal_uInt16)GetValue(); -/*N*/ return rStrm; -/*N*/ } - -// ----------------------------------------------------------------------- - /*N*/ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, USHORT ) const /*N*/ { /*N*/ sal_uInt16 nValue(0); @@ -2195,12 +1993,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, /*NBFF*/ return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() ); /*NBFF*/ } -/*NBFF*/ SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const -/*NBFF*/ { -/*NBFF*/ rStrm << GetValue() << GetStartBracket() << GetEndBracket(); -/*NBFF*/ return rStrm; -/*NBFF*/ } - /*N*/ USHORT SvxTwoLinesItem::GetVersion( USHORT nFFVer ) const /*N*/ { /*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -2236,13 +2028,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, /*NBFF*/ return new SvxCharRotateItem( nVal, b, Which() ); /*NBFF*/ } -/*NBFF*/ SvStream& SvxCharRotateItem::Store( SvStream & rStrm, USHORT ) const -/*NBFF*/ { -/*NBFF*/ sal_Bool bFlag = IsFitToLine(); -/*NBFF*/ rStrm << GetValue() << bFlag; -/*NBFF*/ return rStrm; -/*NBFF*/ } - /*N*/ USHORT SvxCharRotateItem::GetVersion( USHORT nFFVer ) const /*N*/ { /*N*/ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; @@ -2373,22 +2158,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, /*N*/ return pItem; /*N*/ } -/*N*/ SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, USHORT nVer ) const -/*N*/ { -/*N*/ SvStream& rRet = SfxUInt16Item::Store( rStream, nVer ); -/*N*/ if ( Which() == EE_CHAR_FONTWIDTH ) -/*N*/ { -/*N*/ // see comment in Create().... -/*N*/ rRet.SeekRel( -1*(long)sizeof(USHORT) ); -/*N*/ rRet << (USHORT)0; -/*N*/ rRet << GetValue(); -/*N*/ // Really ugly, but not a problem for reading the doc in 5.2 -/*N*/ rRet << (USHORT)0x1234; -/*N*/ } -/*N*/ return rRet; -/*N*/ } - - /*N*/ USHORT SvxCharScaleWidthItem::GetVersion( USHORT nFFVer ) const /*N*/ { /*N*/ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; @@ -2440,13 +2209,6 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit, /*N*/ return new SvxCharReliefItem( (FontRelief)nVal, Which() ); /*N*/ } -/*N*/ SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const -/*N*/ { -/*N*/ sal_uInt16 nVal = GetValue(); -/*N*/ rStrm << nVal; -/*N*/ return rStrm; -/*N*/ } - /*N*/ USHORT SvxCharReliefItem::GetVersion( USHORT nFFVer ) const /*N*/ { /*N*/ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; diff --git a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx index b4ece7718..9f55716cc 100644 --- a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx +++ b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx @@ -99,18 +99,6 @@ namespace binfilter { /*N*/ return pText->ChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily ); /*N*/ } -/*N*/ void OutlinerParaObject::Store(SvStream& rStream ) const -/*N*/ { -/*N*/ rStream << nCount; -/*N*/ rStream << (sal_uInt32) 0x42345678; -/*N*/ pText->Store( rStream ); -/*N*/ -/*N*/ for( USHORT nPos=0; nPos < nCount; nPos++ ) -/*N*/ rStream << pDepthArr[ nPos ]; -/*N*/ -/*N*/ rStream << bIsEditDoc; -/*N*/ } - /*N*/ OutlinerParaObject* OutlinerParaObject::Create( SvStream& rStream, SfxItemPool* pTextObjectPool ) /*N*/ { /*N*/ OutlinerParaObject* pPObj = NULL; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx index 2a41f21f2..6eb5a7a2e 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx @@ -478,13 +478,6 @@ int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const -SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const -{ - rOut<<INT32(nValue.GetNumerator()); - rOut<<INT32(nValue.GetDenominator()); - return rOut; -} - SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const { return new SdrFractionItem(Which(),GetValue()); @@ -974,18 +967,6 @@ SfxPoolItem* SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItem return new SdrAutoShapeAdjustmentItem( rIn, nItemVersion ); } -SvStream& SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const -{ - if ( nItemVersion ) - { - sal_uInt32 i, nCount = GetCount(); - rOut << nCount; - for ( i = 0; i < nCount; i++ ) - {DBG_BF_ASSERT(0, "STRIP"); } - } - return rOut; -} - SfxPoolItem* SdrAutoShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/ ) const { sal_uInt32 i; diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx index 06ee308ed..e5a18bdea 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx @@ -136,19 +136,6 @@ XubString aNameOrIndexEmptyString; /*N*/ ((const NameOrIndex&) rItem).nPalIndex == nPalIndex ); /*N*/ } -/************************************************************************* -|* -|* SvStream* NameOrIndex::Store(SvStream& rIn) const -|* -*************************************************************************/ - -/*N*/ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ SfxStringItem::Store( rOut, nItemVersion ); -/*N*/ rOut << (INT32)nPalIndex; -/*N*/ return rOut; -/*N*/ } - /** this static checks if the given NameOrIndex item has a unique name for its value. The returned String is a unique name for an item with this value in both given pools. Argument pPool2 can be null. @@ -356,23 +343,6 @@ XubString aNameOrIndexEmptyString; /*N*/ return new XColorItem(Which(), rIn); /*N*/ } -/************************************************************************* -|* -|* SfxPoolItem* XColorItem::Store(SvStream& rOut) const -|* -\************************************************************************/ - -/*N*/ SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if ( !IsIndex() ) -/*N*/ { -/*N*/ rOut << aColor; -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } /************************************************************************* |* @@ -626,29 +596,6 @@ XubString aNameOrIndexEmptyString; /************************************************************************* |* -|* SfxPoolItem* XLineDashItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ rOut << (INT32) aDash.GetDashStyle(); -/*N*/ rOut << aDash.GetDots(); -/*N*/ rOut << (UINT32) aDash.GetDotLen(); -/*N*/ rOut << aDash.GetDashes(); -/*N*/ rOut << (UINT32) aDash.GetDashLen(); -/*N*/ rOut << (UINT32) aDash.GetDistance(); -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const |* *************************************************************************/ @@ -1117,31 +1064,6 @@ XubString aNameOrIndexEmptyString; /************************************************************************* |* -|* SfxPoolItem* XLineStartItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ UINT32 nPoints = (UINT32)aXPolygon.GetPointCount(); -/*N*/ rOut << nPoints; -/*N*/ for (USHORT nIndex = 0; nIndex < (USHORT)nPoints; nIndex++) -/*N*/ { -/*N*/ rOut << aXPolygon[nIndex].X(); -/*N*/ rOut << aXPolygon[nIndex].Y(); -/*N*/ rOut << (INT32)aXPolygon.GetFlags(nIndex); -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const XPolygon& XLineStartItem::GetValue(const XLineEndTable* pTable) |* const |* @@ -1532,31 +1454,6 @@ XubString aNameOrIndexEmptyString; /************************************************************************* |* -|* SfxPoolItem* XLineEndItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ UINT32 nPoints = (UINT32)aXPolygon.GetPointCount(); -/*N*/ rOut << nPoints; -/*N*/ for (USHORT nIndex = 0; nIndex < (USHORT)nPoints; nIndex++) -/*N*/ { -/*N*/ rOut << aXPolygon[nIndex].X(); -/*N*/ rOut << aXPolygon[nIndex].Y(); -/*N*/ rOut << (INT32)aXPolygon.GetFlags(nIndex); -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const XPolygon& XLineEndItem::GetValue(const XLineEndTable* pTable) const |* *************************************************************************/ @@ -2470,41 +2367,6 @@ XubString aNameOrIndexEmptyString; /************************************************************************* |* -|* SfxPoolItem* XFillGradientItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ rOut << (INT16)aGradient.GetGradientStyle(); -/*N*/ -/*N*/ USHORT nTmp; -/*N*/ -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetBlue() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetRed() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp; -/*N*/ -/*N*/ rOut << (INT32) aGradient.GetAngle(); -/*N*/ rOut << aGradient.GetBorder(); -/*N*/ rOut << aGradient.GetXOffset(); -/*N*/ rOut << aGradient.GetYOffset(); -/*N*/ rOut << aGradient.GetStartIntens(); -/*N*/ rOut << aGradient.GetEndIntens(); -/*N*/ rOut << aGradient.GetSteps(); -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const XGradient& XFillGradientItem::GetValue(const XGradientTable* pTable) |* const |* @@ -2788,15 +2650,6 @@ XubString aNameOrIndexEmptyString; //------------------------------------------------------------------------ -/*N*/ SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ XFillGradientItem::Store( rOut, nItemVersion ); -/*N*/ rOut << bEnabled; -/*N*/ return rOut; -/*N*/ } - -//------------------------------------------------------------------------ - /*N*/ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const /*N*/ { /*N*/ // !!! if version number of this object must be increased, please !!! @@ -2992,32 +2845,6 @@ XubString aNameOrIndexEmptyString; /************************************************************************* |* -|* SfxPoolItem* XFillHatchItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ rOut << (INT16)aHatch.GetHatchStyle(); -/*N*/ -/*N*/ USHORT nTmp; -/*N*/ nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp; -/*N*/ nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp; -/*N*/ -/*N*/ rOut << (INT32) aHatch.GetDistance(); -/*N*/ rOut << (INT32) aHatch.GetAngle(); -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const XHatch& XFillHatchItem::GetValue(const XHatchTable* pTable) const |* *************************************************************************/ @@ -3997,17 +3824,6 @@ XubString aNameOrIndexEmptyString; /*N*/ return new XLineAttrSetItem( _pSet ); /*N*/ } -/************************************************************************* -|* -|* SetItem in Stream speichern -|* -\************************************************************************/ - -/*N*/ SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const -/*N*/ { -/*N*/ return SfxSetItem::Store( rStream, nItemVersion ); -/*N*/ } - /*N*/ TYPEINIT1(XFillAttrSetItem, SfxSetItem); @@ -4070,18 +3886,6 @@ XubString aNameOrIndexEmptyString; /*N*/ return new XFillAttrSetItem( _pSet ); /*N*/ } -/************************************************************************* -|* -|* SetItem in Stream speichern -|* -\************************************************************************/ - -/*N*/ SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const -/*N*/ { -/*N*/ return SfxSetItem::Store( rStream, nItemVersion ); -/*N*/ } - - /*N*/ TYPEINIT1(XTextAttrSetItem, SfxSetItem); /************************************************************************* @@ -4143,17 +3947,6 @@ XubString aNameOrIndexEmptyString; /*N*/ return new XTextAttrSetItem( _pSet ); /*N*/ } -/************************************************************************* -|* -|* SetItem in Stream speichern -|* -\************************************************************************/ - -/*N*/ SvStream& XTextAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const -/*N*/ { -/*N*/ return SfxSetItem::Store( rStream, nItemVersion ); -/*N*/ } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx index 141efbda8..4d74fea0e 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx @@ -498,53 +498,6 @@ namespace binfilter { /************************************************************************* |* -|* SfxPoolItem* XFillBitmapItem::Store(SvStream& rOut) const -|* -*************************************************************************/ - -/*N*/ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const -/*N*/ { -/*N*/ NameOrIndex::Store( rOut, nItemVersion ); -/*N*/ -/*N*/ if (!IsIndex()) -/*N*/ { -/*N*/ rOut << (INT16) aXOBitmap.GetBitmapStyle(); -/*N*/ if( !aXOBitmap.GetBitmap() ) -/*N*/ rOut << (INT16) XBITMAP_NONE; -/*N*/ else -/*N*/ { -/*N*/ rOut << (INT16) aXOBitmap.GetBitmapType(); -/*N*/ if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT ) -/*N*/ { -/*N*/ const USHORT nOldComprMode = rOut.GetCompressMode(); -/*N*/ USHORT nNewComprMode = nOldComprMode; -/*N*/ -/*N*/ if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 ) -/*N*/ nNewComprMode |= COMPRESSMODE_ZBITMAP; -/*N*/ else -/*N*/ nNewComprMode &= ~COMPRESSMODE_ZBITMAP; -/*N*/ -/*N*/ rOut.SetCompressMode( nNewComprMode ); -/*N*/ rOut << aXOBitmap.GetBitmap(); -/*N*/ rOut.SetCompressMode( nOldComprMode ); -/*N*/ } -/*N*/ else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 ) -/*N*/ { -/*N*/ USHORT* pArray = aXOBitmap.GetPixelArray(); -/*N*/ for( USHORT i = 0; i < 64; i++ ) -/*N*/ rOut << (USHORT) *( pArray + i ); -/*N*/ -/*N*/ rOut << aXOBitmap.GetPixelColor(); -/*N*/ rOut << aXOBitmap.GetBackgroundColor(); -/*N*/ } -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ return rOut; -/*N*/ } - -/************************************************************************* -|* |* const Bitmap& XFillBitmapItem::GetValue(const XBitmapTable* pTable) const |* *************************************************************************/ diff --git a/binfilter/inc/bf_svx/adjitem.hxx b/binfilter/inc/bf_svx/adjitem.hxx index df034ed58..d62d2f26d 100644 --- a/binfilter/inc/bf_svx/adjitem.hxx +++ b/binfilter/inc/bf_svx/adjitem.hxx @@ -83,7 +83,7 @@ public: virtual void SetEnumValue( USHORT nNewVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; inline void SetOneWord( const SvxAdjust eType ) diff --git a/binfilter/inc/bf_svx/akrnitem.hxx b/binfilter/inc/bf_svx/akrnitem.hxx index 05f73cc09..8deec567d 100644 --- a/binfilter/inc/bf_svx/akrnitem.hxx +++ b/binfilter/inc/bf_svx/akrnitem.hxx @@ -59,7 +59,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) diff --git a/binfilter/inc/bf_svx/algitem.hxx b/binfilter/inc/bf_svx/algitem.hxx index 5525f7023..8766b324e 100644 --- a/binfilter/inc/bf_svx/algitem.hxx +++ b/binfilter/inc/bf_svx/algitem.hxx @@ -151,7 +151,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/blnkitem.hxx b/binfilter/inc/bf_svx/blnkitem.hxx index c1e672b58..4ff238c25 100644 --- a/binfilter/inc/bf_svx/blnkitem.hxx +++ b/binfilter/inc/bf_svx/blnkitem.hxx @@ -60,7 +60,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/binfilter/inc/bf_svx/boxitem.hxx b/binfilter/inc/bf_svx/boxitem.hxx index 57411c157..f3f1e3600 100644 --- a/binfilter/inc/bf_svx/boxitem.hxx +++ b/binfilter/inc/bf_svx/boxitem.hxx @@ -168,7 +168,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; @@ -244,14 +244,14 @@ class SvxBoxInfoItem : public SfxPoolItem BOOL bMinDist :1; // TRUE, Abstand darf nicht unterschritten werden. BYTE nValidFlags; // 0000 0000 - // ³³³³ ³³³À?VALID_TOP - // ³³³³ ³³ÀÄ?VALID_BOTTOM - // ³³³³ ³ÀÄÄ?VALID_LEFT - // ³³³³ ÀÄÄÄ?VALID_RIGHT - // ³³³ÀÄÄÄÄÄÄ VALID_HORI - // ³³ÀÄÄÄÄÄÄÄ VALID_VERT - // ³ÀÄÄÄÄÄÄÄÄ VALID_DIST - // ÀÄÄÄÄÄÄÄÄÄ VALID_DISABLE + // ???? ?????VALID_TOP + // ???? ????VALID_BOTTOM + // ???? ????VALID_LEFT + // ???? ???VALID_RIGHT + // ??????? VALID_HORI + // ???????VALID_VERT + // ?????? VALID_DIST + // ??????VALID_DISABLE USHORT nDefDist; // Der Default- bzw. Minimalabstand. @@ -267,7 +267,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} const SvxBorderLine* GetHori() const { return pHori; } const SvxBorderLine* GetVert() const { return pVert; } diff --git a/binfilter/inc/bf_svx/brkitem.hxx b/binfilter/inc/bf_svx/brkitem.hxx index b0602a3a6..807a3c4e1 100644 --- a/binfilter/inc/bf_svx/brkitem.hxx +++ b/binfilter/inc/bf_svx/brkitem.hxx @@ -66,7 +66,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxPoolItem* Create( SvStream&, USHORT ) const; virtual USHORT GetValueCount() const; diff --git a/binfilter/inc/bf_svx/brshitem.hxx b/binfilter/inc/bf_svx/brshitem.hxx index 42cbf5e1d..de591f077 100644 --- a/binfilter/inc/bf_svx/brshitem.hxx +++ b/binfilter/inc/bf_svx/brshitem.hxx @@ -100,7 +100,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; const Color& GetColor() const { return aColor; } diff --git a/binfilter/inc/bf_svx/bulitem.hxx b/binfilter/inc/bf_svx/bulitem.hxx index afe0f8ce6..0afd2e2ef 100644 --- a/binfilter/inc/bf_svx/bulitem.hxx +++ b/binfilter/inc/bf_svx/bulitem.hxx @@ -101,7 +101,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream & , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream & , USHORT nItemVersion ) const {} sal_Unicode GetSymbol() const { return cSymbol; } String GetPrevText() const { return aPrevText; } diff --git a/binfilter/inc/bf_svx/charreliefitem.hxx b/binfilter/inc/bf_svx/charreliefitem.hxx index 07132bdde..d5e815a9c 100644 --- a/binfilter/inc/bf_svx/charreliefitem.hxx +++ b/binfilter/inc/bf_svx/charreliefitem.hxx @@ -54,7 +54,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual String GetValueTextByPos( USHORT nPos ) const; diff --git a/binfilter/inc/bf_svx/charrotateitem.hxx b/binfilter/inc/bf_svx/charrotateitem.hxx index e75edb49f..fea0e1d6c 100644 --- a/binfilter/inc/bf_svx/charrotateitem.hxx +++ b/binfilter/inc/bf_svx/charrotateitem.hxx @@ -57,7 +57,7 @@ public: /*NBFF*/ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; /*NBFF*/ virtual SfxPoolItem* Create(SvStream &, USHORT) const; -/*NBFF*/ virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; +/*NBFF*/ virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; /*NBFF*/ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/binfilter/inc/bf_svx/charscaleitem.hxx b/binfilter/inc/bf_svx/charscaleitem.hxx index dc251882f..2c783af89 100644 --- a/binfilter/inc/bf_svx/charscaleitem.hxx +++ b/binfilter/inc/bf_svx/charscaleitem.hxx @@ -54,7 +54,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; diff --git a/binfilter/inc/bf_svx/chrtitem.hxx b/binfilter/inc/bf_svx/chrtitem.hxx index 4a1d4c30a..6e0265cf5 100644 --- a/binfilter/inc/bf_svx/chrtitem.hxx +++ b/binfilter/inc/bf_svx/chrtitem.hxx @@ -313,7 +313,7 @@ public: virtual int operator == (const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} double GetValue() const { return fVal; } void SetValue(double fNewVal) { fVal = fNewVal; } diff --git a/binfilter/inc/bf_svx/cmapitem.hxx b/binfilter/inc/bf_svx/cmapitem.hxx index e9dbd6573..54380e20c 100644 --- a/binfilter/inc/bf_svx/cmapitem.hxx +++ b/binfilter/inc/bf_svx/cmapitem.hxx @@ -60,7 +60,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; // MS VC4.0 kommt durcheinander diff --git a/binfilter/inc/bf_svx/cntritem.hxx b/binfilter/inc/bf_svx/cntritem.hxx index 197cca558..a8b1e1cfc 100644 --- a/binfilter/inc/bf_svx/cntritem.hxx +++ b/binfilter/inc/bf_svx/cntritem.hxx @@ -54,7 +54,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxContourItem& operator=(const SvxContourItem& rCont) diff --git a/binfilter/inc/bf_svx/colritem.hxx b/binfilter/inc/bf_svx/colritem.hxx index 07eac22c0..9eaf96e30 100644 --- a/binfilter/inc/bf_svx/colritem.hxx +++ b/binfilter/inc/bf_svx/colritem.hxx @@ -73,7 +73,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxColorItem& operator=(const SvxColorItem& rColor) { diff --git a/binfilter/inc/bf_svx/crsditem.hxx b/binfilter/inc/bf_svx/crsditem.hxx index d47c14656..440dff34a 100644 --- a/binfilter/inc/bf_svx/crsditem.hxx +++ b/binfilter/inc/bf_svx/crsditem.hxx @@ -59,7 +59,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/cscoitem.hxx b/binfilter/inc/bf_svx/cscoitem.hxx index adccd7b57..bd1aec659 100644 --- a/binfilter/inc/bf_svx/cscoitem.hxx +++ b/binfilter/inc/bf_svx/cscoitem.hxx @@ -55,7 +55,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline rtl_TextEncoding& GetCharSet() { return eFrom; } inline rtl_TextEncoding GetCharSet() const { return eFrom; } diff --git a/binfilter/inc/bf_svx/e3ditem.hxx b/binfilter/inc/bf_svx/e3ditem.hxx index 7e4f70235..ee592a76a 100644 --- a/binfilter/inc/bf_svx/e3ditem.hxx +++ b/binfilter/inc/bf_svx/e3ditem.hxx @@ -55,7 +55,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/editobj.hxx b/binfilter/inc/bf_svx/editobj.hxx index 12183783f..d096f3ebe 100644 --- a/binfilter/inc/bf_svx/editobj.hxx +++ b/binfilter/inc/bf_svx/editobj.hxx @@ -78,7 +78,7 @@ public: virtual EditTextObject* Clone() const = 0; - BOOL Store( SvStream& rOStream ) const; + BOOL Store( SvStream& rOStream ) const {return FALSE;} static EditTextObject* Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = 0 ); diff --git a/binfilter/inc/bf_svx/emphitem.hxx b/binfilter/inc/bf_svx/emphitem.hxx index d31bccddb..85c075454 100644 --- a/binfilter/inc/bf_svx/emphitem.hxx +++ b/binfilter/inc/bf_svx/emphitem.hxx @@ -59,7 +59,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, diff --git a/binfilter/inc/bf_svx/escpitem.hxx b/binfilter/inc/bf_svx/escpitem.hxx index a8c48bc27..7e5caafe7 100644 --- a/binfilter/inc/bf_svx/escpitem.hxx +++ b/binfilter/inc/bf_svx/escpitem.hxx @@ -72,7 +72,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline void SetEscapement( const SvxEscapement eNew ) { diff --git a/binfilter/inc/bf_svx/fhgtitem.hxx b/binfilter/inc/bf_svx/fhgtitem.hxx index 37a8fa32f..dab03738a 100644 --- a/binfilter/inc/bf_svx/fhgtitem.hxx +++ b/binfilter/inc/bf_svx/fhgtitem.hxx @@ -70,7 +70,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetVersion( USHORT nItemVersion) const; inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) diff --git a/binfilter/inc/bf_svx/flditem.hxx b/binfilter/inc/bf_svx/flditem.hxx index cf791a6d1..6dc6c1ba1 100644 --- a/binfilter/inc/bf_svx/flditem.hxx +++ b/binfilter/inc/bf_svx/flditem.hxx @@ -87,7 +87,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT nVer ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} const SvxFieldData* GetField() const { return pField; } static SvClassManager& GetClassManager() { return ITEMDATA()->GetClassManager(); } @@ -290,7 +290,7 @@ public: enum SvxFileType { SVXFILETYPE_FIX, SVXFILETYPE_VAR }; enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension - SVXFILEFORMAT_FULLPATH, // vollst„ndiger Pfad + SVXFILEFORMAT_FULLPATH, // vollst?ndiger Pfad SVXFILEFORMAT_PATH, // nur Pfad SVXFILEFORMAT_NAME // nur Dateiname }; @@ -323,7 +323,7 @@ public: }; enum SvxAuthorType { SVXAUTHORTYPE_FIX, SVXAUTHORTYPE_VAR }; -enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollst„ndiger Name +enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollst?ndiger Name SVXAUTHORFORMAT_NAME, // nur Nachname SVXAUTHORFORMAT_FIRSTNAME, // nur Vorname SVXAUTHORFORMAT_SHORTNAME // Initialen diff --git a/binfilter/inc/bf_svx/fontitem.hxx b/binfilter/inc/bf_svx/fontitem.hxx index 5dd79161f..9fefb1714 100644 --- a/binfilter/inc/bf_svx/fontitem.hxx +++ b/binfilter/inc/bf_svx/fontitem.hxx @@ -73,7 +73,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/frmdiritem.hxx b/binfilter/inc/bf_svx/frmdiritem.hxx index 402e4145f..987dcc4e5 100644 --- a/binfilter/inc/bf_svx/frmdiritem.hxx +++ b/binfilter/inc/bf_svx/frmdiritem.hxx @@ -55,7 +55,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual int operator==( const SfxPoolItem& ) const; diff --git a/binfilter/inc/bf_svx/grfcrop.hxx b/binfilter/inc/bf_svx/grfcrop.hxx index 034498347..210acf210 100644 --- a/binfilter/inc/bf_svx/grfcrop.hxx +++ b/binfilter/inc/bf_svx/grfcrop.hxx @@ -54,7 +54,7 @@ public: // virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; - virtual SvStream& Store(SvStream &, USHORT nIVer) const; + virtual SvStream& Store(SvStream &, USHORT nIVer) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, diff --git a/binfilter/inc/bf_svx/hyznitem.hxx b/binfilter/inc/bf_svx/hyznitem.hxx index 1cf912464..cfc2311b4 100644 --- a/binfilter/inc/bf_svx/hyznitem.hxx +++ b/binfilter/inc/bf_svx/hyznitem.hxx @@ -73,7 +73,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} inline void SetHyphen( const BOOL bNew ) { bHyphen = bNew; } inline BOOL IsHyphen() const { return bHyphen; } diff --git a/binfilter/inc/bf_svx/keepitem.hxx b/binfilter/inc/bf_svx/keepitem.hxx index e90abd89e..d68c4772a 100644 --- a/binfilter/inc/bf_svx/keepitem.hxx +++ b/binfilter/inc/bf_svx/keepitem.hxx @@ -60,7 +60,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} }; diff --git a/binfilter/inc/bf_svx/kernitem.hxx b/binfilter/inc/bf_svx/kernitem.hxx index 10c595297..e4801b941 100644 --- a/binfilter/inc/bf_svx/kernitem.hxx +++ b/binfilter/inc/bf_svx/kernitem.hxx @@ -61,7 +61,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { diff --git a/binfilter/inc/bf_svx/langitem.hxx b/binfilter/inc/bf_svx/langitem.hxx index cc374796b..9975484e6 100644 --- a/binfilter/inc/bf_svx/langitem.hxx +++ b/binfilter/inc/bf_svx/langitem.hxx @@ -59,7 +59,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) diff --git a/binfilter/inc/bf_svx/lrspitem.hxx b/binfilter/inc/bf_svx/lrspitem.hxx index a8883eaa8..ce26277c3 100644 --- a/binfilter/inc/bf_svx/lrspitem.hxx +++ b/binfilter/inc/bf_svx/lrspitem.hxx @@ -98,7 +98,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; // Die "Layout-Schnittstelle": diff --git a/binfilter/inc/bf_svx/lspcitem.hxx b/binfilter/inc/bf_svx/lspcitem.hxx index a3c221699..210752d58 100644 --- a/binfilter/inc/bf_svx/lspcitem.hxx +++ b/binfilter/inc/bf_svx/lspcitem.hxx @@ -76,7 +76,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} // Methoden zum Abfragen und Aendern // Interlinespace wird zur Hoehe addiert. diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx index 9a6b37317..36f61966e 100644 --- a/binfilter/inc/bf_svx/numitem.hxx +++ b/binfilter/inc/bf_svx/numitem.hxx @@ -148,7 +148,7 @@ public: SvxNumberFormat(SvStream &rStream); ~SvxNumberFormat(); - SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter); + SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter) {} SvxNumberFormat& operator=( const SvxNumberFormat& ); BOOL operator==( const SvxNumberFormat& ) const; @@ -226,7 +226,7 @@ public: int operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} - SvStream& Store(SvStream &rStream); + SvStream& Store(SvStream &rStream) {} const SvxNumberFormat* Get(USHORT nLevel)const; const SvxNumberFormat& GetLevel(USHORT nLevel)const; @@ -262,7 +262,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual int operator==( const SfxPoolItem& ) const; diff --git a/binfilter/inc/bf_svx/opaqitem.hxx b/binfilter/inc/bf_svx/opaqitem.hxx index b4518d9dc..e6da8e1b8 100644 --- a/binfilter/inc/bf_svx/opaqitem.hxx +++ b/binfilter/inc/bf_svx/opaqitem.hxx @@ -58,7 +58,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} }; diff --git a/binfilter/inc/bf_svx/outlobj.hxx b/binfilter/inc/bf_svx/outlobj.hxx index d1cea2a82..8b139aefa 100644 --- a/binfilter/inc/bf_svx/outlobj.hxx +++ b/binfilter/inc/bf_svx/outlobj.hxx @@ -73,7 +73,7 @@ public: const EditTextObject& GetTextObject() const { return *pText; } void ClearPortionInfo(); BOOL IsEditDoc() const { return bIsEditDoc; } - void Store( SvStream& ) const; + void Store( SvStream& ) const {} static OutlinerParaObject* Create( SvStream&, SfxItemPool* pTextObjectPool = 0 ); BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily, diff --git a/binfilter/inc/bf_svx/pageitem.hxx b/binfilter/inc/bf_svx/pageitem.hxx index 0cd7efcac..b573533e1 100644 --- a/binfilter/inc/bf_svx/pageitem.hxx +++ b/binfilter/inc/bf_svx/pageitem.hxx @@ -97,7 +97,7 @@ public: virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} // Ausrichtung USHORT GetPageUsage() const { return eUse; } @@ -137,7 +137,7 @@ public: virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const {} }; #endif diff --git a/binfilter/inc/bf_svx/pbinitem.hxx b/binfilter/inc/bf_svx/pbinitem.hxx index 22927a8b0..335e2b786 100644 --- a/binfilter/inc/bf_svx/pbinitem.hxx +++ b/binfilter/inc/bf_svx/pbinitem.hxx @@ -57,7 +57,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, USHORT ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const {} }; inline SvxPaperBinItem::SvxPaperBinItem( const USHORT nId, const BYTE nT ) diff --git a/binfilter/inc/bf_svx/postitem.hxx b/binfilter/inc/bf_svx/postitem.hxx index 6e88a613f..a976dd8ee 100644 --- a/binfilter/inc/bf_svx/postitem.hxx +++ b/binfilter/inc/bf_svx/postitem.hxx @@ -61,7 +61,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/binfilter/inc/bf_svx/prntitem.hxx b/binfilter/inc/bf_svx/prntitem.hxx index dc76ef9fe..6e7b398bc 100644 --- a/binfilter/inc/bf_svx/prntitem.hxx +++ b/binfilter/inc/bf_svx/prntitem.hxx @@ -53,7 +53,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} }; diff --git a/binfilter/inc/bf_svx/protitem.hxx b/binfilter/inc/bf_svx/protitem.hxx index 221a924e4..4e8a0f43b 100644 --- a/binfilter/inc/bf_svx/protitem.hxx +++ b/binfilter/inc/bf_svx/protitem.hxx @@ -67,7 +67,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} BOOL IsCntntProtected() const { return bCntnt; } BOOL IsSizeProtected() const { return bSize; } diff --git a/binfilter/inc/bf_svx/sdasaitm.hxx b/binfilter/inc/bf_svx/sdasaitm.hxx index 70de2d054..622fb5b7d 100644 --- a/binfilter/inc/bf_svx/sdasaitm.hxx +++ b/binfilter/inc/bf_svx/sdasaitm.hxx @@ -59,7 +59,7 @@ class SdrAutoShapeAdjustmentItem : public SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; diff --git a/binfilter/inc/bf_svx/shaditem.hxx b/binfilter/inc/bf_svx/shaditem.hxx index 180bba012..aa97d45b5 100644 --- a/binfilter/inc/bf_svx/shaditem.hxx +++ b/binfilter/inc/bf_svx/shaditem.hxx @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} const Color& GetColor() const { return aShadowColor;} void SetColor( const Color &rNew ) { aShadowColor = rNew; } diff --git a/binfilter/inc/bf_svx/shdditem.hxx b/binfilter/inc/bf_svx/shdditem.hxx index 4c0e46fa7..14e2c8c2f 100644 --- a/binfilter/inc/bf_svx/shdditem.hxx +++ b/binfilter/inc/bf_svx/shdditem.hxx @@ -59,7 +59,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { diff --git a/binfilter/inc/bf_svx/sizeitem.hxx b/binfilter/inc/bf_svx/sizeitem.hxx index 069e9495d..35195ec56 100644 --- a/binfilter/inc/bf_svx/sizeitem.hxx +++ b/binfilter/inc/bf_svx/sizeitem.hxx @@ -63,7 +63,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} const Size& GetSize() const { return aSize; } void SetSize(const Size& rSize) { aSize = rSize; } diff --git a/binfilter/inc/bf_svx/spltitem.hxx b/binfilter/inc/bf_svx/spltitem.hxx index d79eee87d..7e0f46a90 100644 --- a/binfilter/inc/bf_svx/spltitem.hxx +++ b/binfilter/inc/bf_svx/spltitem.hxx @@ -62,7 +62,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} }; diff --git a/binfilter/inc/bf_svx/sxfiitm.hxx b/binfilter/inc/bf_svx/sxfiitm.hxx index e99f54899..3c2ab0156 100644 --- a/binfilter/inc/bf_svx/sxfiitm.hxx +++ b/binfilter/inc/bf_svx/sxfiitm.hxx @@ -45,7 +45,7 @@ public: SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(USHORT nId, SvStream& rIn); virtual int operator==(const SfxPoolItem&) const; - virtual SvStream& Store(SvStream&, USHORT nItemVers) const; + virtual SvStream& Store(SvStream&, USHORT nItemVers) const {} virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } diff --git a/binfilter/inc/bf_svx/tstpitem.hxx b/binfilter/inc/bf_svx/tstpitem.hxx index fa2dd2f41..aa6a34cc4 100644 --- a/binfilter/inc/bf_svx/tstpitem.hxx +++ b/binfilter/inc/bf_svx/tstpitem.hxx @@ -167,7 +167,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const {} }; }//end of namespace binfilter diff --git a/binfilter/inc/bf_svx/twolinesitem.hxx b/binfilter/inc/bf_svx/twolinesitem.hxx index 6ad1d25aa..69a068ccc 100644 --- a/binfilter/inc/bf_svx/twolinesitem.hxx +++ b/binfilter/inc/bf_svx/twolinesitem.hxx @@ -55,7 +55,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; /*NBFF*/ virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; -/*NBFF*/ virtual SvStream& Store(SvStream &, USHORT nIVer) const; +/*NBFF*/ virtual SvStream& Store(SvStream &, USHORT nIVer) const {} /*NBFF*/ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, /*NBFF*/ SfxMapUnit eCoreMetric, /*NBFF*/ SfxMapUnit ePresMetric, diff --git a/binfilter/inc/bf_svx/udlnitem.hxx b/binfilter/inc/bf_svx/udlnitem.hxx index 9a8080b92..511722e60 100644 --- a/binfilter/inc/bf_svx/udlnitem.hxx +++ b/binfilter/inc/bf_svx/udlnitem.hxx @@ -64,7 +64,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, diff --git a/binfilter/inc/bf_svx/ulspitem.hxx b/binfilter/inc/bf_svx/ulspitem.hxx index 7dd49ae2f..54d6047f0 100644 --- a/binfilter/inc/bf_svx/ulspitem.hxx +++ b/binfilter/inc/bf_svx/ulspitem.hxx @@ -70,7 +70,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileVersion ) const; inline void SetUpper( const USHORT nU, const USHORT nProp = 100 ); diff --git a/binfilter/inc/bf_svx/wghtitem.hxx b/binfilter/inc/bf_svx/wghtitem.hxx index af30418b2..e5b24f566 100644 --- a/binfilter/inc/bf_svx/wghtitem.hxx +++ b/binfilter/inc/bf_svx/wghtitem.hxx @@ -62,7 +62,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} virtual USHORT GetValueCount() const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/binfilter/inc/bf_svx/wrlmitem.hxx b/binfilter/inc/bf_svx/wrlmitem.hxx index 15cc0715b..fa1c7e9db 100644 --- a/binfilter/inc/bf_svx/wrlmitem.hxx +++ b/binfilter/inc/bf_svx/wrlmitem.hxx @@ -61,7 +61,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const {} inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) diff --git a/binfilter/inc/bf_svx/xbtmpit.hxx b/binfilter/inc/bf_svx/xbtmpit.hxx index aea7c3ca5..fdbeb25ae 100644 --- a/binfilter/inc/bf_svx/xbtmpit.hxx +++ b/binfilter/inc/bf_svx/xbtmpit.hxx @@ -54,7 +54,7 @@ public: virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/binfilter/inc/bf_svx/xcolit.hxx b/binfilter/inc/bf_svx/xcolit.hxx index 41492ae06..4813da4c5 100644 --- a/binfilter/inc/bf_svx/xcolit.hxx +++ b/binfilter/inc/bf_svx/xcolit.hxx @@ -56,7 +56,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} const Color& GetValue(const XColorTable* pTable = 0) const; void SetValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/binfilter/inc/bf_svx/xflasit.hxx b/binfilter/inc/bf_svx/xflasit.hxx index b1956134b..139cceb53 100644 --- a/binfilter/inc/bf_svx/xflasit.hxx +++ b/binfilter/inc/bf_svx/xflasit.hxx @@ -49,7 +49,7 @@ public: SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const {} }; }//end of namespace binfilter diff --git a/binfilter/inc/bf_svx/xflftrit.hxx b/binfilter/inc/bf_svx/xflftrit.hxx index bcce297a8..c5c1a94ff 100644 --- a/binfilter/inc/bf_svx/xflftrit.hxx +++ b/binfilter/inc/bf_svx/xflftrit.hxx @@ -58,7 +58,7 @@ public: virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/binfilter/inc/bf_svx/xflgrit.hxx b/binfilter/inc/bf_svx/xflgrit.hxx index d54ca05a5..29bbab7f4 100644 --- a/binfilter/inc/bf_svx/xflgrit.hxx +++ b/binfilter/inc/bf_svx/xflgrit.hxx @@ -57,7 +57,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/binfilter/inc/bf_svx/xflhtit.hxx b/binfilter/inc/bf_svx/xflhtit.hxx index 2aaba16ae..8491f3270 100644 --- a/binfilter/inc/bf_svx/xflhtit.hxx +++ b/binfilter/inc/bf_svx/xflhtit.hxx @@ -56,7 +56,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/xit.hxx b/binfilter/inc/bf_svx/xit.hxx index 13fe544dd..df294f42c 100644 --- a/binfilter/inc/bf_svx/xit.hxx +++ b/binfilter/inc/bf_svx/xit.hxx @@ -74,7 +74,7 @@ public: ~NameOrIndex() {}; virtual int operator==(const SfxPoolItem& rItem) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} String GetName() const { return GetValue(); } void SetName(const String& rName) { SetValue(rName); } diff --git a/binfilter/inc/bf_svx/xlnasit.hxx b/binfilter/inc/bf_svx/xlnasit.hxx index 5a0915e01..d247bcd7a 100644 --- a/binfilter/inc/bf_svx/xlnasit.hxx +++ b/binfilter/inc/bf_svx/xlnasit.hxx @@ -49,7 +49,7 @@ public: SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const {} }; }//end of namespace binfilter diff --git a/binfilter/inc/bf_svx/xlndsit.hxx b/binfilter/inc/bf_svx/xlndsit.hxx index 6b4e738cb..9358a6e65 100644 --- a/binfilter/inc/bf_svx/xlndsit.hxx +++ b/binfilter/inc/bf_svx/xlndsit.hxx @@ -56,7 +56,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/xlnedit.hxx b/binfilter/inc/bf_svx/xlnedit.hxx index bee025d6f..961226b26 100644 --- a/binfilter/inc/bf_svx/xlnedit.hxx +++ b/binfilter/inc/bf_svx/xlnedit.hxx @@ -53,7 +53,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/xlnstit.hxx b/binfilter/inc/bf_svx/xlnstit.hxx index 647895277..a2d5e8535 100644 --- a/binfilter/inc/bf_svx/xlnstit.hxx +++ b/binfilter/inc/bf_svx/xlnstit.hxx @@ -53,7 +53,7 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const {} virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/binfilter/inc/bf_svx/xtxasit.hxx b/binfilter/inc/bf_svx/xtxasit.hxx index 8c14f0e20..c4fc9fbec 100644 --- a/binfilter/inc/bf_svx/xtxasit.hxx +++ b/binfilter/inc/bf_svx/xtxasit.hxx @@ -49,7 +49,7 @@ public: SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const {} }; }//end of namespace binfilter |