[Libreoffice-commits] core.git: sw/source

[akki95]

 sw/source/uibase/utlui/navipi.cxx |    3 +++
 sw/source/uibase/utlui/navipi.src |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
Author: akki95 <akshaydeepi...@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
    
    Bug resolved. Removed toggle button from non-master documents.
    Toggle button working for master documents only.
    Changed toggle button tooltip to "Toggle Master View"
    
    Change-Id: I7b77bae812ac208b0b93fff9e114b063d2ae2520
    Reviewed-on: https://gerrit.libreoffice.org/21913
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index de53270..b87f144 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -705,6 +705,9 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     m_aContentToolBox->InsertSeparator(4);
     m_aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
     m_aContentToolBox->ShowItem( FN_PAGENUMBER );
+    if(!IsGlobalDoc()){
+        m_aContentToolBox->HideItem( FN_GLOBAL_SWITCH );
+    }
 
     for( sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); 
i++  )
     {
diff --git a/sw/source/uibase/utlui/navipi.src 
b/sw/source/uibase/utlui/navipi.src
index aaa15cd..01cfa8b 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -82,7 +82,7 @@ Window DLG_NAVIGATION_PI
             {
                 Identifier = FN_GLOBAL_SWITCH ;
                 HelpID = HID_NAVI_TBX17 ;
-                Text [ en-US ] = "Toggle" ;
+                Text [ en-US ] = "Toggle Master View" ;
             };
             ToolBoxItem
             {
@@ -215,7 +215,7 @@ Window DLG_NAVIGATION_PI
             {
                 Identifier = FN_GLOBAL_SWITCH ;
                 HelpID = HID_NAVI_TBX17 ;
-                Text [ en-US ] = "Toggle" ;
+                Text [ en-US ] = "Toggle Master View" ;
             };
             ToolBoxItem
             {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits