[Libreoffice-commits] core.git: svl/source sw/source

Michael Stahl mstahl at redhat.com
Fri Sep 8 19:34:49 UTC 2017


 svl/source/items/poolitem.cxx  |    2 ++
 sw/source/core/doc/tblafmt.cxx |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 276536fc10368dbe7e16cf859b6da903cec6b8aa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 8 20:45:46 2017 +0200

    svl: assert calls of SfxPoolItem::Create/Store
    
    Change-Id: I2d92897d558ad0914e8bbc80b4dec72d0fd00629

diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index fb0ef21446d0..4fbd3c9f5fd6 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -57,6 +57,7 @@ bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
 
 SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
 {
+    assert(!"this item is not serialisable");
     return Clone();
 }
 
@@ -69,6 +70,7 @@ sal_uInt16 SfxPoolItem::GetVersion( sal_uInt16 ) const
 
 SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
+    assert(!"this item is not serialisable");
     return rStream;
 }
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 59afa9ac4f00..86a348f34612 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -998,7 +998,7 @@ bool SwTableAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions )
             SfxPoolItem* pNew = nullptr;
 
             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);
 
             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);
 
         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));
         rStream.WriteUInt16( m_aRepeatHeading ).WriteBool( m_bLayoutSplit ).WriteBool( m_bRowSplit ).WriteBool( m_bCollapsingBorders );
         m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion));


More information about the Libreoffice-commits mailing list