mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svl: assert calls of SfxPoolItem::Create/Store

Browse Source 
Change-Id: I2d92897d558ad0914e8bbc80b4dec72d0fd00629
This commit is contained in:
Michael Stahl
2017-09-08 20:45:46 +02:00
parent 84cbd6a543
commit 276536fc10
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
svl/source/items/poolitem.cxx
View File

@@ -57,6 +57,7 @@ bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
{ {
assert(!"this item is not serialisable");
return Clone(); return Clone();
} }
@@ -69,6 +70,7 @@ sal_uInt16 SfxPoolItem::GetVersion( sal_uInt16 ) const
SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
{ {
assert(!"this item is not serialisable");
return rStream; return rStream;
} }

4
sw/source/core/doc/tblafmt.cxx
View File

@@ -998,7 +998,7 @@ bool SwTableAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions )
SfxPoolItem* pNew = nullptr; SfxPoolItem* pNew = nullptr;
READ(m_aBreak, SvxFormatBreakItem, AUTOFORMAT_FILE_VERSION); READ(m_aBreak, SvxFormatBreakItem, AUTOFORMAT_FILE_VERSION);
READ(m_aPageDesc, SwFormatPageDesc, AUTOFORMAT_FILE_VERSION); //unimplemented READ(m_aPageDesc, SwFormatPageDesc, AUTOFORMAT_FILE_VERSION);
READ(m_aKeepWithNextPara, SvxFormatKeepItem, AUTOFORMAT_FILE_VERSION); READ(m_aKeepWithNextPara, SvxFormatKeepItem, AUTOFORMAT_FILE_VERSION);
rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( m_bCollapsingBorders ); rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( m_bCollapsingBorders );
@@ -1043,7 +1043,7 @@ bool SwTableAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
WriterSpecificAutoFormatBlock block(rStream); WriterSpecificAutoFormatBlock block(rStream);
m_aBreak.Store(rStream, m_aBreak.GetVersion(fileVersion)); m_aBreak.Store(rStream, m_aBreak.GetVersion(fileVersion));
m_aPageDesc.Store(rStream, m_aPageDesc.GetVersion(fileVersion)); //unimplemented m_aPageDesc.Store(rStream, m_aPageDesc.GetVersion(fileVersion));
m_aKeepWithNextPara.Store(rStream, m_aKeepWithNextPara.GetVersion(fileVersion)); m_aKeepWithNextPara.Store(rStream, m_aKeepWithNextPara.GetVersion(fileVersion));
rStream.WriteUInt16( m_aRepeatHeading ).WriteBool( m_bLayoutSplit ).WriteBool( m_bRowSplit ).WriteBool( m_bCollapsingBorders ); rStream.WriteUInt16( m_aRepeatHeading ).WriteBool( m_bLayoutSplit ).WriteBool( m_bRowSplit ).WriteBool( m_bCollapsingBorders );
m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion)); m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion));