[Libreoffice-commits] core.git: desktop/source include/sfx2 include/svx sfx2/sdi sfx2/source
Michael Meeks (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 6 21:45:49 UTC 2020
desktop/source/lib/init.cxx | 12 +++++-----
include/sfx2/sfxsids.hrc | 2 -
include/svx/svxids.hrc | 5 ----
sfx2/sdi/frmslots.sdi | 10 --------
sfx2/sdi/sfx.sdi | 36 ------------------------------
sfx2/source/sidebar/SidebarController.cxx | 2 -
sfx2/source/view/viewfrm.cxx | 19 +++------------
7 files changed, 12 insertions(+), 74 deletions(-)
New commits:
commit b8669df1622f699357478aad7c6a4439b5d5aee3
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon Jan 6 18:57:59 2020 +0000
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Jan 6 22:45:12 2020 +0100
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 at collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dcbc466ce4b4..a12857371858 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3527,12 +3527,12 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
}
else if (aMap.find("id") != aMap.end())
{
- static const OUString sClickAction("CLICK");
- static const OUString sSelectAction("SELECT");
- static const OUString sClearAction("CLEAR");
- static const OUString sTypeAction("TYPE");
- static const OUString sUpAction("UP");
- static const OUString sDownAction("DOWN");
+ const OUString sClickAction("CLICK");
+ const OUString sSelectAction("SELECT");
+ const OUString sClearAction("CLEAR");
+ const OUString sTypeAction("TYPE");
+ const OUString sUpAction("UP");
+ const OUString sDownAction("DOWN");
try
{
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 69b68db67fbc..63d5ce036c63 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -575,8 +575,6 @@ class SvxSearchItem;
#define SID_TABLE_BORDER_TYPE (SID_SVX_START + 1065)
#define SID_TABLE_BORDER_INDEX (SID_SVX_START + 1066)
#define SID_TABLE_BORDER_OFFSET (SID_SVX_START + 1067)
-#define SID_SHOW_SIDEBAR (SID_SVX_START + 1200)
-#define SID_HIDE_SIDEBAR (SID_SVX_START + 1201)
#define FID_SVX_START (SID_LIB_START + 500)
#define FID_SEARCH_NOW (FID_SVX_START + 2)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 09fa766fbb5b..f12a326d0d2a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -999,11 +999,8 @@ class SvxSetItem;
#define SID_ULINE_VAL_DOUBLE (SID_SVX_START + 1197) /* double underline */
#define SID_ULINE_VAL_DOTTED (SID_SVX_START + 1198) /* dotted underline */
-// #define SID_SHOW_SIDEBAR ( SID_SVX_START + 1200 ) -> sfxsids.hrc
-// #define SID_HIDE_SIDEBAR ( SID_SVX_START + 1201 ) -> sfxsids.hrc
-
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE ( SID_HIDE_SIDEBAR + 1 )
+#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1198 + 1 )
// Overflow check for slot IDs
#if SID_SVX_FIRSTFREE > SID_SVX_END
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) ) );
More information about the Libreoffice-commits
mailing list