[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc

[Joseph Powers]

 binfilter/bf_svx/source/svdraw/svx_svdattr.cxx |   29 +-----------------
 binfilter/inc/bf_svx/sdasaitm.hxx              |   40 ++++++-------------------
 2 files changed, 13 insertions(+), 56 deletions(-)

New commits:
commit 4d5dd969edf020289fc2b3a999d0397173e3ba08
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu May 5 18:44:28 2011 -0700

    Remove some unused code.

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index 64f58da..366862b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -929,35 +929,14 @@ SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt1
 {
     if ( nVersion )
     {
-        sal_uInt32 i, nCount;
+        sal_uInt32 nCount;
         rIn >> nCount;
-        for ( i = 0; i < nCount; i++ )
-        {DBG_BF_ASSERT(0, "STRIP");
-        }
     }
 }
 
-SdrAutoShapeAdjustmentItem::~SdrAutoShapeAdjustmentItem()
-{
-    void* pPtr;
-    for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() )
-        delete (SdrAutoShapeAdjustmentValue*)pPtr;
-}
-
 int SdrAutoShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
 {
     int bRet = SfxPoolItem::operator==( rCmp );
-    if ( bRet )
-    {
-        bRet = ((SdrAutoShapeAdjustmentItem&)rCmp).GetCount() == GetCount();
-        if ( bRet )
-        {
-            sal_uInt32 i;
-            for ( i = 0; i < GetCount(); i++ )
-            {DBG_BF_ASSERT(0, "STRIP");
-            }
-        }
-    }
     return bRet;
 }
 
@@ -969,11 +948,7 @@ SfxPoolItem* SdrAutoShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItem
 
 SfxPoolItem* SdrAutoShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    sal_uInt32 i;
     SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem;
-    for ( i = 0; i < GetCount(); i++ )
-    {DBG_BF_ASSERT(0, "STRIP");
-    }
     return pItem;
 }
 
diff --git a/binfilter/inc/bf_svx/sdasaitm.hxx b/binfilter/inc/bf_svx/sdasaitm.hxx
index 80029e1..ed424b7 100644
--- a/binfilter/inc/bf_svx/sdasaitm.hxx
+++ b/binfilter/inc/bf_svx/sdasaitm.hxx
@@ -30,45 +30,27 @@
 #define _SDASAITM_HXX
 
 #include <bf_svtools/poolitem.hxx>
-#include <tools/list.hxx>
-namespace binfilter {
-
-class SdrAutoShapeAdjustmentValue
-{
-    sal_uInt32	nValue;
-
-    friend class SdrAutoShapeAdjustmentItem;
-
-    public :
 
-        void		SetValue( sal_Int32 nVal ) { nValue = nVal; };
-        sal_Int32	GetValue() const { return nValue; };
-
-};
+namespace binfilter {
 
 class SdrAutoShapeAdjustmentItem : public SfxPoolItem
 {
-            List	aAdjustmentValueList;
+public :
 
-    public :
+    TYPEINFO();
+    SdrAutoShapeAdjustmentItem();
+    SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion );
 
-            TYPEINFO();
-            SdrAutoShapeAdjustmentItem();
-            SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion );
-            ~SdrAutoShapeAdjustmentItem();
-
-            virtual int					operator==( const SfxPoolItem& ) const;
-            virtual SfxPoolItem*		Create( SvStream&, sal_uInt16 nItem ) const;
-            virtual SvStream&			Store( SvStream& rStream, sal_uInt16 ) const { return rStream; }
-            virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
-            virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
+    virtual int					operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*		Create( SvStream&, sal_uInt16 nItem ) const;
+    virtual SvStream&			Store( SvStream& rStream, sal_uInt16 ) const { return rStream; }
+    virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
+    virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
 
 #ifdef SDR_ISPOOLABLE
-            virtual int IsPoolable() const;
+    virtual int IsPoolable() const;
 #endif
-
-            sal_uInt32							GetCount() const { return aAdjustmentValueList.Count(); };
 };
 
 }//end of namespace binfilter