sfx2/source/dialog/templdlg.cxx | 7 +++++++
sfx2/source/sidebar/ResourceManager.cxx | 2 +-
sfx2/uiconfig/ui/templatepanel.ui | 7 ++++---
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit b4d1dff8835a2c52f2adf767596a367695a9e1a5
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Oct 25 15:48:58 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Jan 3 10:03:06 2025 +0100
jsdialog: enable style sidebar
- disable not supported previews field, action menu for now
Change-Id: Ife94ee96dd15bd92752ff6e9cc5e68243aac0851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175646
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179625
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Jenkins
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 6acd68b51675..b26123129f88 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -34,6 +34,7 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <comphelper/diagnose_ex.hxx>
+#include <comphelper/lok.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
@@ -255,6 +256,8 @@
SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(SfxBindings* pB, weld
{
mxFilterLb->set_help_id(HID_TEMPLATE_FILTER);
mxPreviewCheckbox->set_active(officecfg::Office::Common::StylesAndFormatting::Preview::get());
+ if (comphelper::LibreOfficeKit::isActive())
+ mxPreviewCheckbox->hide();
}
void SfxTemplateDialog_Impl::EnableEdit(bool bEnable, StyleList* rStyleList)
@@ -812,6 +815,10 @@
SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel
m_xToolMenu->connect_activate(LINK(this, SfxTemplateDialog_Impl,
ToolMenuSelectHdl));
m_xActionTbR->set_item_help_id(u"update"_ustr,
HID_TEMPLDLG_UPDATEBYEXAMPLE);
+ // Features not working in LOK yet
+ if (comphelper::LibreOfficeKit::isActive())
+ m_xActionTbR->hide();
+
Initialize();
}
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index cf333c1b0a8f..f64bf4fae805 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -264,7 +264,7 @@ void ResourceManager::ReadDeckList()
if (comphelper::LibreOfficeKit::isActive())
{
// Hide these decks in LOK as they aren't fully functional.
- if (aDeckName == "GalleryDeck" || aDeckName == "StyleListDeck")
+ if (aDeckName == "GalleryDeck")
continue;
}
diff --git a/sfx2/uiconfig/ui/templatepanel.ui
b/sfx2/uiconfig/ui/templatepanel.ui
index fca889705756..19528fc78075 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -301,7 +301,7 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="settings">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
@@ -345,9 +345,10 @@
</child>
</object>
<packing>
+ <property name="homogeneous">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -363,7 +364,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
