Commits

vg  committed 3df1b1d

CWS-TOOLING: integrate CWS cl12_DEV300
2009-02-28 11:04:48 +0100 cl r268621 : #i99678# correctly initialize paragraph vector for edit engine text
2009-02-27 16:16:25 +0100 dr r268605 : #i99710# lost cloning of outlinerparaobject

  • Participants
  • Parent commits 42bf21c

Comments (0)

Files changed (4)

File sc/source/core/data/postit.cxx

             {
                 // copy edit text object (object must be inserted into page already)
                 if( OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() )
-                    maNoteData.mpCaption->SetOutlinerParaObject( pOPO );
+                    maNoteData.mpCaption->SetOutlinerParaObject( new OutlinerParaObject( *pOPO ) );
                 // copy formatting items (after text has been copied to apply font formatting)
                 maNoteData.mpCaption->SetMergedItemSetAndBroadcast( pCaption->GetMergedItemSet() );
                 // move textbox position relative to new cell, copy textbox size

File sc/source/filter/xml/xmlannoi.cxx

                     pMyAnnotation->pRect = new Rectangle(aRect);
                 }
 
-                if((pSdrObj->GetOutlinerParaObject()))
-                    pMyAnnotation->pOPO = new OutlinerParaObject( *(pSdrObj->GetOutlinerParaObject()) );
+                if( OutlinerParaObject* pOPO = pSdrObj->GetOutlinerParaObject() )
+                    pMyAnnotation->pOPO = new OutlinerParaObject( *pOPO );
 
                 xShapes->remove(xShape);
             }

File sc/source/filter/xml/xmlcelli.cxx

                 if( SdrCaptionObj* pCaption = pNote->GetCaption() )
                 {
                     if( pMyAnnotation->pOPO )
+                    {
+                        // transfer outliner object to caption
                         pCaption->SetOutlinerParaObject( pMyAnnotation->pOPO );
+                        // do not delete the object in ScMyImportAnnotation d'tor 
+                        pMyAnnotation->pOPO = 0;
+                    }
                     else
                         pCaption->SetText( pMyAnnotation->sText );
                     // copy all items and reset shadow items

File svx/source/outliner/outlobj.cxx

         mbIsEditDoc(bIsEditDoc),
         mnRefCount(0)
     {
+        if( (maParagraphDataVector.size() == 0) && (pEditTextObject->GetParagraphCount() != 0) )
+            maParagraphDataVector.resize(pEditTextObject->GetParagraphCount());
     }
 
     // destructor