configure.ac | 2 +-
sw/source/ui/chrdlg/pardlg.cxx | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 3338fc3f8cf5ae7ef7fd5629c30ac31a9f13b0e7
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Thu Aug 4 20:57:00 2022 +0200
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Aug 4 20:57:00 2022 +0200
Bump version to 7.2.7.2.M5
Change-Id: Id6a0a28eb176b57824186244c3f1037c110be98e
diff --git a/configure.ac b/configure.ac
index 916318f9c232..53c0c40b359c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[7.2.7.2.M4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M5],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 14ab83f9c696e894a603e300070e2f077951cb69
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Wed Aug 3 14:07:47 2022 +0530
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Aug 4 20:55:42 2022 +0200
removed unused variables
use of these variables was removed in
3f97c911aa91c3bdfbae05fd5646b55987691e42
Signed-off-by: Pranam Lashkari <lpra...@collabora.com>
Change-Id: Ia8fee6e9fc7443438c84155caf9c6d826c2c5b51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137739
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index a4c2e8b0ab78..67844d225ca2 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -96,8 +96,6 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
else
RemoveTabPage("labelTP_PARA_ASIAN");
- const sal_uInt16 nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
- bool bLRValid = SfxItemState::DEFAULT <= rCoreSet.GetItemState(nWhich);
if(bHtmlMode)
RemoveTabPage("labelTP_TABULATOR");
else
commit 08728aca897269db1adecff9baba3ef5230a0073
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Wed Aug 3 00:20:43 2022 +0530
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Aug 4 20:55:31 2022 +0200
show "tabs" tab in paragraph setting even when para has different settings
Signed-off-by: Pranam Lashkari <lpra...@collabora.com>
Change-Id: Ida61e8878382988a7470d156ded187d21bcc9d91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137707
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 44b57bd86231..a4c2e8b0ab78 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -98,7 +98,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
const sal_uInt16 nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
bool bLRValid = SfxItemState::DEFAULT <= rCoreSet.GetItemState(nWhich);
- if(bHtmlMode || !bLRValid)
+ if(bHtmlMode)
RemoveTabPage("labelTP_TABULATOR");
else
{
