[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

Caolán McNamara caolanm at redhat.com
Thu Oct 13 16:35:20 UTC 2016


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

New commits:
commit a357ce53723829748f3622137ae4d4e47d7b6bac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 15:30:15 2016 +0100

    Master Document toggle missing if switch to master doc from normal doc
    
    regression since...
    
    commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
    Author: akki95 <akshaydeepiitr at gmail.com>
    Date:   Sat Jan 30 09:55:41 2016 +0530
    
        tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it toggles
    
    (cherry picked from commit 045367d9ba43ec6afb003fd9117ae186c7e18e34)
    
    Change-Id: I310eb7bfc39993ba54bbd9eca04ce721c8a68ea6
    Reviewed-on: https://gerrit.libreoffice.org/29702
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 5c70544..2a62187 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -941,7 +941,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
             SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
             m_aContentTree->SetActiveShell(pWrtShell);
             bool bGlobal = IsGlobalDoc();
-            m_aContentToolBox->EnableItem(FN_GLOBAL_SWITCH, bGlobal);
+            m_aContentToolBox->ShowItem(FN_GLOBAL_SWITCH, bGlobal);
             if( (!bGlobal && IsGlobalMode()) ||
                     (!IsGlobalMode() && m_pConfig->IsGlobalActive()) )
             {


More information about the Libreoffice-commits mailing list