diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 02:11:47 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-03-25 00:41:04 +0100 |
| commit | 69b0688589fe611d873d2c8d2556dd1279c764a0 (patch) | |
| tree | 09b6bcb992d6537aaf743cad86390a78f371957c /sd | |
| parent | 02ed2608199f2adc466849d0f4864213ad07c445 (diff) | |
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>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |