core.git: include/svx sc/source solenv/sanitizers svx/source svx/uiconfig sw/source
include/svx/ctredlin.hxx | 17 ++-
sc/source/ui/miscdlgs/conflictsdlg.cxx |3 -
solenv/sanitizers/ui/svx.suppr |1
svx/source/dialog/ctredlin.cxx | 22 -
svx/uiconfig/ui/redlineviewpage.ui | 75 ++---
sw/source/uibase/inc/redlndlg.hxx |2
sw/source/uibase/misc/redlndlg.cxx | 22 +
7 files changed, 123 insertions(+), 19 deletions(-)
New commits:
commit 2c46d3c2ff6bbdcd387771f823aa5b3b812c80a8
Author: Jim Raykowski
AuthorDate: Thu Jul 11 17:06:50 2024 -0800
Commit: Jim Raykowski
CommitDate: Sun Jul 14 05:31:46 2024 +0200
tdf#161811 Changes in TC manager dialog should be in order of
appearance in document
Adds a drop down control to the Writer Manage Changes dialog/sidebar
panel that can be used to select how the changes list is sorted.
Change-Id: I9602322ec61ae6e15a08fbc26aa69de1b64294e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170390
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index f852a4886bd7..c098efa6a11b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -83,6 +83,8 @@ private:
std::unique_ptr xCalcTreeView;
weld::TreeView* pTreeView;
+weld::ComboBox* m_pSortByComboBox;
+
sal_uInt16 nDatePos;
boolbAuthor;
boolbDate;
@@ -100,7 +102,8 @@ private:
public:
SvxRedlinTable(std::unique_ptr xWriterControl,
- std::unique_ptr xCalcControl);
+ std::unique_ptr xCalcControl,
+ weld::ComboBox* pSortByControl);
weld::TreeView& GetWidget() { return *pTreeView; }
bool IsSorted() const { return bSorted; }
@@ -256,13 +259,14 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPView final : public SvxTPage
{
private:
-
Link AcceptClickLk;
Link AcceptAllClickLk;
Link RejectClickLk;
Link RejectAllClickLk;
Link UndoClickLk;
+Link SortByComboBoxChangedLk;
+
bool bEnableAccept;
bool bEnableAcceptAll;
bool bEnableReject;
@@ -277,9 +281,11 @@ private:
std::unique_ptr m_xAcceptAll;
std::unique_ptr m_xRejectAll;
std::unique_ptr m_xUndo;
+std::unique_ptr m_xSortByComboBox;
std::unique_ptr m_xViewData;
DECL_DLLPRIVATE_LINK( PbClickHdl, weld::Button&, void );
+DECL_DLLPRIVATE_LINK(SortByComboBoxChangedHdl, weld::ComboBox&, void);
public:
SvxTPView(weld::Container* pParent);
@@ -287,6 +293,8 @@ public:
SvxRedlinTable* GetTableControl() { return m_xViewData.get(); }
+weld::ComboBox* GetSortByComboBoxControl() { return
m_xSortByComboBox.get(); }
+
voidEnableAccept(bool bFlag);
voidEnableAcceptAll(bool bFlag);
voidEnableReject(bool bFlag);
@@ -307,6 +315,11 @@ public:
voidSetUndoClickHdl( const Link& rLink ) {
UndoClickLk = rLink; }
+void SetSortByComboBoxChangedHdl(const Link& rLink)
+{
+SortByComboBoxChangedLk = rLink;
+}
+
virtual voidActivatePage() override;
voidDeactivatePage();
};
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx
b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index a70cff4641b0..6e20e04e0414 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -334,7 +334,8 @@ ScConflictsDlg::ScConflictsDlg(weld::Window* pParent,
ScViewData* pViewData, ScD
, m_xBtnKeepOther(m_xBuilder->weld_button(u"keepother"_ustr))
, m_xBtnKeepAllMine(m_xBuilder->weld_button(u"keepallmine"_ustr))
, m_xBtnKeepAllOthers(m_xBuilder->weld_button(u"keepallothers"_ustr))
-, m_xLbConflicts(new
SvxRedlinTable(m_xBuilder->weld_tree_view(u"container"_ustr), nullptr))
+, m_xLbConflicts(new
SvxRedlinTable(m_xBuilder->weld_tree_view(u"container"_ustr), nullptr,
+nullptr))
{
OSL_ENSURE( mpViewData, "ScConflictsDlg CTOR: mpViewData is null!" );
mpOwnDoc = ( mpViewData ? >GetDocument() : nullptr );
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 0c952e5dc460..5f2d0d8a8bc6 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -72,6 +72,7 @@
svx/uiconfig/ui/redlinefilterpage.ui://GtkComboBoxText[@id='authorlist'] missing
svx/uiconfig/ui/redlinefilterpage.ui://GtkEntry[@id='rangeedit']
missing-label-for
svx/uiconfig/ui/redlinefilterpage.ui://GtkComboBoxText[@id='datecond']
missing-label-for
svx/uiconfig/ui/redlinefilterpage.ui://GtkLabel[@id='and'] orphan-label
+svx/uiconfig/ui/redlineviewpage.ui://GtkLabel[@id='sortbylabel'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label1'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label3'] orphan-label
core.git: include/svx sc/source solenv/sanitizers
include/svx/strings.hrc |2 +-
sc/source/ui/sidebar/CellBorderStyleControl.cxx |1 -
solenv/sanitizers/ui/modules/scalc.suppr|3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e5c55b2cfc47dcc5b711811fedc75ee982e3d46e
Author: Kira Tubo
AuthorDate: Thu Jun 20 16:01:24 2024 -0700
Commit: Michael Weghorn
CommitDate: Fri Jun 21 07:40:37 2024 +0200
tdf#146468: Fix typo and move comments
Fix typo on variable RID_SVXSTR_TABLE_PRESET_OUTER and move comments
about consolidating border tooltip strings to
solenv/sanitizers/ui/modules/scalc.suppr
See comments on Gerrit for more information:
https://gerrit.libreoffice.org/c/core/+/169052
Change-Id: Ic5283e568e13023242858850dbce8922e2c80d8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169308
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index cf3c12e12a4e..8c61f7714e09 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,7 @@
// strings related to borders
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_OUTER", "Outer Border") // Sidebar/toolbar
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 12ac05d23794..f8e792ee183b 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -64,7 +64,6 @@ CellBorderStylePopup::~CellBorderStylePopup()
void CellBorderStylePopup::Initialize()
{
-// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
mxTBBorder1->connect_clicked ( LINK(this, CellBorderStylePopup,
TB1SelectHdl) );
mxTBBorder1->set_item_tooltip_text(0,
SvxResId(RID_SVXSTR_TABLE_PRESET_NONE));
mxTBBorder1->set_item_tooltip_text(1,
SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERALL));
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index 83df53230a57..e2e164de3b01 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -45,6 +45,8 @@
sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] orph
sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label
sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
+
+// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='none']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='all']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='outside']
button-no-label
@@ -61,6 +63,7 @@
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagup'] button
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagdown']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topbottom']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='leftright']
button-no-label
+
sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message']
orphan-label
sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM']
orphan-label
