incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1352571 - in /incubator/ooo/trunk/main: comphelper/inc/comphelper/embeddedobjectcontainer.hxx comphelper/source/container/embeddedobjectcontainer.cxx sw/source/core/ole/ndole.cxx
Date Thu, 21 Jun 2012 15:25:25 GMT
Author: alg
Date: Thu Jun 21 15:25:25 2012
New Revision: 1352571

URL: http://svn.apache.org/viewvc?rev=1352571&view=rev
Log:
#119941# Avoid crash when chart is removed in Writer by keepintg it's storage and graphic
stream.
Patch by: Clarence Guo, zhaoshzh
Review by: alg
Found by: Shan Zhu

Modified:
    incubator/ooo/trunk/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
    incubator/ooo/trunk/main/comphelper/source/container/embeddedobjectcontainer.cxx
    incubator/ooo/trunk/main/sw/source/core/ole/ndole.cxx

Modified: incubator/ooo/trunk/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx?rev=1352571&r1=1352570&r2=1352571&view=diff
==============================================================================
--- incubator/ooo/trunk/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx (original)
+++ incubator/ooo/trunk/main/comphelper/inc/comphelper/embeddedobjectcontainer.hxx Thu Jun
21 15:25:25 2012
@@ -127,10 +127,12 @@ public:
 
     // move an embedded object from one container to another one
     sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference
< ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
-
+ // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary
storage+    
+sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose
= sal_True, sal_Bool bKeepToTempStorage = sal_True );
+sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject
>&, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True ); 
     // remove an embedded object from the container and from the storage; if object can't
be closed
-    sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool
bClose=sal_True );
-    sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference <
::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
+    //sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool
bClose=sal_True );
+   // sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference <
::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
 
 	// close and remove an embedded object from the container without removing it from the storage
     sal_Bool            CloseEmbeddedObject( const ::com::sun::star::uno::Reference <
::com::sun::star::embed::XEmbeddedObject >& );

Modified: incubator/ooo/trunk/main/comphelper/source/container/embeddedobjectcontainer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/comphelper/source/container/embeddedobjectcontainer.cxx?rev=1352571&r1=1352570&r2=1352571&view=diff
==============================================================================
--- incubator/ooo/trunk/main/comphelper/source/container/embeddedobjectcontainer.cxx (original)
+++ incubator/ooo/trunk/main/comphelper/source/container/embeddedobjectcontainer.cxx Thu Jun
21 15:25:25 2012
@@ -950,13 +950,16 @@ sal_Bool EmbeddedObjectContainer::MoveEm
     return bRet;
 }
 
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName,
sal_Bool bClose )
+//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName,
sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary
storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName,
sal_Bool bClose, sal_Bool bKeepToTempStorage )
 {
 	RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject(
Name )" );
 
     uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName );
     if ( xObj.is() )
-        return RemoveEmbeddedObject( xObj, bClose );
+        //return RemoveEmbeddedObject( xObj, bClose );
+        return RemoveEmbeddedObject( xObj, bClose, bKeepToTempStorage );
     else
         return sal_False;
 }
@@ -1014,7 +1017,9 @@ sal_Bool EmbeddedObjectContainer::MoveEm
     return sal_False;
 }
 
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject
>& xObj, sal_Bool bClose )
+//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject
>& xObj, sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary
storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject
>& xObj, sal_Bool bClose, sal_Bool bKeepToTempStorage ) 
 {
 	RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject(
Object )" );
 
@@ -1051,7 +1056,8 @@ sal_Bool EmbeddedObjectContainer::Remove
         // somebody still needs the object, so we must assign a temporary persistence
         try
         {
-            if ( xPersist.is() )
+        //    if ( xPersist.is() )
+             if ( xPersist.is() && bKeepToTempStorage )	// #i119941
             {
                 /*
                 //TODO/LATER: needs storage handling!  Why not letting the object do it?!
@@ -1131,7 +1137,8 @@ sal_Bool EmbeddedObjectContainer::Remove
     }
 
     OSL_ENSURE( bFound, "Object not found for removal!" );
-    if ( xPersist.is() )
+   // if ( xPersist.is() )
+    if ( xPersist.is() && bKeepToTempStorage )	// #i119941
     {
         // remove replacement image (if there is one)
         RemoveGraphicStream( aName );

Modified: incubator/ooo/trunk/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/ole/ndole.cxx?rev=1352571&r1=1352570&r2=1352571&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/ole/ndole.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/ole/ndole.cxx Thu Jun 21 15:25:25 2012
@@ -33,6 +33,7 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>	// #i119941
 #include <cppuhelper/implbase1.hxx>
 
 #include <cppuhelper/implbase2.hxx>
@@ -357,8 +358,31 @@ sal_Bool SwOLENode::SavePersistentData()
 			if ( xChild.is() )
 				xChild->setParent( 0 );
 
-            pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
-
+          // pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
+           /* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will call SaveSection
to store the comtent to strorage. 
+           In this step, chart filter functions will be called. And chart filter will call
chart core functions to create the chart again. 
+           Then chart core function will call the class ExplicitCategoryProvider to create
data source. 
+           In this step, when SW data source provider create the data source, it will create
a new SwFlyFrm. 
+           But later in SwUndoFlyBase::DelFly, it will clear anchor related attributes of
SwFlyFrm. Then finally null pointer occur.
+           Resolution:
+           In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove
the object from the object container, 
+           without removing it's storage and graphic stream. The chart already removed from
formatter.> */
+           sal_Bool	bChartWithInternalProvider = sal_False;
+           sal_Bool	bKeepObjectToTempStorage = sal_True;
+           uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
+           if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
+           {
+               uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(),
UNO_QUERY );
+               if ( xChart.is() && xChart->hasInternalDataProvider() )
+                   bChartWithInternalProvider = sal_True;
+           }            
+            
+           if ( IsChart() && sChartTblName.Len() && !bChartWithInternalProvider
)
+               bKeepObjectToTempStorage = sal_False;
+           pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False, bKeepObjectToTempStorage
);
+           // modify end            
+            
+            
 			// TODO/LATER: aOLEObj.aName has no meaning here, since the undo container contains the
object
 			// by different name, in future it might makes sence that the name is transported here.
             aOLEObj.xOLERef.AssignToContainer( 0, aOLEObj.aName );



Mime
View raw message