From b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 28 Feb 2014 02:15:29 +0000 Subject: 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 --- sd/source/ui/view/drviewsb.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sd/source/ui/view/drviewsb.cxx') diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index d6dddd58a60d..eeb5b7dcb3e8 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -166,6 +166,12 @@ void DrawViewShell::ModifyLayer ( bool bIsLocked, bool bIsPrintable) { + if(!GetLayerTabControl()) // #i87182# + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + return; + } + if( pLayer ) { const sal_uInt16 nPageCount = GetLayerTabControl()->GetPageCount(); -- cgit