INTEGRATION: CWS xmlfilter02 (1.51.276); FILE MERGED

2007/12/12 10:12:57 dr 1.51.276.10: RESYNC: (1.65-1.66); FILE MERGED
2007/07/24 19:18:00 dr 1.51.276.9: RESYNC: (1.62-1.65); FILE MERGED
2007/05/29 11:39:52 dr 1.51.276.8: RESYNC: (1.61-1.62); FILE MERGED
2007/05/03 12:31:13 dr 1.51.276.7: RESYNC: (1.60-1.61); FILE MERGED
2007/03/14 17:59:08 dr 1.51.276.6: RESYNC: (1.59-1.60); FILE MERGED
2007/01/24 16:15:52 cl 1.51.276.5: fixed merge conflicts
2007/01/18 04:56:11 cl 1.51.276.4: RESYNC: (1.52-1.59); FILE MERGED
2006/05/08 14:49:53 cl 1.51.276.3: fixed merge problems
2006/05/02 14:04:43 cl 1.51.276.2: RESYNC: (1.51-1.52); FILE MERGED
2006/02/15 19:41:24 cl 1.51.276.1: merge default customshape attributes when set over api

svx/source/unodraw/unoshap2.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoshap2.cxx,v $
  *
- *  $Revision: 1.66 $
+ *  $Revision: 1.67 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 15:35:31 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 12:49:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1738,6 +1738,15 @@ void SAL_CALL SvxGraphicObject::setPropertyValue( const OUString& aPropertyName,
                 }
             }
         }
+        else if( aValue.getValueType() == INTERFACE_TYPE( graphic::XGraphic ))
+        {
+            Reference< graphic::XGraphic > xGraphic( aValue, UNO_QUERY );
+            if( xGraphic.is() )
+            {
+                Graphic aGraphic( xGraphic );
+                ((SdrGrafObj*)mpObj.get())->SetGraphic(aGraphic);
+            }
+        }
     }
     else if( mpObj.is() && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_GRAFURL)))
     {
@@ -2187,6 +2196,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
 
     if ( bCustomShapeGeometry )
     {
+        ((SdrObjCustomShape*)pObject)->MergeDefaultAttributes(0);
         Rectangle aRect( pObject->GetSnapRect() );
 
         // #i38892#