CWS-TOOLING: integrate CWS impress180_DEV300

3 files changed, 44 insertions, 62 deletions

diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx
index 0e2840894e9a..6454b3dd7c2a 100644
--- a/svx/source/cui/numpages.cxx
+++ b/svx/source/cui/numpages.cxx
@@ -378,18 +378,12 @@ int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
@@ -570,17 +564,12 @@ int  SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
 //  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
 
@@ -800,17 +789,12 @@ int  SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
 //  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     if(!pActNum)
@@ -1105,17 +1089,12 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 
 void  SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
@@ -1537,17 +1516,12 @@ BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 --------------------------------------------------*/
 void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
     // Ebenen einfuegen
     if(!aLevelLB.GetEntryCount())
@@ -1591,6 +1565,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     pPreviewWIN->SetNumRule(pActNum);
     aSameLevelCB.Check(pActNum->IsContinuousNumbering());
 
+    const SfxPoolItem* pItem = 0;
     //ColorListBox bei Bedarf fuellen
     if ( pActNum->IsFeatureSupported( NUM_BULLET_COLOR ) )
     {
@@ -3434,17 +3409,12 @@ BOOL SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
 --------------------------------------------------*/
 void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxPoolItem* pItem;
-    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
-    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
-    if(eState != SFX_ITEM_SET)
-    {
-        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
-        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
-    }
-    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
+    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+
+    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
+    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
 
     // Ebenen einfuegen
     if(!aLevelLB.GetEntryCount())
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx
index fc71feb18740..e787d07f673d 100644
--- a/svx/source/msfilter/msdffimp.cxx
+++ b/svx/source/msfilter/msdffimp.cxx
@@ -7099,6 +7099,8 @@ BOOL SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
             aZCodec.Decompress( rBLIPStream, *pOut );
             aZCodec.EndCompression();
             pOut->Seek( STREAM_SEEK_TO_BEGIN );
+            pOut->SetResizeOffset( 0 ); // sj: #i102257# setting ResizeOffset of 0 prevents from seeking
+                                        // behind the stream end (allocating too much memory)
             pGrStream = pOut;
         }
 
@@ -8184,6 +8186,7 @@ void SvxMSDffManager::removeShapeId( SdrObject* pShape )
             maShapeIdContainer.erase( aIter );
             break;
         }
+        aIter++;
     }
 }
 
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
index af38c34e0749..347a5005bd78 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/svx/source/svdraw/svdfppt.cxx
@@ -7662,7 +7662,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
     }
 }
 
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
 {
     SdrObject* pRet = pGroup;
     sal_uInt32 nRows = pTableArry[ 1 ];
@@ -7786,6 +7786,15 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                 pTable->uno_unlock();
                 pTable->SetSnapRect( pGroup->GetSnapRect() );
                 pRet = pTable;
+
+                //Remove Objects from shape map
+                SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
+                while( aIter.IsMore() )
+                {
+                    SdrObject* pPartObj = aIter.Next();
+                    removeShapeId( pPartObj );
+                }
+
                 SdrObject::Free( pGroup );
             }
             catch( Exception& )