[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Caolán McNamara]

 sw/source/core/uibase/utlui/glbltree.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit ff518ba8a6d2ed88c7992ead856d7f7987a04919
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Aug 26 12:32:21 2014 +0100

    there is no GLOBAL_CONTENT_TEXT icon
    
    avoid broken image in navigator in master document view
    
    (cherry picked from commit faa18e9b19e52b611f77ba3ea9818c267ad2346f)
    
    Conflicts:
        sw/source/uibase/utlui/glbltree.cxx
    
    Change-Id: I329e12c3c8bc32781340a164213aaf3e4958d4b3
    Reviewed-on: https://gerrit.libreoffice.org/11130
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sw/source/core/uibase/utlui/glbltree.cxx 
b/sw/source/core/uibase/utlui/glbltree.cxx
index b9ade13..3c4b938 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -665,7 +665,6 @@ void    SwGlobalTree::Display(bool bOnlyUpdateUserData)
                 case GLBLDOC_UNKNOWN:
                 {
                     sEntry = aContextStrings[ST_TEXT   - 
ST_GLOBAL_CONTEXT_FIRST];
-                    aImage = aEntryImages.GetImage(SID_SW_START + 
GLOBAL_CONTENT_TEXT);
                 }
                 break;
                 case GLBLDOC_TOXBASE:

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits