diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-08 14:05:14 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-09 10:49:53 +0200 |
| commit | dc5ede6280b6d66e5bfe4cafe6bb7c12d4173233 (patch) | |
| tree | a10841dc3dd37d554b3dc4726a3f617503ece13d /sw | |
| parent | facee193fae2fdcdcf4910475a5b19d5bad79b72 (diff) | |
jsdialog: sidebar: avoid duplicated widget ids
all controls for sidebar goes to the same window id
we need different names for every widget so
create valuesets with different name every time
Change-Id: I69074e607bfe5fa6db665c0dbcae1f029d13a161
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116836
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.cxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/pagesizecontrol.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 7fa49f4f75c3..09d35753ac84 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -75,7 +75,7 @@ PageSizeControl::PageSizeControl(PageSizePopup* pControl, weld::Widget* pParent) , mxMoreButton(m_xBuilder->weld_button("moreoptions")) , mxWidthHeightField(m_xBuilder->weld_metric_spin_button("metric", FieldUnit::CM)) , mxSizeValueSet(new svx::sidebar::ValueSetWithTextControl) - , mxSizeValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxSizeValueSet)) + , mxSizeValueSetWin(new weld::CustomWeld(*m_xBuilder, "pagesizevalueset", *mxSizeValueSet)) , mxControl(pControl) , maPaperList() { diff --git a/sw/uiconfig/swriter/ui/pagesizecontrol.ui b/sw/uiconfig/swriter/ui/pagesizecontrol.ui index 4de5be79a228..f9c8258b1733 100644 --- a/sw/uiconfig/swriter/ui/pagesizecontrol.ui +++ b/sw/uiconfig/swriter/ui/pagesizecontrol.ui @@ -45,7 +45,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkDrawingArea" id="valueset"> + <object class="GtkDrawingArea" id="pagesizevalueset"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> |