[Libreoffice-commits] core.git: include/svx officecfg/registry sc/sdi sc/source sd/sdi sd/source sd/uiconfig sfx2/source svx/sdi svx/source sw/sdi sw/source sw/uiconfig
Samuel Mehrbrodt
s.mehrbrodt at gmail.com
Sun Aug 24 04:26:40 PDT 2014
include/svx/galbrws.hxx | 8 --
officecfg/registry/data/org/openoffice/Office/Views.xcu | 9 +-
sc/sdi/tabvwsh.sdi | 6 -
sc/source/ui/app/scdll.cxx | 1
sc/source/ui/inc/tabvwsh.hxx | 4 -
sc/source/ui/view/tabvwsh.cxx | 1
sc/source/ui/view/tabvwsh9.cxx | 24 +-----
sd/sdi/_drvwsh.sdi | 2
sd/source/ui/app/sddll.cxx | 1
sd/source/ui/inc/DrawViewShell.hxx | 1
sd/source/ui/slideshow/slideshowimpl.cxx | 1
sd/source/ui/view/drviews2.cxx | 59 ++++++----------
sd/source/ui/view/drviews6.cxx | 5 -
sd/source/ui/view/drviews9.cxx | 4 -
sd/source/ui/view/drvwshrg.cxx | 2
sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 2
sd/uiconfig/sdraw/toolbar/standardbar.xml | 1
sd/uiconfig/sdraw/toolbar/toolbar.xml | 1
sd/uiconfig/sdraw/toolbar/viewerbar.xml | 1
sd/uiconfig/simpress/toolbar/drawingobjectbar.xml | 2
sd/uiconfig/simpress/toolbar/standardbar.xml | 3
sd/uiconfig/simpress/toolbar/toolbar.xml | 1
sd/uiconfig/simpress/toolbar/viewerbar.xml | 1
sfx2/source/sidebar/Sidebar.cxx | 4 -
svx/sdi/svx.sdi | 2
svx/source/gallery2/galbrws.cxx | 18 ----
svx/source/tbxctrls/tbcontrl.cxx | 13 +--
sw/sdi/_viewsh.sdi | 1
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/uiview/view0.cxx | 1
sw/source/uibase/uiview/view2.cxx | 10 ++
sw/source/uibase/uiview/viewstat.cxx | 1
sw/uiconfig/sglobal/toolbar/standardbar.xml | 2
sw/uiconfig/sglobal/toolbar/textobjectbar.xml | 4 -
sw/uiconfig/sglobal/toolbar/viewerbar.xml | 1
sw/uiconfig/sweb/toolbar/standardbar.xml | 2
sw/uiconfig/sweb/toolbar/textobjectbar.xml | 2
sw/uiconfig/sweb/toolbar/viewerbar.xml | 1
sw/uiconfig/swform/toolbar/standardbar.xml | 2
sw/uiconfig/swform/toolbar/textobjectbar.xml | 4 -
sw/uiconfig/swform/toolbar/viewerbar.xml | 1
sw/uiconfig/swreport/toolbar/standardbar.xml | 2
sw/uiconfig/swreport/toolbar/textobjectbar.xml | 4 -
sw/uiconfig/swreport/toolbar/viewerbar.xml | 1
sw/uiconfig/swriter/toolbar/standardbar.xml | 2
sw/uiconfig/swriter/toolbar/textobjectbar.xml | 4 -
sw/uiconfig/swriter/toolbar/viewerbar.xml | 1
sw/uiconfig/swxform/toolbar/standardbar.xml | 2
sw/uiconfig/swxform/toolbar/textobjectbar.xml | 4 -
sw/uiconfig/swxform/toolbar/viewerbar.xml | 1
50 files changed, 62 insertions(+), 170 deletions(-)
New commits:
commit b4558b508141af16d335f45a0f12bdd34521e944
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date: Fri Aug 22 22:37:56 2014 +0200
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 at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx
index 206dec1..a4de714 100644
--- a/include/svx/galbrws.hxx
+++ b/include/svx/galbrws.hxx
@@ -26,14 +26,6 @@
#include <tools/urlobj.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow
-{
-public:
- GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
- virtual ~GalleryChildWindow();
-
- SFX_DECL_CHILDWINDOW_WITHID( GalleryChildWindow );
-};
class FmFormModel;
class GalleryBrowser1;
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index adc701a..771ed28 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,18 +19,23 @@
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Views" oor:package="org.openoffice.Office">
<node oor:name="Windows">
+ <!-- Hide Styles&Formatting dialog -->
<node oor:name="5539" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
</node>
- <!-- don't show Sidebar child window by default in all modules
- except impress - oor:name == SID_SIDEBAR -->
+ <!-- Show sidebar only in Impress and Writer by default -->
<node oor:name="10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
</node>
+ <node oor:name="swriter/10336" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
<node oor:name="simpress/10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 633e887..8f67a4d 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -92,9 +92,9 @@ interface BaseSelection
SID_INSERT_SMATH [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
- SID_GALLERY_FORMATS [ ExecMethod = ExecGallery; StateMethod = GetGalleryState; ]
- SID_GALLERY [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ]
- SID_AVMEDIA_PLAYER [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ]
+ SID_GALLERY_FORMATS [ ExecMethod = ExecGallery; ]
+ SID_GALLERY [ ExecMethod = ExecChildWin; ]
+ SID_AVMEDIA_PLAYER [ ExecMethod = ExecChildWin; ]
SID_DRAW_NOTEEDIT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ]
SID_OBJECTRESIZE [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 8576e66..49bd602 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -270,7 +270,6 @@ void ScDLL::Init()
SvxHlinkDlgWrapper ::RegisterChildWindow(false, pMod);
SvxFontWorkChildWindow ::RegisterChildWindow(false, pMod);
SvxIMapDlgChildWindow ::RegisterChildWindow(false, pMod);
- GalleryChildWindow ::RegisterChildWindow(false, pMod);
ScSpellDialogChildWindow ::RegisterChildWindow(false, pMod);
ScValidityRefChildWin::RegisterChildWindow(false, pMod);
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 548c6ae..d29222f 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -272,11 +272,9 @@ public:
void ExecDrawIns(SfxRequest& rReq);
void GetDrawState(SfxItemSet &rSet);
void GetDrawInsState(SfxItemSet &rSet);
- void ExecGallery(SfxRequest& rReq); // StarGallery
- void GetGalleryState(SfxItemSet& rSet);
+ void ExecGallery(SfxRequest& rReq);
void ExecChildWin(SfxRequest& rReq);
- void GetChildWinState( SfxItemSet& rSet );
void ExecImageMap( SfxRequest& rReq );
void GetImageMapState( SfxItemSet& rSet );
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 7d6e1bf..8f32483 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -83,7 +83,6 @@ void ScTabViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(ScSimpleRefDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SID_HYPERLINK_DIALOG);
- GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScSpellDialogChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScValidityRefChildWin::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(sc::SearchResultsDlgWrapper::GetChildWindowId());
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 6283fd7..a7d7e49 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -26,6 +26,7 @@
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
#include <svl/whiter.hxx>
#include "imapwrap.hxx"
@@ -48,24 +49,17 @@ void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
{
case SID_GALLERY:
{
- SfxViewFrame* pThisFrame = GetViewFrame();
- pThisFrame->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() );
- pThisFrame->GetBindings().Invalidate( SID_GALLERY );
- rReq.Ignore();
+ // First make sure that the sidebar is visible
+ GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ "GalleryPanel",
+ GetViewFrame()->GetFrame().GetFrameInterface());
}
break;
}
}
-void ScTabViewShell::GetChildWinState( SfxItemSet& rSet )
-{
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) )
- {
- sal_uInt16 nId = GalleryChildWindow::GetChildWindowId();
- rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) );
- }
-}
-
void ScTabViewShell::ExecGallery( SfxRequest& rReq )
{
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -94,10 +88,6 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
}
}
-void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ )
-{
-}
-
OUString ScTabViewShell::GetDescription() const
{
return OUString(" ** Test ** ");
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index f8119e9..999bb69 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1777,12 +1777,10 @@ interface DrawView
SID_GALLERY // ole : yes, status : ?
[
ExecMethod = FuTemporary ;
- StateMethod = GetMenuState ;
]
SID_GALLERY_FORMATS // ole : no, status : ?
[
ExecMethod = ExecGallery ;
- StateMethod = GetGalleryState ;
GroupId = GID_DOCUMENT ;
Cachable ;
]
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 69ec0aa..42c3d78 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -199,7 +199,6 @@ void SdDLL::RegisterControllers()
SvxColorChildWindow::RegisterChildWindow(false, pMod, SFX_CHILDWIN_TASK);
SvxSearchDialogWrapper::RegisterChildWindow(false, pMod);
SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod);
- GalleryChildWindow::RegisterChildWindow(false, pMod);
SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod);
::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod);
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 37c2ec3..15add1d 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -211,7 +211,6 @@ public:
void AssignFrom3DWindow();
void ExecGallery(SfxRequest& rReq);
- void GetGalleryState(SfxItemSet& rSet);
void ExecBmpMask( SfxRequest& rReq );
void GetBmpMaskState( SfxItemSet& rSet );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 606f804..cdca559 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2484,7 +2484,6 @@ FncGetChildWindowId aShowChildren[] =
&SvxIMapDlgChildWindow::GetChildWindowId,
&SvxHlinkDlgWrapper::GetChildWindowId,
&SfxTemplateDialogWrapper::GetChildWindowId,
- &GalleryChildWindow::GetChildWindowId,
&SfxInfoBarContainerChild::GetChildWindowId
};
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 657df96..54765d6 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -178,6 +178,7 @@
namespace {
const char CustomAnimationPanelId[] = "CustomAnimationPanel";
const char SlideTransitionPanelId[] = "SlideTransitionPanel";
+ const char GalleryPanelId[] = "GalleryPanel";
}
using namespace ::com::sun::star;
@@ -2721,16 +2722,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
break;
- case SID_GALLERY:
- {
- GetViewFrame()->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() );
- GetViewFrame()->GetBindings().Invalidate( SID_GALLERY );
-
- Cancel();
- rReq.Ignore ();
- }
- break;
-
case SID_NAVIGATOR:
{
if ( rReq.GetArgs() )
@@ -2746,6 +2737,30 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
break;
+ case SID_SLIDE_TRANSITIONS_PANEL:
+ case SID_CUSTOM_ANIMATION_PANEL:
+ case SID_GALLERY:
+ {
+ // First make sure that the sidebar is visible
+ GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+
+ OUString panelId;
+ if (nSId == SID_CUSTOM_ANIMATION_PANEL)
+ panelId = CustomAnimationPanelId;
+ else if (nSId == SID_GALLERY)
+ panelId = GalleryPanelId;
+ else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
+ panelId = SlideTransitionPanelId;
+
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ panelId,
+ GetViewFrame()->GetFrame().GetFrameInterface());
+
+ Cancel();
+ rReq.Done();
+ }
+ break;
+
case SID_ANIMATION_OBJECTS:
{
if ( rReq.GetArgs() )
@@ -2763,30 +2778,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
break;
- case SID_CUSTOM_ANIMATION_PANEL:
- {
- // Make the slide transition panel visible in the sidebar.
- ::sfx2::sidebar::Sidebar::ShowPanel(
- CustomAnimationPanelId,
- GetViewFrame()->GetFrame().GetFrameInterface());
-
- Cancel();
- rReq.Done ();
- }
- break;
-
- case SID_SLIDE_TRANSITIONS_PANEL:
- {
- // Make the slide transition panel visible in the sidebar.
- ::sfx2::sidebar::Sidebar::ShowPanel(
- SlideTransitionPanelId,
- GetViewFrame()->GetFrame().GetFrameInterface());
-
- Cancel();
- rReq.Done ();
- }
- break;
-
case SID_3D_WIN:
{
if ( rReq.GetArgs() )
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 19e1413..093be5c 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -244,11 +244,6 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_BMPMASK, GetViewFrame()->HasChildWindow( nId ) ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) )
- {
- sal_uInt16 nId = GalleryChildWindow::GetChildWindowId();
- rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) );
- }
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_IMAP ) )
{
sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 1191268..027cf54 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -181,10 +181,6 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
GetDocSh()->SetWaitCursor( false );
}
-void DrawViewShell::GetGalleryState(SfxItemSet& )
-{
-}
-
/**
* Edit macros for attribute configuration
*/
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 3df8820..ea7c9d2 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -76,7 +76,6 @@ void DrawViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(AnimationChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId());
- GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
@@ -102,7 +101,6 @@ void GraphicViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId());
- GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 23a905a..5e5da76 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.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:FormatLine" toolbar:helpid="10143"/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 8c4ca8e..8b8af1f 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -46,7 +46,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
<toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:helpid="10096"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index 0c35032..afdf921 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -47,7 +47,6 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index a371876..c57e61d 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/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/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 162acea..2551643 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.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:FormatLine" toolbar:helpid="10143"/>
<toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index e8e5483..ce6a42f 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -49,9 +49,6 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:style="dropdown"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
<toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml
index 05a9c7d..2e08ab4 100644
--- a/sd/uiconfig/simpress/toolbar/toolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/toolbar.xml
@@ -47,7 +47,6 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml
index 5fa4ee3..b51a741 100644
--- a/sd/uiconfig/simpress/toolbar/viewerbar.xml
+++ b/sd/uiconfig/simpress/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:toolbarseparator/>
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index ae90345..f93502f 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -37,13 +37,11 @@ void Sidebar::ShowPanel (
{
// This should be a lot more sophisticated:
// - Make the deck switching asynchronous
- // - Make sure that the panel is visible and expanded after
- // the switch.
// - Make sure to use a context that really shows the panel
// All that is not necessary for the current use cases so lets
// keep it simple for the time being.
- pController->RequestSwitchToDeck(pPanelDescriptor->msDeckId);
+ pController->OpenThenSwitchToDeck(pPanelDescriptor->msDeckId);
}
}
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 88885bb..10b254f 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4885,7 +4885,7 @@ SfxBoolItem AutoColorInvalid SID_ATTR_AUTO_COLOR_INVALID
]
-SfxBoolItem Gallery SID_GALLERY
+SfxVoidItem Gallery SID_GALLERY
[
/* flags: */
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index bb5c7fb..7bec886 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -34,24 +34,6 @@
#include <boost/bind.hpp>
-GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
- SfxChildWindow( _pParent, nId )
-{
-
- pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RES( RID_SVXDLG_GALLERYBROWSER ) );
- eChildAlignment = SFX_ALIGN_TOP;
- ( (GalleryBrowser*) pWindow )->Initialize( pInfo );
-};
-
-GalleryChildWindow::~GalleryChildWindow()
-{
-}
-
-SFX_IMPL_DOCKINGWINDOW_WITHID( GalleryChildWindow, SID_GALLERY )
-
-// - GalleryBrowser -
-
-
GalleryBrowser::GalleryBrowser(
SfxBindings* _pBindings,
SfxChildWindow* pCW,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5124dc1..4c2e985 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -57,6 +57,7 @@
#include <svx/svxitems.hrc>
#include "helpid.hrc"
#include <sfx2/htmlmode.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
#include <svx/xtable.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
@@ -363,15 +364,9 @@ void SvxStyleBox_Impl::Select()
{
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
DBG_ASSERT( pViewFrm, "SvxStyleBox_Impl::Select(): no viewframe" );
- pViewFrm->ShowChildWindow( SID_STYLE_DESIGNER );
- SfxChildWindow* pChildWin = pViewFrm->GetChildWindow( SID_STYLE_DESIGNER );
- if ( pChildWin && pChildWin->GetWindow() )
- {
- static_cast< SfxTemplateDialogWrapper* >( pChildWin )->SetParagraphFamily();
- static_cast< SfxDockingWindow* >( pChildWin->GetWindow() )->AutoShow( true );
- Application::PostUserEvent(
- STATIC_LINK( 0, SvxStyleBox_Impl, FocusHdl_Impl ), pChildWin->GetWindow() );
- }
+ pViewFrm->ShowChildWindow( SID_SIDEBAR );
+ ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel",
+ pViewFrm->GetFrame().GetFrameInterface());
bDoIt = false;
}
}
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 40ec958..357894c 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 acc4d05..ed8f68e 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 4864bde..15d7c9b 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 5b5c97f..3d745c6 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 0148ffd..6d48aa9 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 e3379f8..a53f25b 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 738fdd5..2e97c66 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 a371876..c57e61d 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 77bba2c..1fd6af2 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 7acfa37..757ae2e 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 a371876..c57e61d 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 e3379f8..a53f25b 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 738fdd5..2e97c66 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 a371876..c57e61d 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 e3379f8..a53f25b 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 738fdd5..2e97c66 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 a371876..c57e61d 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 d78bb4f..4eed6fb 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 738fdd5..2e97c66 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 a371876..c57e61d 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 57df68b..28f3769 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 738fdd5..2e97c66 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 a371876..c57e61d 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>
More information about the Libreoffice-commits
mailing list