INTEGRATION: CWS impress18 (1.11.1068); FILE MERGED

2004/11/09 12:47:41 cl 1.11.1068.1: #i36727# filter empty bitmap items

1 files changed, 18 insertions, 2 deletions

diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 8fe4c1df4f98..6d5084af0198 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unobtabl.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-15 17:30:33 $
+ *  last change: $Author: obo $ $Date: 2004-11-18 09:20:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,6 +102,7 @@ public:
     virtual ~SvxUnoBitmapTable() throw();
 
     virtual NameOrIndex* createItem() const throw();
+    virtual bool isValid( const NameOrIndex* pItem ) const;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  ) throw( uno::RuntimeException );
@@ -120,6 +121,21 @@ SvxUnoBitmapTable::~SvxUnoBitmapTable() throw()
 {
 }
 
+bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const
+{
+    if( SvxUnoNameItemTable::isValid( pItem ) )
+    {
+        const XFillBitmapItem* pBitmapItem = dynamic_cast< const XFillBitmapItem* >( pItem );
+        if( pBitmapItem )
+        {
+            const GraphicObject& rGraphic = pBitmapItem->GetValue().GetGraphicObject();
+            return rGraphic.GetSizeBytes() > 0;
+        }
+    }
+
+    return false;
+}
+
 OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException )
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoBitmapTable") );