incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wangz...@apache.org
Subject svn commit: r1381847 - /incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx
Date Fri, 07 Sep 2012 03:11:47 GMT
Author: wangzcdl
Date: Fri Sep  7 03:11:47 2012
New Revision: 1381847

URL: http://svn.apache.org/viewvc?rev=1381847&view=rev
Log:
   Fix issue #i119524#: [From Symphony]Can not open the sample ppt file which contain vb controls
in the slide master. 
   * subversion/main/sd/source/ui/unoidl/unomodel.cxx
     []Before initializeDocument,should check whether it is in loading process

   Patch by: Yin Bing <steve.yin.aoo@gmail.com>
   Suggested by:Wang Zhe <kingwisemmx@gmail.com>
   Found by: Du Jing <jbjdujing@gmail.com>
   Review by: Wang Zhe <kingwisemmx@gmail.com>

Modified:
    incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx

Modified: incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx?rev=1381847&r1=1381846&r2=1381847&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx Fri Sep  7 03:11:47 2012
@@ -802,7 +802,8 @@ uno::Reference< drawing::XDrawPages > SA
 
 	if( !xMasterPages.is() )
 	{
-		initializeDocument();
+		if ( !hasControllersLocked() )
+			initializeDocument();
 		mxMasterPagesAccess = xMasterPages = new SdMasterPagesAccess(*this);
 	}
 



Mime
View raw message