svx/source/sidebar/text/TextPropertyPanel.cxx | 11 +++++++++++
svx/uiconfig/ui/sidebartextpanel.ui | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit cd93a2e61f6f66dd6a0753c6f5a3e426a957fa71
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Wed Nov 6 19:58:18 2019 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Nov 6 22:04:01 2019 +0100
lok: disable text spacing for now.
Change-Id: I87229ab2bc1b72987d43ce685a03627111951ce3
Reviewed-on: https://gerrit.libreoffice.org/82174
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 3518e0368a4b..eae6f95aa366 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -21,6 +21,8 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <vcl/toolbox.hxx>
+#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
using namespace css;
@@ -44,6 +46,15 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent,
const css::uno::Ref
get(mpToolBoxFontColorSw, "colorbar_writer");
get(mpToolBoxFontColor, "colorbar_others");
get(mpToolBoxBackgroundColor, "colorbar_background");
+
+ bool isMobile = false;
+ if (comphelper::LibreOfficeKit::isActive() &&
+ comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+ isMobile = true;
+ VclPtr<ToolBox> xSpacingBar;
+ get(xSpacingBar, "spacingbar");
+ xSpacingBar->Show(!isMobile);
+ xSpacingBar->ShowItem(0, !isMobile);
}
TextPropertyPanel::~TextPropertyPanel()
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui
b/svx/uiconfig/ui/sidebartextpanel.ui
index 8fbbc18b8fb0..c2c995490525 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -332,7 +332,7 @@
</child>
<child>
<object class="sfxlo-SidebarToolBox" id="spacingbar">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<child>
<object class="GtkToolButton" id="spacing">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
