fdo#73151 Make better use of the sidebar

The general idea is to encourage use of the sidebar instead of floating windows (for Navigator, Styles&Formatting and Gallery)

Changes:
* Show the sidebar by default in Writer & Impress
* Remove the Gallery floating window (Gallery now always opens in the sidebar)
* Remove all Gallery, Navigator and Styles&Formatting links from the default toolbar in Writer
(since they have an icon in the sidebar and the sidebar is shown by default now)
* When selecting "More" from the Styles dropdown, the Stylelist opens in the sidebar instead of the floating window

This has all been discussed extensively here: https://bugs.freedesktop.org/show_bug.cgi?id=73151

Change-Id: I3a0461d1472711da7121801000af294b432fccb1
Reviewed-on: https://gerrit.libreoffice.org/11077
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

23 files changed, 13 insertions, 42 deletions

diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 40ec958f82ee..357894cd964e 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -585,7 +585,6 @@ interface BaseTextEditView
     SID_GALLERY
     [
         ExecMethod = Execute ;
-        StateMethod = GetState ;
     ]
     SID_AVMEDIA_PLAYER
     [
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index acc4d051739d..ed8f68e326f7 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -394,8 +394,6 @@ void SwDLL::RegisterControls()
     SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
     SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
 
-    GalleryChildWindow::RegisterChildWindow(false, pMod);
-
     ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
     ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
 
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 4864bde7840c..15d7c9b573e7 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -104,7 +104,6 @@ void SwView::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(FN_REDLINE_ACCEPT);
     GetStaticInterface()->RegisterChildWindow(SID_HYPERLINK_DIALOG);
     GetStaticInterface()->RegisterChildWindow(FN_WORDCOUNT_DIALOG);
-    GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
 #if HAVE_FEATURE_AVMEDIA
     GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId());
 #endif
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 5b5c97f464cf..3d745c61307c 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -140,6 +140,7 @@
 #include <unotextrange.hxx>
 #include <docstat.hxx>
 #include <wordcountdialog.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
@@ -1076,7 +1077,12 @@ void SwView::Execute(SfxRequest &rReq)
                 JumpToSwMark( (( const SfxStringItem*)pItem)->GetValue() );
         break;
         case SID_GALLERY :
-            GetViewFrame()->ChildWindowExecute(rReq);
+            // First make sure that the sidebar is visible
+            GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+
+            ::sfx2::sidebar::Sidebar::ShowPanel(
+                "GalleryPanel",
+                GetViewFrame()->GetFrame().GetFrameInterface());
         break;
         case SID_AVMEDIA_PLAYER :
             GetViewFrame()->ChildWindowExecute(rReq);
@@ -1092,7 +1098,7 @@ void SwView::Execute(SfxRequest &rReq)
             }
         }
         break;
-        case FN_INSERT_FIELD_DATA_ONLY :
+        case FN_INSERT_FIELD_DATA_ONLY:
         {
             bool bShow = false;
             if( pArgs &&
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 0148ffd53318..6d48aa9dbd85 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -285,7 +285,6 @@ void SwView::GetState(SfxItemSet &rSet)
                     (m_pWrtShell->GetRedlineMode() & nMask) == nMask ));
             }
             break;
-            case SID_GALLERY :
             case SID_AVMEDIA_PLAYER :
             case FN_REDLINE_ACCEPT :
             {
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index e3379f8a8fd3..a53f25bf0f74 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -49,8 +49,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
index 738fdd59be15..2e97c660adfa 100644
--- a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
@@ -58,4 +56,4 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index 77bba2c346b3..1fd6af2f28c3 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -52,8 +52,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="10593"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/sweb/toolbar/textobjectbar.xml b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
index 7acfa37233b3..757ae2e60859 100644
--- a/sw/uiconfig/sweb/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:helpid="10007"/>
diff --git a/sw/uiconfig/sweb/toolbar/viewerbar.xml b/sw/uiconfig/sweb/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/sweb/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sweb/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml
index e3379f8a8fd3..a53f25bf0f74 100644
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
@@ -49,8 +49,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swform/toolbar/textobjectbar.xml b/sw/uiconfig/swform/toolbar/textobjectbar.xml
index 738fdd59be15..2e97c660adfa 100644
--- a/sw/uiconfig/swform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
@@ -58,4 +56,4 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/viewerbar.xml b/sw/uiconfig/swform/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/swform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swform/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml
index e3379f8a8fd3..a53f25bf0f74 100644
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
@@ -49,8 +49,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swreport/toolbar/textobjectbar.xml b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
index 738fdd59be15..2e97c660adfa 100644
--- a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
@@ -58,4 +56,4 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/viewerbar.xml b/sw/uiconfig/swreport/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/swreport/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swreport/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index d78bb4f8642d..4eed6fb41245 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -49,8 +49,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 738fdd59be15..2e97c660adfa 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
@@ -58,4 +56,4 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/viewerbar.xml b/sw/uiconfig/swriter/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/swriter/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swriter/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/standardbar.xml b/sw/uiconfig/swxform/toolbar/standardbar.xml
index 57df68b96a81..28f376968ce6 100644
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -49,8 +49,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="5960"/>
  <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:helpid="6660"/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swxform/toolbar/textobjectbar.xml b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
index 738fdd59be15..2e97c660adfa 100644
--- a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
@@ -58,4 +56,4 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/viewerbar.xml b/sw/uiconfig/swxform/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sw/uiconfig/swxform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swxform/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>