diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-28 02:15:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-28 16:51:04 +0000 |
| commit | b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f (patch) | |
| tree | 0a119fe314b8c820faf3de401378e4afb4adf3fc /sd/source/ui/view/drviews2.cxx | |
| parent | 51f73a9be8270487885d185eaa3dda13ec43d9b0 (diff) | |
Resolves: #i87182# secured usage of LayerTabBar in Draw...
ensured initialization when used as OLE
(cherry picked from commit 903afaa8ea0766e01ba41a227d2794c2c40b129a)
Conflicts:
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsb.cxx
Change-Id: I86bb17bf422356247a319f89e54d1ead97b368b8
Diffstat (limited to 'sd/source/ui/view/drviews2.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index b0eeb9e3b852..faad29ae88c3 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1538,6 +1538,14 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_MODIFYLAYER: { + if(!GetLayerTabControl()) // #i87182# + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + Cancel(); + rReq.Ignore(); + break; + } + if ( mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); @@ -1694,8 +1702,14 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) mpDrawView->SdrEndTextEdit(); } - GetLayerTabControl()->StartEditMode( - GetLayerTabControl()->GetCurPageId() ); + if(GetLayerTabControl()) // #i87182# + { + GetLayerTabControl()->StartEditMode(GetLayerTabControl()->GetCurPageId()); + } + else + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + } Cancel(); rReq.Ignore (); |