You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2012/09/07 05:11:47 UTC
svn commit: r1381847 -
/incubator/ooo/trunk/main/sd/source/ui/unoidl/unomodel.cxx
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 <st...@gmail.com>
Suggested by:Wang Zhe <ki...@gmail.com>
Found by: Du Jing <jb...@gmail.com>
Review by: Wang Zhe <ki...@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);
}