diff options
author | akki95 <akshaydeepiitr@gmail.com> | 2016-01-30 09:55:41 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-02-02 12:45:58 +0000 |
commit | 20e2d7e7d1c518fe514e8252836c1c728fe3fc27 (patch) | |
tree | 47fc074b7339a5c7552cee80392f2cab38f2e920 | |
parent | 4120449c863c7ec01f5098f04be1af15a326a5b2 (diff) |
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.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/utlui/navipi.src | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index de53270490af..b87f14457c23 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 aaa15cdd4306..01cfa8b8534e 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 { |