From 69b0688589fe611d873d2c8d2556dd1279c764a0 Mon Sep 17 00:00:00 2001
From: Zhe Wang <wangzcdl@apache.org>
Date: Fri, 7 Sep 2012 02:11:47 +0000
Subject: 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>
---
 sd/source/ui/unoidl/unomodel.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd')

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 037a2cd7cc59..32249c19df99 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -736,7 +736,8 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage
 
     if( !xMasterPages.is() )
     {
-        initializeDocument();
+        if ( !hasControllersLocked() )
+            initializeDocument();
         mxMasterPagesAccess = xMasterPages = new SdMasterPagesAccess(*this);
     }
 
-- 
cgit