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/accessibility | |
| 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/accessibility')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 343551981b28..4f688ff45c9e 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -862,7 +862,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() sValue += sName; sValue += OUString::number(pDrViewSh->GetPageTabControl()->GetPageCount()) ; sValue += ";"; - if(pDrViewSh->IsLayerModeActive() ) + if(pDrViewSh->IsLayerModeActive() && pDrViewSh->GetLayerTabControl()) // #i87182# { sName = "page-name:"; sValue = sName; |