diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/sdi/frmslots.sdi | 10 | ||||
| -rw-r--r-- | sfx2/sdi/sfx.sdi | 36 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 19 |
4 files changed, 5 insertions, 62 deletions
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi index 53a13b479a7c..09aafef95b7d 100644 --- a/sfx2/sdi/frmslots.sdi +++ b/sfx2/sdi/frmslots.sdi @@ -43,16 +43,6 @@ interface Window ExecMethod = ChildWindowExecute ; StateMethod = ChildWindowState ; ] - SID_SHOW_SIDEBAR // status(final|play) - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_HIDE_SIDEBAR // status(final|play) - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] SID_BROWSER // ole(no) api() [ ExecMethod = ChildWindowExecute ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index f95610d07f5c..624abe196661 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -2594,42 +2594,6 @@ SfxBoolItem Sidebar SID_SIDEBAR GroupId = SfxGroupId::View; ] -SfxBoolItem SidebarShow SID_SHOW_SIDEBAR -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::View; -] - -SfxBoolItem SidebarHide SID_HIDE_SIDEBAR -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::View; -] - SfxBoolItem Menubar SID_MENUBAR [ AutoUpdate = TRUE, diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 284290653e8f..9c20a8232269 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1231,7 +1231,7 @@ void SidebarController::RequestCloseDeck() // Mobile. std::stringstream aStream; boost::property_tree::ptree aTree; - aTree.put("id", mpCurrentDeck->GetLOKWindowId()); + aTree.put("id", mpParentWindow->get_id()); // TODO could be missing - sort out aTree.put("type", "dockingwindow"); aTree.put("text", mpParentWindow->GetText()); aTree.put("enabled", false); 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) ) ); |