summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-11-06 19:58:18 +0000
committerMichael Meeks <michael.meeks@collabora.com>2019-11-07 12:15:27 +0100
commite194b4e209277ed5beeacf8ea875daa8688ab394 (patch)
treeefbc08119dbc06abde8b7c2dbe7ab0f912fab34e /svx
parent48e79e529057b881805d0e5cc5e0dae07f530a0a (diff)
lok: disable text spacing for now.
Change-Id: I87229ab2bc1b72987d43ce685a03627111951ce3 Reviewed-on: https://gerrit.libreoffice.org/82178 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx11
-rw-r--r--svx/uiconfig/ui/sidebartextpanel.ui2
2 files changed, 12 insertions, 1 deletions
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">