Revert "fix fdo#47018 Impress paste destroy bullet"

This reverts commit a95cce27295f9cd255fa72eaded00972e3efb69b, it lead to live-
lock in JunitTest_sc_unoapi, where SvxBoxItem::Create
(editeng/source/items/frmitems.cxx) failed to break out of the while(true) loop,
apparently because it kept reading past the end of rStrm, so cLine wouldn't be
updated.  (That code would need to be made more robust, but I do not know how
best to flag errors from SvxBoxItem::Create?)

What looks suspicious about the changes of
a95cce27295f9cd255fa72eaded00972e3efb69b at least to
editeng/source/items/frmitems.cxx is that it changes the stream's format, now
reading/writing a 16 bit value where it previously read/wrote an 8 bit value
(SvStream /does/ support sal_Int8, btw).

Change-Id: I1a46746559dcf8e1ea8be63a9a0cf2d32ccc69a1

1 files changed, 3 insertions, 6 deletions

diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index f17e9cf56026..86f4aef59503 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -157,12 +157,10 @@ public:
     explicit SvxNumberFormat( sal_Int16 nNumberingType,
                      SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
     SvxNumberFormat(const SvxNumberFormat& rFormat);
-    SvxNumberFormat( SvStream & rStream );
 
     virtual ~SvxNumberFormat();
 
     SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
-    SvxNumberFormat* Create(SvStream& rStream );
 
     SvxNumberFormat& operator=( const SvxNumberFormat&  );
     sal_Bool            operator==( const SvxNumberFormat&  ) const;
@@ -254,7 +252,6 @@ public:
                         eDefaultNumberFormatPositionAndSpaceMode
                                 = SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
     SvxNumRule(const SvxNumRule& rCopy);
-    SvxNumRule(SvStream &rStream);
     virtual ~SvxNumRule();
 
     int                     operator==( const SvxNumRule& ) const;
@@ -263,7 +260,7 @@ public:
     SvxNumRule&             operator=( const SvxNumRule&  );
 
     SvStream&               Store(SvStream &rStream);
-    SvxNumRule*             Create(SvStream &rStream);
+
     const SvxNumberFormat*  Get(sal_uInt16 nLevel)const;
     const SvxNumberFormat&  GetLevel(sal_uInt16 nLevel)const;
     void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
@@ -297,9 +294,9 @@ public:
     virtual ~SvxNumBulletItem();
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &rStream, sal_uInt16 nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
     sal_uInt16  GetVersion( sal_uInt16 nFileVersion ) const;
-    virtual SvStream&        Store(SvStream &rStream, sal_uInt16 nItemVersion ) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              operator==( const SfxPoolItem& ) const;
 
     SvxNumRule*             GetNumRule() const {return pNumRule;}