[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[Michael Stahl]

 sw/source/uibase/utlui/content.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a900c91447897e725fc0cf674205eee633b326eb
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Jul 6 18:39:20 2018 +0200

    tdf#115890 sw: fix invalid cast in SwContentTree::GetEntryAltText()
    
    AccessibleListBoxEntry calls this for any entry.
    
    This was always broken but now we have asserts to tell us about it.
    
    Change-Id: I7094a1dfbffd359e0f536ca60cba2478e2a62464
    Reviewed-on: https://gerrit.libreoffice.org/57086
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 2986f4baa8bdef1f9ab9108240ea890075321be1)
    Reviewed-on: https://gerrit.libreoffice.org/57152
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 9b59a912c722..9012fd86fbcf 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -902,7 +902,7 @@ Size SwContentTree::GetOptimalSize() const
 
 OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
 {
-    if( pEntry == nullptr)
+    if (pEntry == nullptr || !lcl_IsContent(pEntry))
         return OUString();
 
     assert(pEntry->GetUserData() == nullptr || dynamic_cast<SwContent*>(static_cast<SwTypeNumber*>(pEntry->GetUserData())));