CWS-TOOLING: integrate CWS impress168

2009-04-24 11:26:33 +0200 wg  r271204 : i101157
2009-04-24 10:17:59 +0200 wg  r271200 : i101157
2009-04-23 15:50:12 +0200 wg  r271178 : i101157
2009-04-23 15:16:58 +0200 wg  r271176 : i101157
2009-04-23 13:04:41 +0200 wg  r271158 : i101157
2009-04-22 15:39:32 +0200 wg  r271123 : i101157
2009-04-22 14:27:24 +0200 wg  r271111 : i101157
2009-04-22 14:14:02 +0200 wg  r271109 : i101157
2009-04-17 14:34:19 +0200 wg  r270946 : i101157
2009-04-17 13:49:15 +0200 wg  r270939 : i101157
2009-03-31 14:54:52 +0200 sj  r270281 : CWS-TOOLING: rebase CWS impress168 to trunk@270033 (milestone: DEV300:m45)
2009-03-26 16:56:44 +0100 sj  r270089 : removed invalid file names
2009-03-24 14:02:54 +0100 sj  r269944 : CWS-TOOLING: rebase CWS impress168 to trunk@269781 (milestone: DEV300:m44)
2009-03-06 16:32:14 +0100 sj  r269020 : #i99970# importing customshapes without group object, taking care of the correct text alignment
2009-02-27 13:53:24 +0100 sj  r268591 : #158501,158483# fixed positioning problem of 3d customshapes
2009-02-19 16:02:00 +0100 sj  r268292 : #76543# fixed interactive hyperlink program action with relativ url
2009-02-18 15:36:52 +0100 sj  r268233 : #158503# added import of circular gradients for ellipse shapes
2009-02-16 19:51:54 +0100 sj  r267836 : #i99146# calculating correct text bounds
2009-02-12 13:59:46 +0100 sj  r267654 : #i96179# fixed bullet problem
2009-02-10 17:26:41 +0100 sj  r267566 : #158476# fixed import of the ribbon shape
2009-02-10 17:10:27 +0100 cl  r267561 : #i95364# fixed type detection of linked images
2009-02-09 18:31:59 +0100 cl  r267531 : #i98352# removed assertion
2009-02-09 18:31:17 +0100 cl  r267530 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 18:30:53 +0100 cl  r267529 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 09:52:15 +0100 cl  r267501 : #i98573# fixed build error
2009-02-06 17:02:21 +0100 sj  r267476 : #i96179# fixed bullet problem
2009-02-06 14:58:39 +0100 cl  r267466 : #i14832# fixed page count field for handout printing
2009-02-06 10:23:01 +0100 cl  r267447 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:34 +0100 cl  r267435 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:08 +0100 cl  r267434 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:54 +0100 cl  r267433 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:42 +0100 cl  r267432 : #i85481# added XMultiPropertyStates to text implementations
2009-02-04 18:54:46 +0100 sj  r267400 : #i33630# fixed arrow size of word import
2009-02-04 15:40:16 +0100 cl  r267389 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 15:39:07 +0100 cl  r267388 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 14:23:27 +0100 cl  r267382 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 14:22:34 +0100 cl  r267381 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 12:51:50 +0100 cl  r267371 : #i14832# added Page Count field to impress
2009-02-04 12:41:31 +0100 cl  r267368 : #i14832# added Page Count field to impress

5 files changed, 37 insertions, 15 deletions

diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 17d1d2dee5..a77e80a417 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -42,6 +42,7 @@
 
 #include <unotools/accessiblestatesethelper.hxx>
 
+#include <svx/outlobj.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdotext.hxx>
 
@@ -85,6 +86,8 @@ void AccessibleCell::Init (void)
     {
         OutlinerParaObject* pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
 
+        bool bOwnParaObject = pOutlinerParaObject != 0;
+
         if( !pOutlinerParaObject )
             pOutlinerParaObject = mxCell->GetOutlinerParaObject();
 
@@ -96,6 +99,9 @@ void AccessibleCell::Init (void)
             mpText = new AccessibleTextHelper( pEditSource );
             mpText->SetEventSource(this);
         }
+
+        if( bOwnParaObject)
+            delete pOutlinerParaObject;
     }
 }
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 5571f2cedd..7f2f2d35f1 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -199,6 +199,8 @@ namespace sdr
             {
                 OutlinerParaObject* pParaObj = mxCell->GetEditOutlinerParaObject();
                 
+                bool bOwnParaObj = pParaObj != 0;
+
                 if( pParaObj == 0 )
                     pParaObj = mxCell->GetOutlinerParaObject();
                 
@@ -242,6 +244,9 @@ namespace sdr
 
                         mxCell->SetOutlinerParaObject(pTemp);
                     }
+
+                    if( bOwnParaObj )
+                        delete pParaObj;
                 }
             }
 
@@ -446,10 +451,18 @@ void Cell::notifyModified()
 
 bool Cell::IsTextEditActive()
 {
+    bool isActive = false;
     SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() );
     if(rTableObj.getActiveCell().get() == this )
-        return rTableObj.GetEditOutlinerParaObject() != 0;
-    return false;
+    {
+        OutlinerParaObject* pParaObj = rTableObj.GetEditOutlinerParaObject();
+        if( pParaObj != 0 )
+        {
+            isActive = true;
+            delete pParaObj;
+        }
+    }
+    return isActive;
 }
 
 // -----------------------------------------------------------------------------
@@ -724,9 +737,6 @@ Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException)
     if( rType == XLayoutConstrains::static_type() )
         return Any( Reference< XLayoutConstrains >( this ) );
 
-    if( rType == XMultiPropertyStates::static_type() )
-        return Any( Reference< XMultiPropertyStates >( this ) );
-
     Any aRet( SvxUnoTextBase::queryAggregation( rType ) );
     if( aRet.hasValue() )
         return aRet;
@@ -757,10 +767,9 @@ Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException)
     Sequence< Type > aTypes( SvxUnoTextBase::getTypes() );
 
     sal_Int32 nLen = aTypes.getLength();
-    aTypes.realloc(nLen + 3);
+    aTypes.realloc(nLen + 2);
     aTypes[nLen++] = XMergeableCell::static_type();
     aTypes[nLen++] = XLayoutConstrains::static_type();
-    aTypes[nLen++] = XMultiPropertyStates::static_type();
 
     return aTypes;
 }
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 35aa44b1af..3500230dfa 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -61,7 +61,6 @@ class Cell :	public SdrText,
                 public SvxUnoTextBase,
                 public ::com::sun::star::table::XMergeableCell,
                 public ::com::sun::star::awt::XLayoutConstrains,
-                public ::com::sun::star::beans::XMultiPropertyStates,
                 public ::cppu::OWeakObject
 {
     friend class CellUndo;
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index deae438142..3be461adce 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -551,19 +551,19 @@ SvxTextForwarder* CellEditSourceImpl::GetBackgroundTextForwarder()
     {
         mpTextForwarder->flushCache();
 
-        OutlinerParaObject* mpOutlinerParaObject = NULL;
+        OutlinerParaObject* pOutlinerParaObject = NULL;
         bool bTextEditActive = false;
 
-        mpOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
+        pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
 
-        if( mpOutlinerParaObject )
+        if( pOutlinerParaObject )
             bTextEditActive = true;	// text edit active
         else
-            mpOutlinerParaObject = mxCell->GetOutlinerParaObject();
+            pOutlinerParaObject = mxCell->GetOutlinerParaObject();
         
-        if( mpOutlinerParaObject )
+        if( pOutlinerParaObject )
         {
-            mpOutliner->SetText( *mpOutlinerParaObject );
+            mpOutliner->SetText( *pOutlinerParaObject );
         }
         else
         {
@@ -598,6 +598,9 @@ SvxTextForwarder* CellEditSourceImpl::GetBackgroundTextForwarder()
             }
         }
 
+        if( bTextEditActive )
+            delete pOutlinerParaObject;
+
         mbDataValid = true;
     }
 
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index f419f08aad..53c557d972 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -51,6 +51,7 @@
 #include "svx/svdotable.hxx"
 #include "svx/svdoutl.hxx"
 #include "svx/editeng.hxx"
+#include "svx/outlobj.hxx"
 
 //#include <tablertfexporter.hxx>
 
@@ -214,7 +215,8 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
     String aContent;
 
     OutlinerParaObject* pParaObj = xCell->GetEditOutlinerParaObject();
-    
+    bool bOwnParaObj = pParaObj != 0;
+
     if( pParaObj == 0 )
         pParaObj = xCell->GetOutlinerParaObject();
     
@@ -227,6 +229,9 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
         aContent = rOutliner.GetEditEngine().GetText( LINEEND_LF );
 
         rOutliner.Clear();
+
+        if( bOwnParaObj )
+            delete pParaObj;
     }
 
     bool bResetPar, bResetAttr;