[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx

Caolán McNamara caolanm at redhat.com
Fri Oct 23 09:45:24 UTC 2015


 include/svx/sdtacitm.hxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 0423b5c33ea2c9a5942a20939656e65a56234500
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 22 17:18:34 2015 +0100

    crashtesting+ubsan: kde170880-1.html bad cast to SdrTextAniCountItem
    
    because a clone of SdrTextAniCountItem is a SfxUInt16Item not
    a SdrTextAniCountItem
    
    Change-Id: I7b8f99b52b1f42a6a28af4495ff25ddb6d497f61
    (cherry picked from commit e5c8d01b1c174eafb3335604380480a513ac8db1)
    Reviewed-on: https://gerrit.libreoffice.org/19536
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx
index 79775ea..23c7149 100644
--- a/include/svx/sdtacitm.hxx
+++ b/include/svx/sdtacitm.hxx
@@ -26,7 +26,13 @@
 class SdrTextAniCountItem: public SfxUInt16Item {
 public:
     SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
-    SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn)  {}
+    SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {}
+
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override
+    { return new SdrTextAniCountItem(rStream); }
+
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
+    { return new SdrTextAniCountItem(*this); }
 };
 
 #endif


More information about the Libreoffice-commits mailing list