INTEGRATION: CWS limerickfilterteam08 (1.30.32); FILE MERGED

2003/07/21 15:50:13 cmc 1.30.32.2: use new HasItem where its equivalent to more obscure GetItemState and cast
2003/07/10 13:46:30 cmc 1.30.32.1: #i6991# Use InsertOLE instead of Insert to be the same as the rest of writer to avoid being special and picking up bugs in edge cases

sw/source/filter/ww8/wrtww8gr.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtww8gr.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-17 15:04:35 $
+ *  last change: $Author: obo $ $Date: 2003-09-01 12:41:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,6 +137,10 @@
 #include <fmtornt.hxx>
 #endif
 
+#ifndef SW_WRITERHELPER
+#include "writerhelper.hxx"
+#endif
+
 #ifndef _WW8STRUC_HXX
 #include "ww8struc.hxx"
 #endif
@@ -296,7 +300,7 @@ Writer& OutWW8_SwOleNode( Writer& rWrt, SwCntntNode& rNode )
                 UINT32 nPictureId = (UINT32)pObj;
                 Set_UInt32(pDataAdr, nPictureId);
 
-                WW8OleMap *pMap = new WW8OleMap(nPictureId, pObj);
+                WW8OleMap *pMap = new WW8OleMap(nPictureId);
                 bool bDuplicate = false;
                 WW8OleMaps &rOleMap = rWW8Wrt.GetOLEMap();
                 USHORT nPos;
@@ -558,13 +562,12 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const SwNoTxtNode* pNd,
             if( pBox )
             {
                 bool bShadow = false;               // Shadow ?
-                const SfxPoolItem* pShadItem;
-                if (SFX_ITEM_ON
-                    == rAttrSet.GetItemState(RES_SHADOW, true, &pShadItem))
+                const SvxShadowItem* pSI =
+                    sw::util::HasItem<SvxShadowItem>(rAttrSet, RES_SHADOW);
+                if (pSI)
                 {
-                    const SvxShadowItem* pSI = (const SvxShadowItem*)pShadItem;
-                    bShadow = ( pSI->GetLocation() != SVX_SHADOW_NONE )
-                            && ( pSI->GetWidth() != 0 );
+                    bShadow = (pSI->GetLocation() != SVX_SHADOW_NONE) &&
+                        (pSI->GetWidth() != 0);
                 }
 
                 BYTE aLnArr[4] = { BOX_LINE_TOP, BOX_LINE_LEFT,