summaryrefslogtreecommitdiff
path: root/sfx2/source/view/viewfrm.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2020-01-06 18:57:59 +0000
committerMichael Meeks <michael.meeks@collabora.com>2020-01-06 22:45:12 +0100
commitb8669df1622f699357478aad7c6a4439b5d5aee3 (patch)
treee75fbbbefb787de0d45a69085c5bf29f2ea909c5 /sfx2/source/view/viewfrm.cxx
parent4056b70e6339102374898fff26f099da455475b1 (diff)
Revert "sfx2: sidebar: new .uno commands to show and hide sidebars"
This reverts commit b6f4d3b92789e972d9b079a5561723f3e73e07a6. These are now handled as LOK pseudo-uno commands internally, and seem unlikely to have worked. Retains a small change to SidebarDockingWindow.. Change-Id: I861f46f0c9b5cf39a5aa0a0de0fc2f33de800cb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86293 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sfx2/source/view/viewfrm.cxx')
-rw-r--r--sfx2/source/view/viewfrm.cxx19
1 files changed, 4 insertions, 15 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3e36ab14081b..e7f0bbd1c3a4 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3221,28 +3221,17 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
else if ( KnowsChildWindow(nSID) )
rState.Put( SfxBoolItem( nSID, HasChildWindow(nSID) ) );
}
- else if ( nSID == SID_SIDEBAR || nSID == SID_SHOW_SIDEBAR || nSID == SID_HIDE_SIDEBAR )
+ else if ( nSID == SID_SIDEBAR )
{
- if ( !KnowsChildWindow( SID_SIDEBAR ) )
+ if ( !KnowsChildWindow( nSID ) )
{
SAL_WARN("sfx.view", "SID_SIDEBAR state requested, but no task pane child window exists for this ID!");
- rState.DisableItem( SID_SIDEBAR );
+ rState.DisableItem( nSID );
}
- else if ( nSID == SID_SIDEBAR )
+ else
{
- // Toggle.
rState.Put( SfxBoolItem( nSID, HasChildWindow( nSID ) ) );
}
- else if ( nSID == SID_SHOW_SIDEBAR )
- {
- // Show.
- rState.Put( SfxBoolItem( nSID, false ) );
- }
- else if ( nSID == SID_HIDE_SIDEBAR )
- {
- // Hide.
- rState.Put( SfxBoolItem( nSID, true ) );
- }
}
else if ( KnowsChildWindow(nSID) )
rState.Put( SfxBoolItem( nSID, HasChildWindow(nSID) ) );