diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 02:11:47 +0000 |
|---|---|---|
| committer | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 02:11:47 +0000 |
| commit | b0e67d12cb84c0b5272905cb8aee37bfce794fb1 (patch) | |
| tree | 101ded4c8b2d748294022950e4cfaee8bd95592a /sd | |
| parent | 333d80e140b5b0cfb4b40d15d685a2616a1b5826 (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>
Notes
Notes:
merged as: 69b0688589fe611d873d2c8d2556dd1279c764a0
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 5444b62a012b..db264f6e0ba5 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -802,7 +802,8 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage if( !xMasterPages.is() ) { - initializeDocument(); + if ( !hasControllersLocked() ) + initializeDocument(); mxMasterPagesAccess = xMasterPages = new SdMasterPagesAccess(*this); } |