cui/source/inc/border.hxx | 1 +
cui/source/tabpages/border.cxx | 7 +++++++
cui/uiconfig/ui/borderpage.ui | 4 +++-
lotuswordpro/source/filter/lwppagelayout.cxx | 7 +++++++
translations | 2 +-
5 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit fc5856263439846c9e692e1ccaddf3312530b1a2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 27 17:19:35 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 27 20:25:04 2021 +0200
lock the combobox + spinbutton group width to its original all-shown width
so the notebook page contents don't jump around when the spinbox is
hidden/shown
Change-Id: Ib6ad47644b55d857dae972340444d7bac67278e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122724
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 2a3d14ed5062..433ab7425e5c 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -129,6 +129,7 @@ private:
std::unique_ptr<SvtLineListBox> m_xLbLineStyle;
std::unique_ptr<ColorListBox> m_xLbLineColor;
+ std::unique_ptr<weld::Widget> m_xLineWidthGroup;
std::unique_ptr<weld::ComboBox> m_xLineWidthLB;
std::unique_ptr<weld::MetricSpinButton> m_xLineWidthMF;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 70ec64c1a3bc..59ecc1cfd2ee 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -294,6 +294,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage,
weld::DialogControlle
, m_xLbLineStyle(new
SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
, m_xLbLineColor(new
ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"),
[this]{ return GetDialogController()->getDialog(); }))
+ , m_xLineWidthGroup(m_xBuilder->weld_widget("gridlinewidth"))
, m_xLineWidthLB(m_xBuilder->weld_combo_box("linewidthlb"))
, m_xLineWidthMF(m_xBuilder->weld_metric_spin_button("linewidthmf",
FieldUnit::POINT))
, m_xSpacingFrame(m_xBuilder->weld_container("spacing"))
@@ -524,6 +525,12 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage,
weld::DialogControlle
m_xWndPresets->SetSelectHdl( LINK( this, SvxBorderTabPage, SelPreHdl_Impl
) );
m_xWndShadows->SetSelectHdl( LINK( this, SvxBorderTabPage, SelSdwHdl_Impl
) );
+ // lock the group to its original width where both widgets are shown so the
+ // notebook page contents don't jump around when the spinbox is
+ // hidden/shown
+ Size aOrigGroupSize(m_xLineWidthGroup->get_preferred_size());
+ m_xLineWidthGroup->set_size_request(aOrigGroupSize.Width(), -1);
+
FillValueSets();
FillLineListBox_Impl();
commit c156fc0b844d6d7e31dc5b6a5e12ef71d8f631c8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 27 16:27:34 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 27 20:24:44 2021 +0200
border page combobox defaults to taking up a lot of space
Change-Id: I29d7debcd39a23b224c8c4660a7edf2f1e9e4a90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122723
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 2847f0b736cb..d748cd1ca395 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -251,17 +251,20 @@
</packing>
</child>
<child>
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="gridlinewidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">6</property>
+ <property name="halign">start</property>
<property name="margin-start">0</property>
<property name="margin-top">0</property>
<child>
<object class="GtkComboBoxText" id="linewidthlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">False</property>
<items>
<item translatable="yes"
context="borderpage|linewidthlb">Thin</item>
<item translatable="yes"
context="borderpage|linewidthlb">Medium</item>
@@ -277,7 +280,6 @@
<object class="GtkSpinButton" id="linewidthmf">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">start</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
commit 1010c16c5f4c582adfa9d24036e9f98137e5ede7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 27 17:25:13 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 27 20:23:59 2021 +0200
ofz#39374: avoid infinite loop
Change-Id: I0aec664279dea99df865761f34f64aa4fa3d9e0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122725
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx
b/lotuswordpro/source/filter/lwppagelayout.cxx
index cc8d6b274360..0a72db8f7d30 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -74,6 +74,7 @@
#include <lwpchangemgr.hxx>
#include <lwpfilehdr.hxx>
#include <lwpglobalmgr.hxx>
+#include <o3tl/sorted_vector.hxx>
#include <sal/log.hxx>
#include <vcl/print.hxx>
@@ -548,8 +549,11 @@ LwpPageLayout* LwpPageLayout::GetOddChildLayout()
{
rtl::Reference<LwpVirtualLayout> xLay(
dynamic_cast<LwpVirtualLayout*>(GetChildHead().obj().get()));
+ o3tl::sorted_vector<LwpVirtualLayout*> aSeen;
while (xLay.is())
{
+ aSeen.insert(xLay.get());
+
if (xLay->GetLayoutType() == LWP_PAGE_LAYOUT)
{
LwpPageLayout* pPageLayout =
static_cast<LwpPageLayout*>(xLay.get());
@@ -560,6 +564,9 @@ LwpPageLayout* LwpPageLayout::GetOddChildLayout()
}
}
xLay.set(dynamic_cast<LwpVirtualLayout*>(xLay->GetNext().obj().get()));
+
+ if (aSeen.find(xLay.get()) != aSeen.end())
+ throw std::runtime_error("loop in conversion");
}
}
return nullptr;
commit 10c8bd1ed8fbc4cf387803fcb9b70dcfe776b4ab
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Sep 27 20:04:15 2021 +0200
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Mon Sep 27 20:04:15 2021 +0200
Update git submodules
* Update translations from branch 'master'
to 0cb98568b1070b0178a398e2befd36808364e37e
- update translations for master
and force-fix errors using pocheck
Change-Id: Ib11aec7e448b083f697b9705d29795cd2e5a55f0
- update translations for master
and foce-fix errors using pocheck
Change-Id: I12d26e666d46993fd4ff26616c09be9e5bf82fcd
diff --git a/translations b/translations
index 4460c7babd57..0cb98568b107 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4460c7babd574c5040a528d10fe51001c27680bc
+Subproject commit 0cb98568b1070b0178a398e2befd36808364e37e
