core.git: Changes to 'feature/allo_contract45533b'
New branch 'feature/allo_contract45533b' available with the following commits: commit 7a009518a564c0f99550391c137176d9464c10cb Author: Samuel Mehrbrodt Date: Thu Jan 12 16:47:40 2017 +0100 Disable CrashReportUI since we don't offer upload - only want the dumps Change-Id: I6d084757d83204cb960905d7eb78571b13f8f875 (cherry picked from commit 261862f000dce95013843d4a183ad09fe1639041) (cherry picked from commit 17113410c22c1dadce05b517507a6fc0891d95ee)
core.git: Branch 'distro/cib/libreoffice-6-4' - cui/source
cui/source/options/treeopt.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit c42fc32538d3c6f49ff8f5be6a6d627e6c4fed49
Author: Samuel Mehrbrodt
AuthorDate: Mon Aug 12 12:18:37 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Aug 15 10:52:13 2024 +0200
tdf#134791 Back to fixed size, but increase it a bit
Turns out the approach implemented in
058f1d1b5246a9d57942541bef144143b0302383
doesn't work out when a smaller tab page is activated at first,
since only the first tab page will define the dialog size.
Change-Id: I1201a0e9174c842d4c023e8438763d6d538d3036
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171755
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit ac73760cc545e69704ddbee59be84351f1c3fa13)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171776
Tested-by: allotropia jenkins
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5070662681c1..33fae2a27abd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -481,8 +481,9 @@ void OfaTreeOptionsDialog::InitWidgets()
xTreeLB = m_xBuilder->weld_tree_view("pages");
xTabBox = m_xBuilder->weld_container("box");
-xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
- xTreeLB->get_height_rows(30));
+Size aSize(xTreeLB->get_approximate_digit_width() * 100,
xTreeLB->get_height_rows(30));
+xTabBox->set_size_request(aSize.Width(), aSize.Height());
+xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
aSize.Height());
}
// Ctor() with Frame -
core.git: Branch 'distro/cib/libreoffice-6-4' - cui/source
cui/source/options/treeopt.cxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 6d74e80c30cc172ed4dcfe10713b99098d5e5feb
Author: Samuel Mehrbrodt
AuthorDate: Fri Aug 9 08:17:57 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Aug 15 08:49:33 2024 +0200
tdf#134791 Let options dialog determine its own size based on tab pages
Instead of forcing some random size on it, which leads to widgets being cut
off.
Change-Id: I4acd350b380988a2ae7bb091241daa985025b5ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171672
Reviewed-by: Samuel Mehrbrodt
Tested-by: allotropia jenkins
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c3005688e297..5070662681c1 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -480,13 +480,9 @@ void OfaTreeOptionsDialog::InitWidgets()
xBackPB = m_xBuilder->weld_button("revert");
xTreeLB = m_xBuilder->weld_tree_view("pages");
xTabBox = m_xBuilder->weld_container("box");
-Size aSize(xTreeLB->get_approximate_digit_width() * 82,
xTreeLB->get_height_rows(30));
-#if HAVE_FEATURE_GPGME
-// tdf#115015: make enough space for crypto settings (approx. 14 text
edits + padding)
-aSize.setHeight((Edit::GetMinimumEditSize().Height() + 6) * 14);
-#endif
-xTabBox->set_size_request(aSize.Width(), aSize.Height());
-xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 30,
aSize.Height());
+
+xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
+ xTreeLB->get_height_rows(30));
}
// Ctor() with Frame -
core.git: cui/source
cui/source/options/treeopt.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ac73760cc545e69704ddbee59be84351f1c3fa13
Author: Samuel Mehrbrodt
AuthorDate: Mon Aug 12 12:18:37 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Aug 15 08:49:04 2024 +0200
tdf#134791 Back to fixed size, but increase it a bit
Turns out the approach implemented in
058f1d1b5246a9d57942541bef144143b0302383
doesn't work out when a smaller tab page is activated at first,
since only the first tab page will define the dialog size.
Change-Id: I1201a0e9174c842d4c023e8438763d6d538d3036
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171755
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c7e909149330..d531e0a59d68 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -475,8 +475,9 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(weld::Window*
pParent, bool fromExten
, bNeedsRestart(false)
, eRestartReason(svtools::RESTART_REASON_NONE)
{
-xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
- xTreeLB->get_height_rows(30));
+Size aSize(xTreeLB->get_approximate_digit_width() * 100,
xTreeLB->get_height_rows(30));
+xTabBox->set_size_request(aSize.Width(), aSize.Height());
+xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
aSize.Height());
// Init tree and handler
xTreeLB->set_help_id(HID_OFADLG_TREELISTBOX);
core.git: Branch 'feature/cib_contract891c' - configure.ac
configure.ac | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 21eebb52fa63ac45c653ddf5ced310d01e1144ec Author: Samuel Mehrbrodt AuthorDate: Fri Sep 15 14:02:07 2017 +0200 Commit: Michael Stahl CommitDate: Tue Aug 13 10:53:18 2024 +0200 al.exe not found on Windows 10 with VS 2017 Change-Id: I091c0cb9a33d5b52dfb34e54515d6c283d6efb96 Reviewed-on: https://gerrit.libreoffice.org/42323 Tested-by: Jenkins Reviewed-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171810 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac index 9730413c0a5a..c77df4a8177f 100644 --- a/configure.ac +++ b/configure.ac @@ -5124,13 +5124,19 @@ find_al() fi done -# We need this additional check to detect 4.6.2 or above. -for ver in 4.7 4.6.2; do +# We need this additional check to detect 4.6.1 or above. +for ver in 4.7 4.6.2 4.6.1; do reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder" if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then altest=$regvalue return fi + +reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools" +if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then +altest=$regvalue +return +fi done }
core.git: cui/source
cui/source/options/treeopt.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 058f1d1b5246a9d57942541bef144143b0302383
Author: Samuel Mehrbrodt
AuthorDate: Fri Aug 9 08:17:57 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Aug 12 08:21:53 2024 +0200
tdf#134791 Let options dialog determine its own size based on tab pages
Instead of forcing some random size on it, which leads to widgets being cut
off.
Change-Id: I4acd350b380988a2ae7bb091241daa985025b5ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171662
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 27d3d8f243e8..c7e909149330 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -475,13 +475,8 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(weld::Window*
pParent, bool fromExten
, bNeedsRestart(false)
, eRestartReason(svtools::RESTART_REASON_NONE)
{
-Size aSize(xTreeLB->get_approximate_digit_width() * 82,
xTreeLB->get_height_rows(30));
-#if HAVE_FEATURE_GPGME
-// tdf#115015: make enough space for crypto settings (approx. 14 text
edits + padding)
-aSize.setHeight((weld::GetMinimumEditHeight() + 6) * 14);
-#endif
-xTabBox->set_size_request(aSize.Width(), aSize.Height());
-xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
aSize.Height());
+xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35,
+ xTreeLB->get_height_rows(30));
// Init tree and handler
xTreeLB->set_help_id(HID_OFADLG_TREELISTBOX);
core.git: Branch 'libreoffice-24-8-0' - xmlsecurity/source xmlsecurity/uiconfig
xmlsecurity/source/dialogs/certificatechooser.cxx | 17 +++--
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 36 -
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit 2a345ecd880fa009b58231a0cb958ed85c05610c
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 15 09:19:45 2024 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 30 07:31:01 2024 +0200
tdf#161871 Revert "Removed Type and Usage Columns from Certificate Chooser"
The commit broke the display of all columns except the first one in all
backends except gtk3.
Also it's not clear why those columns are deemed superfluous;
see discussion in tdf#161871
This reverts commit 9f327102c435887bbae650b3a573f44500b6f534.
Change-Id: Idc3496122137f98c23bb7df8e36b17281fc948d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170491
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit a19aa4754651e685ca07131bfa454c3360191269)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171192
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Thorsten Behrens
Reviewed-by: Xisco Fauli
Tested-by: Thorsten Behrens
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 0575ae758cfe..5b3d80291297 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -56,6 +56,14 @@ CertificateChooser::CertificateChooser(weld::Window*
_pParent,
auto nControlWidth = m_xCertLB->get_approximate_digit_width() * 105;
m_xCertLB->set_size_request(nControlWidth, m_xCertLB->get_height_rows(12));
+std::vector aWidths
+{
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(10*nControlWidth/100),
+o3tl::narrowing(20*nControlWidth/100)
+};
+m_xCertLB->set_column_fixed_widths(aWidths);
m_xCertLB->connect_changed( LINK( this, CertificateChooser,
CertificateHighlightHdl ) );
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser,
CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl
) );
@@ -221,7 +229,6 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
mvUserData.push_back(userData);
OUString sIssuer = xmlsec::GetContentPart( xCert->getIssuerName(),
xCert->getCertificateKind());
-OUString sExpDate = utl::GetDateString(xCert->getNotValidAfter());
// If we are searching and there is no match skip
if (mbSearch
@@ -232,11 +239,13 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
m_xCertLB->append();
int nRow = m_xCertLB->n_children() - 1;
-OUString sId(weld::toId(userData.get()));
-m_xCertLB->set_id(nRow, sId);
m_xCertLB->set_text(nRow,
xmlsec::GetContentPart(xCert->getSubjectName(), xCert->getCertificateKind()),
0);
m_xCertLB->set_text(nRow, sIssuer, 1);
-m_xCertLB->set_text(nRow, sExpDate, 2);
+m_xCertLB->set_text(nRow,
xmlsec::GetCertificateKind(xCert->getCertificateKind()), 2);
+m_xCertLB->set_text(nRow,
utl::GetDateString(xCert->getNotValidAfter()), 3);
+m_xCertLB->set_text(nRow,
UsageInClearText(xCert->getCertificateUsage()), 4);
+OUString sId(weld::toId(userData.get()));
+m_xCertLB->set_id(nRow, sId);
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index aae6bd44024f..c06ce07952d1 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -8,8 +8,12 @@
+
+
+
+
@@ -168,7 +172,7 @@
True
6
-Expiration date
+Type
True
2
@@ -179,6 +183,36 @@
+
+
+True
+6
+Expiration date
+True
+3
+
+
+
+3
+
+
+
+
+
+
+True
+6
+
core.git: Branch 'libreoffice-24-8' - xmlsecurity/source xmlsecurity/uiconfig
xmlsecurity/source/dialogs/certificatechooser.cxx | 17 +++--
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 36 -
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit 0b80db94d445434ab12002b9ba11c15f00accc19
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 15 09:19:45 2024 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 30 07:30:12 2024 +0200
tdf#161871 Revert "Removed Type and Usage Columns from Certificate Chooser"
The commit broke the display of all columns except the first one in all
backends except gtk3.
Also it's not clear why those columns are deemed superfluous;
see discussion in tdf#161871
This reverts commit 9f327102c435887bbae650b3a573f44500b6f534.
Change-Id: Idc3496122137f98c23bb7df8e36b17281fc948d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170491
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit a19aa4754651e685ca07131bfa454c3360191269)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171191
Reviewed-by: Thorsten Behrens
Reviewed-by: Moritz Duge
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 0575ae758cfe..5b3d80291297 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -56,6 +56,14 @@ CertificateChooser::CertificateChooser(weld::Window*
_pParent,
auto nControlWidth = m_xCertLB->get_approximate_digit_width() * 105;
m_xCertLB->set_size_request(nControlWidth, m_xCertLB->get_height_rows(12));
+std::vector aWidths
+{
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(10*nControlWidth/100),
+o3tl::narrowing(20*nControlWidth/100)
+};
+m_xCertLB->set_column_fixed_widths(aWidths);
m_xCertLB->connect_changed( LINK( this, CertificateChooser,
CertificateHighlightHdl ) );
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser,
CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl
) );
@@ -221,7 +229,6 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
mvUserData.push_back(userData);
OUString sIssuer = xmlsec::GetContentPart( xCert->getIssuerName(),
xCert->getCertificateKind());
-OUString sExpDate = utl::GetDateString(xCert->getNotValidAfter());
// If we are searching and there is no match skip
if (mbSearch
@@ -232,11 +239,13 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
m_xCertLB->append();
int nRow = m_xCertLB->n_children() - 1;
-OUString sId(weld::toId(userData.get()));
-m_xCertLB->set_id(nRow, sId);
m_xCertLB->set_text(nRow,
xmlsec::GetContentPart(xCert->getSubjectName(), xCert->getCertificateKind()),
0);
m_xCertLB->set_text(nRow, sIssuer, 1);
-m_xCertLB->set_text(nRow, sExpDate, 2);
+m_xCertLB->set_text(nRow,
xmlsec::GetCertificateKind(xCert->getCertificateKind()), 2);
+m_xCertLB->set_text(nRow,
utl::GetDateString(xCert->getNotValidAfter()), 3);
+m_xCertLB->set_text(nRow,
UsageInClearText(xCert->getCertificateUsage()), 4);
+OUString sId(weld::toId(userData.get()));
+m_xCertLB->set_id(nRow, sId);
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index aae6bd44024f..c06ce07952d1 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -8,8 +8,12 @@
+
+
+
+
@@ -168,7 +172,7 @@
True
6
-Expiration date
+Type
True
2
@@ -179,6 +183,36 @@
+
+
+True
+6
+Expiration date
+True
+3
+
+
+
+3
+
+
+
+
+
+
+True
+6
+
core.git: Branch 'libreoffice-24-2' - xmlsecurity/source xmlsecurity/uiconfig
xmlsecurity/source/dialogs/certificatechooser.cxx | 17 +++--
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 36 -
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit d9e065b8fada80b7c7c413ce27b744af19c407c6
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 15 09:19:45 2024 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Jul 29 20:41:23 2024 +0200
tdf#161871 Revert "Removed Type and Usage Columns from Certificate Chooser"
The commit broke the display of all columns except the first one in all
backends except gtk3.
Also it's not clear why those columns are deemed superfluous;
see discussion in tdf#161871
This reverts commit 9f327102c435887bbae650b3a573f44500b6f534.
Change-Id: Idc3496122137f98c23bb7df8e36b17281fc948d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170491
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit a19aa4754651e685ca07131bfa454c3360191269)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171194
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 730549093390..4bdb4bcc3e07 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -57,6 +57,14 @@ CertificateChooser::CertificateChooser(weld::Window*
_pParent,
auto nControlWidth = m_xCertLB->get_approximate_digit_width() * 105;
m_xCertLB->set_size_request(nControlWidth, m_xCertLB->get_height_rows(12));
+std::vector aWidths
+{
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(10*nControlWidth/100),
+o3tl::narrowing(20*nControlWidth/100)
+};
+m_xCertLB->set_column_fixed_widths(aWidths);
m_xCertLB->connect_changed( LINK( this, CertificateChooser,
CertificateHighlightHdl ) );
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser,
CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl
) );
@@ -220,7 +228,6 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
mvUserData.push_back(userData);
OUString sIssuer = xmlsec::GetContentPart( xCert->getIssuerName(),
xCert->getCertificateKind());
-OUString sExpDate = utl::GetDateString(xCert->getNotValidAfter());
// If we are searching and there is no match skip
if (mbSearch
@@ -231,11 +238,13 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
m_xCertLB->append();
int nRow = m_xCertLB->n_children() - 1;
-OUString sId(weld::toId(userData.get()));
-m_xCertLB->set_id(nRow, sId);
m_xCertLB->set_text(nRow,
xmlsec::GetContentPart(xCert->getSubjectName(), xCert->getCertificateKind()),
0);
m_xCertLB->set_text(nRow, sIssuer, 1);
-m_xCertLB->set_text(nRow, sExpDate, 2);
+m_xCertLB->set_text(nRow,
xmlsec::GetCertificateKind(xCert->getCertificateKind()), 2);
+m_xCertLB->set_text(nRow,
utl::GetDateString(xCert->getNotValidAfter()), 3);
+m_xCertLB->set_text(nRow,
UsageInClearText(xCert->getCertificateUsage()), 4);
+OUString sId(weld::toId(userData.get()));
+m_xCertLB->set_id(nRow, sId);
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index aae6bd44024f..c06ce07952d1 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -8,8 +8,12 @@
+
+
+
+
@@ -168,7 +172,7 @@
True
6
-Expiration date
+Type
True
2
@@ -179,6 +183,36 @@
+
+
+True
+6
+Expiration date
+True
+3
+
+
+
+3
+
+
+
+
+
+
+True
+6
+
core.git: xmlsecurity/source xmlsecurity/uiconfig
xmlsecurity/source/dialogs/certificatechooser.cxx | 17 +++--
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 36 -
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit a19aa4754651e685ca07131bfa454c3360191269
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 15 09:19:45 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jul 15 13:00:41 2024 +0200
tdf#161871 Revert "Removed Type and Usage Columns from Certificate Chooser"
The commit broke the display of all columns except the first one in all
backends except gtk3.
Also it's not clear why those columns are deemed superfluous;
see discussion in tdf#161871
This reverts commit 9f327102c435887bbae650b3a573f44500b6f534.
Change-Id: Idc3496122137f98c23bb7df8e36b17281fc948d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170491
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 0575ae758cfe..5b3d80291297 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -56,6 +56,14 @@ CertificateChooser::CertificateChooser(weld::Window*
_pParent,
auto nControlWidth = m_xCertLB->get_approximate_digit_width() * 105;
m_xCertLB->set_size_request(nControlWidth, m_xCertLB->get_height_rows(12));
+std::vector aWidths
+{
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(30*nControlWidth/100),
+o3tl::narrowing(10*nControlWidth/100),
+o3tl::narrowing(20*nControlWidth/100)
+};
+m_xCertLB->set_column_fixed_widths(aWidths);
m_xCertLB->connect_changed( LINK( this, CertificateChooser,
CertificateHighlightHdl ) );
m_xCertLB->connect_row_activated( LINK( this, CertificateChooser,
CertificateSelectHdl ) );
m_xViewBtn->connect_clicked( LINK( this, CertificateChooser, ViewButtonHdl
) );
@@ -221,7 +229,6 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
mvUserData.push_back(userData);
OUString sIssuer = xmlsec::GetContentPart( xCert->getIssuerName(),
xCert->getCertificateKind());
-OUString sExpDate = utl::GetDateString(xCert->getNotValidAfter());
// If we are searching and there is no match skip
if (mbSearch
@@ -232,11 +239,13 @@ void CertificateChooser::ImplInitialize(bool mbSearch)
m_xCertLB->append();
int nRow = m_xCertLB->n_children() - 1;
-OUString sId(weld::toId(userData.get()));
-m_xCertLB->set_id(nRow, sId);
m_xCertLB->set_text(nRow,
xmlsec::GetContentPart(xCert->getSubjectName(), xCert->getCertificateKind()),
0);
m_xCertLB->set_text(nRow, sIssuer, 1);
-m_xCertLB->set_text(nRow, sExpDate, 2);
+m_xCertLB->set_text(nRow,
xmlsec::GetCertificateKind(xCert->getCertificateKind()), 2);
+m_xCertLB->set_text(nRow,
utl::GetDateString(xCert->getNotValidAfter()), 3);
+m_xCertLB->set_text(nRow,
UsageInClearText(xCert->getCertificateUsage()), 4);
+OUString sId(weld::toId(userData.get()));
+m_xCertLB->set_id(nRow, sId);
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index aae6bd44024f..c06ce07952d1 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -8,8 +8,12 @@
+
+
+
+
@@ -168,7 +172,7 @@
True
6
-Expiration date
+Type
True
2
@@ -179,6 +183,36 @@
+
+
+True
+6
+Expiration date
+True
+3
+
+
+
+3
+
+
+
+
+
+
+True
+6
+Certificate usage
+True
+4
+
core.git: Branch 'feature/cib_contract49c' - 2 commits - cui/source include/sfx2 sfx2/source sw/qa sw/source
cui/source/inc/numpages.hxx |2 +
cui/source/tabpages/numpages.cxx | 22 ---
include/sfx2/tabdlg.hxx |9 +++
sfx2/source/dialog/tabdlg.cxx| 14
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py | 16 ++---
sw/source/ui/misc/num.cxx|9 +++
sw/source/uibase/inc/num.hxx |1
sw/source/uibase/wrtsh/wrtsh1.cxx| 20 ++---
8 files changed, 66 insertions(+), 27 deletions(-)
New commits:
commit c793a99d67f1963fe46062bc5d2313a05885de50
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 12:48:29 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jul 15 12:18:20 2024 +0200
Use configured bullet symbol when clicking bullets button
Instead of the generic default symbol
Change-Id: I0923d4ede5d7cc09d61bb57d5cb6dbf6f2af8058
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170377
Reviewed-by: Thorsten Behrens
Tested-by: allotropia jenkins
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 0054eca4cb34..df2e0f487231 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1573,11 +1573,6 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
// Append the character template at the numbering.
SwCharFormat* pChrFormat;
SwDocShell* pDocSh = GetView().GetDocShell();
-// #i63395#
-// Only apply user defined default bullet font
-const vcl::Font* pFnt = numfunc::IsDefBulletFontUserDefined()
- ? &numfunc::GetDefBulletFont()
- : nullptr;
if (bNum)
{
@@ -1604,13 +1599,14 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
if (! bNum)
{
-// #i63395#
-// Only apply user defined default bullet font
-if ( pFnt )
-{
-aFormat.SetBulletFont( pFnt );
-}
-aFormat.SetBulletChar( numfunc::GetBulletChar(nLvl) );
+uno::Sequence aBulletSymbols(
+
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get());
+uno::Sequence aBulletSymbolsFonts(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get());
+aFormat.SetBulletChar(aBulletSymbols[0].toChar());
+vcl::Font aFont;
+aFont.SetFamilyName(aBulletSymbolsFonts[0]);
+aFormat.SetBulletFont(&aFont);
aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
aFormat.SetListFormat("", "", nLvl);
commit e49df43afba38442b48353c118c504be947d50e4
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 10:15:31 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jul 15 12:18:09 2024 +0200
Don't save bullet changes when dialog was cancelled
Change-Id: Ia2a7feb2f47a59f7c693e2023f9c2c8b3b934f81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170337
Tested-by: allotropia jenkins
Reviewed-by: Thorsten Behrens
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 615f84bfdfe9..04c46ebb2fff 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -98,6 +98,8 @@ class SvxBulletPickTabPage final : public SfxTabPage
std::unique_ptr m_xBtChangeBullet;
std::unique_ptr m_xExamplesVS;
std::unique_ptr m_xExamplesVSWin;
+css::uno::Sequence m_aBulletSymbols;
+css::uno::Sequence m_aBulletSymbolsFonts;
DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c9fb1c094373..211bb3f550a2 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -397,6 +397,14 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet&
rSet)
DeactivateRC SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
+if (IsCancelMode())
+{
+// Dialog cancelled, restore previous bullets
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::BulletsNumbering::DefaultBullets::set(m_aBulletSymbols,
batch);
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::set(m_aBulletSymbolsFonts,
batch);
+batch->commit();
+}
if(_pSet)
FillItemSet(_pSet);
return DeactivateRC::LeavePage;
@@ -519,15 +527,15 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage,
ClickAddChangeHdl_Impl, weld::Button&, voi
_nMask <<= 1;
}
-css::uno::Sequence
aBulletS
core.git: Branch 'libreoffice-24-8' - xmlsecurity/source
xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e9ebcb15f0cb458da0a0c7583fa740c063a5e107 Author: Samuel Mehrbrodt AuthorDate: Thu Jul 11 23:15:26 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jul 15 10:37:34 2024 +0200 tdf#108828 Prevent leaking keys from previous signing sessions Usuccessful signing sessions (e.g. abort when password is requested) left their key in the context. On the next try, the former key would also be used to sign. Change-Id: I55b9201df229cae40863a0a19b238029607d1848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170388 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins (cherry picked from commit 0e1592094e7463b07e9bc9725b4c85d5244bf997) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170477 Reviewed-by: Adolfo Jayme Barrientos diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 2eff021eb38f..fd2c5d1ebfbd 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -197,6 +197,8 @@ SAL_CALL XMLSignature_GpgImpl::generate( int nRet = xmlSecBase64Decode_ex(pKey, reinterpret_cast(pKey), xmlStrlen(pKey), &nWritten); if(nRet < 0) throw RuntimeException(u"The GpgME library failed to initialize for the OpenPGP protocol."_ustr); + +rCtx.clearSigningKeys(); // tdf#108828 Clear keys from previous unsuccessful sessions if( rCtx.addSigningKey( rCtx.key( reinterpret_cast(pKey), err, true)) )
core.git: Branch 'libreoffice-24-8' - xmlsecurity/source
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ba2d46a55e601007be9d06b1980a4d05957a2908
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 17:54:15 2024 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Jul 15 09:29:30 2024 +0200
tdf#108828 Show certificate selector again after cancelling password dialog
Change-Id: I0a57204c1885ca300d22832e5469d8918aec9ba6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170384
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit b7a6d5752a3f60dc29cde6ea05ee6b7112dc4780)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170475
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index da396d7ba0a7..9c3081cdca34 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -466,7 +466,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl,
weld::Button&, void)
xSecContexts.push_back(maSignatureManager.getGpgSecurityContext());
std::unique_ptr aChooser =
CertificateChooser::getInstance(m_xDialog.get(), std::move(xSecContexts),
CertificateChooserUserAction::Sign);
-if (aChooser->run() == RET_OK)
+while (aChooser->run() == RET_OK)
{
sal_Int32 nSecurityId;
if
(!maSignatureManager.add(aChooser->GetSelectedCertificates()[0],
aChooser->GetSelectedSecurityContext(),
@@ -491,6 +491,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl,
weld::Button&, void)
mbVerifySignatures = true;
ImplGetSignatureInformations(/*bUseTempStream=*/true,
/*bCacheLastSignature=*/false);
ImplFillSignaturesBox();
+break;
}
}
}
core.git: xmlsecurity/source
xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0e1592094e7463b07e9bc9725b4c85d5244bf997 Author: Samuel Mehrbrodt AuthorDate: Thu Jul 11 23:15:26 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Jul 15 06:26:06 2024 +0200 tdf#108828 Prevent leaking keys from previous signing sessions Usuccessful signing sessions (e.g. abort when password is requested) left their key in the context. On the next try, the former key would also be used to sign. Change-Id: I55b9201df229cae40863a0a19b238029607d1848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170388 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 2eff021eb38f..fd2c5d1ebfbd 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -197,6 +197,8 @@ SAL_CALL XMLSignature_GpgImpl::generate( int nRet = xmlSecBase64Decode_ex(pKey, reinterpret_cast(pKey), xmlStrlen(pKey), &nWritten); if(nRet < 0) throw RuntimeException(u"The GpgME library failed to initialize for the OpenPGP protocol."_ustr); + +rCtx.clearSigningKeys(); // tdf#108828 Clear keys from previous unsuccessful sessions if( rCtx.addSigningKey( rCtx.key( reinterpret_cast(pKey), err, true)) )
core.git: xmlsecurity/source
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b7a6d5752a3f60dc29cde6ea05ee6b7112dc4780
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 17:54:15 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 11 20:57:40 2024 +0200
tdf#108828 Show certificate selector again after cancelling password dialog
Change-Id: I0a57204c1885ca300d22832e5469d8918aec9ba6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170384
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index da396d7ba0a7..9c3081cdca34 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -466,7 +466,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl,
weld::Button&, void)
xSecContexts.push_back(maSignatureManager.getGpgSecurityContext());
std::unique_ptr aChooser =
CertificateChooser::getInstance(m_xDialog.get(), std::move(xSecContexts),
CertificateChooserUserAction::Sign);
-if (aChooser->run() == RET_OK)
+while (aChooser->run() == RET_OK)
{
sal_Int32 nSecurityId;
if
(!maSignatureManager.add(aChooser->GetSelectedCertificates()[0],
aChooser->GetSelectedSecurityContext(),
@@ -491,6 +491,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl,
weld::Button&, void)
mbVerifySignatures = true;
ImplGetSignatureInformations(/*bUseTempStream=*/true,
/*bCacheLastSignature=*/false);
ImplFillSignaturesBox();
+break;
}
}
}
core.git: sw/source
sw/source/uibase/wrtsh/wrtsh1.cxx | 20
1 file changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 626357f53c934e7f57dc80c3c83ad080767961f3
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 12:48:29 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 11 17:16:56 2024 +0200
Use configured bullet symbol when clicking bullets button
Instead of the generic default symbol
Change-Id: I0923d4ede5d7cc09d61bb57d5cb6dbf6f2af8058
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170373
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index e243beb22ea8..78170708ebad 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1584,11 +1584,6 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
// Append the character template at the numbering.
SwCharFormat* pChrFormat;
SwDocShell* pDocSh = GetView().GetDocShell();
-// #i63395#
-// Only apply user defined default bullet font
-const vcl::Font* pFnt = numfunc::IsDefBulletFontUserDefined()
- ? &numfunc::GetDefBulletFont()
- : nullptr;
if (bNum)
{
@@ -1615,13 +1610,14 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
if (! bNum)
{
-// #i63395#
-// Only apply user defined default bullet font
-if ( pFnt )
-{
-aFormat.SetBulletFont( pFnt );
-}
-aFormat.SetBulletChar( numfunc::GetBulletChar(nLvl) );
+uno::Sequence aBulletSymbols(
+
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get());
+uno::Sequence aBulletSymbolsFonts(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get());
+aFormat.SetBulletChar(aBulletSymbols[0].toChar());
+vcl::Font aFont;
+aFont.SetFamilyName(aBulletSymbolsFonts[0]);
+aFormat.SetBulletFont(&aFont);
aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
aFormat.SetListFormat(u""_ustr, u""_ustr, nLvl);
core.git: cui/source include/sfx2 sfx2/source sw/qa sw/source
cui/source/inc/numpages.hxx |2 +
cui/source/tabpages/numpages.cxx | 22 ---
include/sfx2/tabdlg.hxx |9 +++
sfx2/source/dialog/tabdlg.cxx| 14
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py | 16 ++---
sw/source/ui/misc/num.cxx|9 +++
sw/source/uibase/inc/num.hxx |1
7 files changed, 58 insertions(+), 15 deletions(-)
New commits:
commit 8f9b8b6d5ddcdb4e0422f55d67f38063d53b8c21
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 11 10:15:31 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 11 16:36:40 2024 +0200
Don't save bullet changes when dialog was cancelled
Change-Id: Ia2a7feb2f47a59f7c693e2023f9c2c8b3b934f81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170336
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index d90b6b938f7f..acfc0d2a1433 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -99,6 +99,8 @@ class SvxBulletPickTabPage final : public SfxTabPage
std::unique_ptr m_xBtChangeBullet;
std::unique_ptr m_xExamplesVS;
std::unique_ptr m_xExamplesVSWin;
+css::uno::Sequence m_aBulletSymbols;
+css::uno::Sequence m_aBulletSymbolsFonts;
DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c0495541ca61..08f05c9b9a0f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -394,6 +394,14 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet&
rSet)
DeactivateRC SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
+if (IsCancelMode())
+{
+// Dialog cancelled, restore previous bullets
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::BulletsNumbering::DefaultBullets::set(m_aBulletSymbols,
batch);
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::set(m_aBulletSymbolsFonts,
batch);
+batch->commit();
+}
if(_pSet)
FillItemSet(_pSet);
return DeactivateRC::LeavePage;
@@ -516,15 +524,15 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage,
ClickAddChangeHdl_Impl, weld::Button&, voi
_nMask <<= 1;
}
-css::uno::Sequence
aBulletSymbols(officecfg::Office::Common::BulletsNumbering::DefaultBullets::get());
-css::uno::Sequence
aBulletSymbolsFonts(officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get());
-css::uno::Sequence aBulletSymbolsList(aBulletSymbols.size());
-css::uno::Sequence
aBulletSymbolsFontsList(aBulletSymbolsFonts.size());
+m_aBulletSymbols =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get();
+m_aBulletSymbolsFonts =
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get();
+css::uno::Sequence aBulletSymbolsList(m_aBulletSymbols.size());
+css::uno::Sequence
aBulletSymbolsFontsList(m_aBulletSymbolsFonts.size());
auto aBulletSymbolsListRange = asNonConstRange(aBulletSymbolsList);
auto aBulletSymbolsFontsListRange =
asNonConstRange(aBulletSymbolsFontsList);
sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
-for (size_t i = 0; i < aBulletSymbols.size(); ++i)
+for (size_t i = 0; i < m_aBulletSymbols.size(); ++i)
{
if (i == nIndex)
{
@@ -533,8 +541,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage,
ClickAddChangeHdl_Impl, weld::Button&, voi
}
else
{
-aBulletSymbolsListRange[i] = aBulletSymbols[i];
-aBulletSymbolsFontsListRange[i] = aBulletSymbolsFonts[i];
+aBulletSymbolsListRange[i] = m_aBulletSymbols[i];
+aBulletSymbolsFontsListRange[i] = m_aBulletSymbolsFonts[i];
}
}
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 6a207a573027..828054bc562d 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -107,6 +107,11 @@ protected:
*/
bool PrepareLeaveCurrentPage();
+/** Called before user cancels the dialog.
+Calls DeactivatePage of all tab pages with IsCancelMode() set to true
+*/
+void PrepareCancel();
+
/** save the position of the TabDialog and which tab page is the currently
active one
*/
void SavePosAndId();
@@ -192,6 +197,7 @@ private:
const SfxItemSet* mpSet;
OUString maUserString;
bool mbHasExchangeSupport;
+bool mbCancel;
std::unordered_map maAdditionalProperties;
std::unique_ptr mpImpl;
@@ -258,6 +264,9 @@ public:
}
virtual voidFillUserData();
virtual boolIsReadOnly() const;
+/
core.git: sw/qa sw/uiconfig
sw/qa/uitest/writer_tests5/tdf115871.py |4 -
sw/uiconfig/swriter/ui/templatedialog2.ui | 64 +++---
2 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 35e5abe8e569c67fbb0afe84afbd826373470a8c
Author: Samuel Mehrbrodt
AuthorDate: Sat Apr 27 09:33:48 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 11 09:48:12 2024 +0200
Improve tab order in paragraph dialog
Group similiar tabs, put the most used ones (font settings) first, etc.
Change-Id: I4e2931b30605086da588b3fdcd523faa34bb452a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166770
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/uitest/writer_tests5/tdf115871.py
b/sw/qa/uitest/writer_tests5/tdf115871.py
index 1f8639b64586..94d6258e4f7a 100755
--- a/sw/qa/uitest/writer_tests5/tdf115871.py
+++ b/sw/qa/uitest/writer_tests5/tdf115871.py
@@ -35,7 +35,7 @@ class tdf115871(UITestCase):
# Modify outline & list settings of the created style
with self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "15")
+select_pos(xTabs, "13")
# Outline level
xOutlineLevel = xTabs.getChild("comboLB_OUTLINE_LEVEL")
@@ -58,7 +58,7 @@ class tdf115871(UITestCase):
# Open the paragraph style dialog and reset dialog to parent
settings
with self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "15")
+select_pos(xTabs, "13")
xStandardButton = xDialog.getChild("standard")
xStandardButton.executeAction("CLICK", tuple())
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index ae467d56a486..c9afeec2f57a 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -159,10 +159,10 @@
-
+
True
False
-Indents & Spacing
+Font
1
@@ -183,10 +183,10 @@
-
+
True
False
-Alignment
+Font Effects
2
@@ -231,10 +231,10 @@
-
+
True
False
-Asian Typography
+Alignment
4
@@ -255,10 +255,10 @@
-
+
True
False
-Font
+Indents & Spacing
5
@@ -279,10 +279,10 @@
-
+
True
False
-Font Effects
+Position
6
@@ -303,10 +303,10 @@
-
+
True
False
-Position
+Drop Caps
7
@@ -327,10 +327,10 @@
-
+
True
False
-Asian Layout
+Highlighting
8
@@ -351,10 +351,10 @@
-
+
True
False
-Highlighting
+Area
9
@@ -375,10 +375,10 @@
-
+
True
False
-Tabs
+Transparency
10
@@ -399,10 +399,10 @@
-
+
True
False
-Drop Caps
+Borders
11
@@ -423,10 +423,10 @@
-
+
True
False
-Area
+Tabs
12
@@ -447,10 +447,11 @
translations.git: Branch 'feature/cib_contract49c' - source/de
source/de/svx/messages.po | 12 1 file changed, 12 insertions(+) New commits: commit 17317ce9e0cc6473150125382d015e0af2374e7a Author: Samuel Mehrbrodt AuthorDate: Mon Jul 8 12:52:00 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Jul 8 12:53:39 2024 +0200 Translate strings in bullets dropdown Change-Id: Ie588288ab0c8fd28ccd741d54280b97d333ec918 diff --git a/source/de/svx/messages.po b/source/de/svx/messages.po index b220ea0f37d..8d69a0d2695 100644 --- a/source/de/svx/messages.po +++ b/source/de/svx/messages.po @@ -18115,6 +18115,18 @@ msgctxt "navigationbar|new" msgid "New" msgstr "Neu" +#. GBckQ +#: svx/uiconfig/ui/numberingwindow.ui:25 +msgctxt "numberingwindow|label_default" +msgid "Bullet Library" +msgstr "Aufzählungszeichen-Bibliothek" + +#. MBHzf +#: svx/uiconfig/ui/numberingwindow.ui:74 +msgctxt "numberingwindow|label_doc" +msgid "Document Bullets" +msgstr "Dokument-Aufzählungszeichen" + #. Z8rca #: svx/uiconfig/ui/optgridpage.ui:70 msgctxt "optgridpage|usegridsnap"
core.git: sc/qa sc/source
sc/qa/unit/data/xlsx/cell-note.xlsx|binary
sc/qa/unit/subsequent_export_test4.cxx | 20
sc/source/filter/excel/xeescher.cxx| 12
sc/source/filter/inc/xeescher.hxx |3 +++
4 files changed, 35 insertions(+)
New commits:
commit 0acac1a2741d47b98ae600800e2db0e7a5fb3efe
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 27 09:23:08 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 27 13:49:05 2024 +0200
xlsx: Don't export notes author when in privacy mode
Change-Id: Id0b3f0aca7bd4e21f41c2a8307964423debcf5bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sc/qa/unit/data/xlsx/cell-note.xlsx
b/sc/qa/unit/data/xlsx/cell-note.xlsx
new file mode 100644
index ..9df212a2970f
Binary files /dev/null and b/sc/qa/unit/data/xlsx/cell-note.xlsx differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index a6e5802cf98f..fbf31673ada3 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1917,6 +1917,26 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4,
testChangesAuthorDateXLSX)
pBatch->commit();
}
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testNotesAuthor)
+{
+createScDoc("xlsx/cell-note.xlsx");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// Remove all personal info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+save(u"Calc Office Open XML"_ustr);
+xmlDocUniquePtr pXmlDoc = parseExport(u"xl/comments1.xml"_ustr);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPathContent(pXmlDoc, "/x:comments/x:authors/x:author"_ostr,
u"Author1"_ustr);
+
+// Reset config change
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(false,
pBatch);
+pBatch->commit();
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 314f2ebe5b1c..625021e7555b 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1639,6 +1640,7 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const
ScAddress& rScPos,
, mbAutoFill(false)
, mbColHidden(false)
, mbRowHidden(false)
+, mpAuthorIDs(new SvtSecurityMapPersonalInfo)
{
// get the main note text
OUString aNoteText;
@@ -1681,8 +1683,18 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const
ScAddress& rScPos,
// stAuthor (variable): An XLUnicodeString that specifies the
name of the comment
// author. String length MUST be greater than or equal to 1
and less than or equal
// to 54.
+bool bRemovePersonalInfo
+= SvtSecurityOptions::IsOptionSet(
+
SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ && !SvtSecurityOptions::IsOptionSet(
+
SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo);
if( pScNote->GetAuthor().isEmpty() )
maAuthor = XclExpString( u" "_ustr );
+else if (bRemovePersonalInfo)
+maAuthor = XclExpString(
+"Author"
++
OUString::number(mpAuthorIDs->GetInfoID(pScNote->GetAuthor())),
+XclStrFlags::NONE, 54);
else
maAuthor = XclExpString( pScNote->GetAuthor(),
XclStrFlags::NONE, 54 );
diff --git a/sc/source/filter/inc/xeescher.hxx
b/sc/source/filter/inc/xeescher.hxx
index c7adf1050b9b..2d7aefcf07d7 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -26,6 +26,7 @@
#include "xlformula.hxx"
#include
#include
+#include
#include
#include
#include
@@ -382,6 +383,8 @@ private:
boolmbRowHidden;/// Row containing the comment is
hidden
tools::Rectangle maCommentFrom; /// From and From Offset
tools::Rectangle maCommentTo;/// To and To Offsets
+/// map authors to remove personal info
+std::unique_ptr mpAuthorIDs;
};
class XclExpComments : public XclExpRecord
core.git: sc/qa sc/source
sc/qa/unit/data/xlsx/change-tracking.xlsx|binary
sc/qa/unit/subsequent_export_test4.cxx | 26 ++
sc/source/filter/inc/XclExpChangeTrack.hxx |5 +
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 13 -
4 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 9d0d9d8aa0ba4bb465e376621b426fb9ff00507e
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 24 11:11:15 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 27 13:45:05 2024 +0200
xlsx: Don't export changes author/date when in privacy mode
Change-Id: I1b1ef4dd75f02cc545721d5458617cfa92b26615
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169453
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
diff --git a/sc/qa/unit/data/xlsx/change-tracking.xlsx
b/sc/qa/unit/data/xlsx/change-tracking.xlsx
new file mode 100644
index ..cba56b971d64
Binary files /dev/null and b/sc/qa/unit/data/xlsx/change-tracking.xlsx differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 0814c915d81b..a6e5802cf98f 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1889,6 +1889,32 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4,
testChangesAuthorDate)
pXmlDoc,
"/office:document-content/office:body/office:spreadsheet/table:tracked-changes/table:cell-content-change[1]/office:change-info/dc:date"_ostr,
u"1970-01-01T12:00:00"_ustr);
+
+// Reset config change
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(false,
pBatch);
+pBatch->commit();
+}
+
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testChangesAuthorDateXLSX)
+{
+createScDoc("xlsx/change-tracking.xlsx");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// Remove all personal info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+save(u"Calc Office Open XML"_ustr);
+xmlDocUniquePtr pXmlDoc =
parseExport(u"xl/revisions/revisionHeaders.xml"_ustr);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/x:headers/x:header[1]"_ostr, "userName"_ostr,
u"Author1"_ustr);
+assertXPath(pXmlDoc, "/x:headers/x:header[1]"_ostr, "dateTime"_ostr,
+u"1970-01-01T12:00:00.0Z"_ustr);
+
+// Reset config change
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(false,
pBatch);
+pBatch->commit();
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index b23b6f8cdcaf..746125e50ab1 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include "xelink.hxx"
@@ -262,6 +263,10 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
void AppendAction( std::unique_ptr pAction );
+
+private:
+/// map authors to remove personal info
+std::unique_ptr mpAuthorIDs;
};
// XclExpChTrInfo - header of action group of a user
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 52d2150e9f75..30812d7bb9e2 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -37,6 +37,9 @@
#include
#include
#include
+#include
+
+#include
using namespace oox;
@@ -395,7 +398,7 @@ XclExpXmlChTrHeader::XclExpXmlChTrHeader(
OUString aUserName, const DateTime& rDateTime, const sal_uInt8* pGUID,
sal_Int32 nLogNumber, const XclExpChTrTabIdBuffer& rBuf ) :
maUserName(std::move(aUserName)), maDateTime(rDateTime),
mnLogNumber(nLogNumber),
-mnMinAction(0), mnMaxAction(0)
+mnMinAction(0), mnMaxAction(0), mpAuthorIDs(new SvtSecurityMapPersonalInfo)
{
memcpy(maGUID, pGUID, 16);
if (rBuf.GetBufferCount())
@@ -421,6 +424,14 @@ void XclExpXmlChTrHeader::SaveXml( XclExpXmlStream& rStrm )
&aRelId);
tools::Guid aGuid(maGUID);
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo);
+if (bRemovePersonalInfo)
+{
+maDateTime = css::util::DateTime(0, 0, 0, 12, 1, 1, 1970, true);
+maUserName = "Author" +
OUString::number(mpAuthorIDs->GetInfoID(maUserName));
+}
rStrm.WriteAttributes(
XML_guid, aGuid.getString(),
XML_dateTime, lcl_DateTimeToOString(maDateTime),
core.git: Branch 'feature/allo_contract45533' - sw/source
sw/source/ui/misc/glossary.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2ad283a8e7e474549328bd985c741b39d7cbd1d2
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 27 11:10:19 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 27 11:15:09 2024 +0200
Fix autotext shortcut generation
The first character was replaced with a number.
Fallout from 1f93816dd5d75aca98f210017d0b58b7ef1d08da
Change-Id: I3b9a39336d5f6f3c10c85231f86fd196a29e3644
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 12145f1e74ed..ddfe74d0d2e4 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -85,7 +85,8 @@ static OUString lcl_GetValidShortCut( const OUString& rName )
while( rName[nStart-1]==' ' && nStart < nSz )
nStart++;
-OUStringBuffer aBuf(OUString::number(rName[nStart-1]));
+OUStringBuffer aBuf;
+aBuf.append(rName[nStart-1]);
for( ; nStart < nSz; ++nStart )
{
core.git: Branch 'libreoffice-24-8' - 2 commits - sc/qa sc/source sw/qa sw/source
sc/qa/unit/data/ods/change-tracking.ods|binary
sc/qa/unit/subsequent_export_test4.cxx | 23 +
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 19 ++
sw/qa/extras/rtfexport/data/text-change-tracking.rtf | 17
sw/qa/extras/rtfexport/rtfexport8.cxx | 23 +
sw/source/filter/ww8/rtfattributeoutput.cxx| 19 +-
sw/source/filter/ww8/rtfattributeoutput.hxx|3 --
sw/source/filter/ww8/rtfexport.cxx | 14 +-
sw/source/filter/ww8/rtfexport.hxx | 10 +++
9 files changed, 113 insertions(+), 15 deletions(-)
New commits:
commit fbfe026ecd1c6d6f0ba0ccb0ab6948be6de958ca
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 20 10:51:11 2024 +0200
Commit: Xisco Fauli
CommitDate: Mon Jun 24 18:53:40 2024 +0200
ods: Don't export changes author/date when in privacy mode
Change-Id: I8c542f398bb70da96a64b61a9931398b6a78ea72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169258
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 2d60017a66cca4668c87f64f6d048566656b3b1c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169434
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/change-tracking.ods
b/sc/qa/unit/data/ods/change-tracking.ods
new file mode 100644
index ..01077fffc749
Binary files /dev/null and b/sc/qa/unit/data/ods/change-tracking.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 041a7b0bb9cf..0814c915d81b 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1868,6 +1868,29 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf157318)
static_cast(pDoc->GetRangeName(0)->size()));
}
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testChangesAuthorDate)
+{
+createScDoc("ods/change-tracking.ods");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// Remove all personal info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+save(u"calc8"_ustr);
+xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPathContent(
+pXmlDoc,
+
"/office:document-content/office:body/office:spreadsheet/table:tracked-changes/table:cell-content-change[1]/office:change-info/dc:creator"_ostr,
+u"Author1"_ustr);
+assertXPathContent(
+pXmlDoc,
+
"/office:document-content/office:body/office:spreadsheet/table:tracked-changes/table:cell-content-change[1]/office:change-info/dc:date"_ostr,
+u"1970-01-01T12:00:00"_ustr);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 1a3b22e6aad0..80f70da9f53e 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -37,6 +37,8 @@
#include
#include
+#include
+
using namespace ::com::sun::star;
using namespace xmloff::token;
@@ -94,21 +96,28 @@ void ScChangeTrackingExportHelper::WriteBigRange(const
ScBigRange& rBigRange, XM
void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction*
pAction)
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo);
+
SvXMLElementExport aElemInfo (rExport, XML_NAMESPACE_OFFICE,
XML_CHANGE_INFO, true, true);
{
SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC,
XML_CREATOR, true,
false );
-rExport.Characters(pAction->GetUser());
+rExport.Characters(bRemovePersonalInfo
+ ? "Author" +
OUString::number(rExport.GetInfoID(pAction->GetUser()))
+ : pAction->GetUser());
}
{
OUStringBuffer sDate;
-ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(),
sDate);
-SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC,
- XML_DATE, true,
- false );
+ScXMLConverter::ConvertDateTimeToString(bRemovePersonalInfo
+? util::DateTime(0, 0, 0,
12, 1, 1, 1970, true)
+:
pAction->
core.git: sc/qa sc/source
sc/qa/unit/data/ods/change-tracking.ods|binary
sc/qa/unit/subsequent_export_test4.cxx | 23 +
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 19 ++
3 files changed, 37 insertions(+), 5 deletions(-)
New commits:
commit 2d60017a66cca4668c87f64f6d048566656b3b1c
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 20 10:51:11 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 24 07:51:52 2024 +0200
ods: Don't export changes author/date when in privacy mode
Change-Id: I8c542f398bb70da96a64b61a9931398b6a78ea72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169258
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sc/qa/unit/data/ods/change-tracking.ods
b/sc/qa/unit/data/ods/change-tracking.ods
new file mode 100644
index ..01077fffc749
Binary files /dev/null and b/sc/qa/unit/data/ods/change-tracking.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 041a7b0bb9cf..0814c915d81b 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1868,6 +1868,29 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf157318)
static_cast(pDoc->GetRangeName(0)->size()));
}
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testChangesAuthorDate)
+{
+createScDoc("ods/change-tracking.ods");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// Remove all personal info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+save(u"calc8"_ustr);
+xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPathContent(
+pXmlDoc,
+
"/office:document-content/office:body/office:spreadsheet/table:tracked-changes/table:cell-content-change[1]/office:change-info/dc:creator"_ostr,
+u"Author1"_ustr);
+assertXPathContent(
+pXmlDoc,
+
"/office:document-content/office:body/office:spreadsheet/table:tracked-changes/table:cell-content-change[1]/office:change-info/dc:date"_ostr,
+u"1970-01-01T12:00:00"_ustr);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 1a3b22e6aad0..80f70da9f53e 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -37,6 +37,8 @@
#include
#include
+#include
+
using namespace ::com::sun::star;
using namespace xmloff::token;
@@ -94,21 +96,28 @@ void ScChangeTrackingExportHelper::WriteBigRange(const
ScBigRange& rBigRange, XM
void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction*
pAction)
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo);
+
SvXMLElementExport aElemInfo (rExport, XML_NAMESPACE_OFFICE,
XML_CHANGE_INFO, true, true);
{
SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC,
XML_CREATOR, true,
false );
-rExport.Characters(pAction->GetUser());
+rExport.Characters(bRemovePersonalInfo
+ ? "Author" +
OUString::number(rExport.GetInfoID(pAction->GetUser()))
+ : pAction->GetUser());
}
{
OUStringBuffer sDate;
-ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(),
sDate);
-SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC,
- XML_DATE, true,
- false );
+ScXMLConverter::ConvertDateTimeToString(bRemovePersonalInfo
+? util::DateTime(0, 0, 0,
12, 1, 1, 1970, true)
+:
pAction->GetDateTimeUTC(),
+sDate);
+SvXMLElementExport aDateElem(rExport, XML_NAMESPACE_DC, XML_DATE,
true, false);
rExport.Characters(sDate.makeStringAndClear());
}
core.git: Branch 'libreoffice-24-8' - sw/CppunitTest_sw_rtfexport8.mk sw/qa sw/source
sw/CppunitTest_sw_rtfexport8.mk |4
sw/qa/extras/rtfexport/data/text-with-comment.rtf | 232 ++
sw/qa/extras/rtfexport/rtfexport8.cxx | 27 ++
sw/source/filter/ww8/rtfattributeoutput.cxx | 27 +-
sw/source/filter/ww8/rtfattributeoutput.hxx |4
5 files changed, 288 insertions(+), 6 deletions(-)
New commits:
commit 3fc4782c60955b4609f269c9db87260d23183259
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 17 08:46:14 2024 +0200
Commit: Xisco Fauli
CommitDate: Fri Jun 21 12:51:08 2024 +0200
rtf: Don't export notes author/date when in privacy mode
Change-Id: I6dd318fcae9470bb8fc911a8b4d7ff7c7d8f9636
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168984
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169261
diff --git a/sw/CppunitTest_sw_rtfexport8.mk b/sw/CppunitTest_sw_rtfexport8.mk
index 94e535c0fbe2..2fabe631acda 100644
--- a/sw/CppunitTest_sw_rtfexport8.mk
+++ b/sw/CppunitTest_sw_rtfexport8.mk
@@ -15,4 +15,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_rtfexport8,abort))
endif
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_rtfexport8,\
+officecfg/registry \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/rtfexport/data/text-with-comment.rtf
b/sw/qa/extras/rtfexport/data/text-with-comment.rtf
new file mode 100644
index ..f05c3f3ca28f
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/text-with-comment.rtf
@@ -0,0 +1,232 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff43\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1031\deflangfe1031
hemelang1031hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman;}{ 1 bidi swiss charset0
prq2{\*\panose 020b0604020202020204}Arial;}
+{ 24 bidi roman charset1 prq2{\*\panose 0400}Mangal{\* alt
Courier New};}{ 34 bidi nil charset0 prq2{\*\panose
}Cambria Math;}{ 40 bidi roman charset0 prq2 Liberation
Serif{\* alt Times New Roman};}
+{ 41 bidi swiss charset0 prq2 Liberation Sans{\* alt Arial};}{ 42 bidi swiss
charset128 prq2 Noto Sans CJK SC;}{ 43 bidi swiss charset0 prq2 Noto Sans;}{
1525 bidi swiss charset128 prq2 @Noto Sans CJK SC;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ dbmajor 31501 bidi roman charset0 prq2{\*\panose
02020603050405020304}Times New Roman;}{ himajor 31502 bidi swiss charset0 prq2
Calibri Light;}
+{ bimajor 31503 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ lominor 31504 bidi roman charset0 prq2{\*\panose
02020603050405020304}Times New Roman;}
+{ dbminor 31505 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ himinor 31506 bidi swiss charset0 prq2 Calibri{\* alt Arial};}
+{ biminor 31507 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ 1542 bidi roman charset238 prq2 Times New Roman CE;}{ 1543 bidi
roman charset204 prq2 Times New Roman Cyr;}
+{ 1545 bidi roman charset161 prq2 Times New Roman Greek;}{ 1546 bidi roman
charset162 prq2 Times New Roman Tur;}{ 1547 bidi roman charset177 prq2 Times
New Roman (Hebrew);}
+{ 1548 bidi roman charset178 prq2 Times New Roman (Arabic);}{ 1549 bidi
roman charset186 prq2 Times New Roman Baltic;}{ 1550 bidi roman charset163
prq2 Times New Roman (Vietnamese);}{ 1552 bidi swiss charset238 prq2 Arial CE;}
+{ 1553 bidi swiss charset204 prq2 Arial Cyr;}{ 1555 bidi swiss charset161
prq2 Arial Greek;}{ 1556 bidi swiss charset162 prq2 Arial Tur;}{ 1557 bidi
swiss charset177 prq2 Arial (Hebrew);}
+{ 1558 bidi swiss charset178 prq2 Arial (Arabic);}{ 1559 bidi swiss
charset186 prq2 Arial Baltic;}{ 1560 bidi swiss charset163 prq2 Arial
(Vietnamese);}{ 1885 bidi nil charset161 prq2 Cambria Math Greek;}
+{ 1942 bidi roman charset238 prq2 Liberation Serif CE{\* alt Times New
Roman};}{ 1943 bidi roman charset204 prq2 Liberation Serif Cyr{\* alt Times
New Roman};}
+{ 1945 bidi roman charset161 prq2 Liberation Serif Greek{\* alt Times New
Roman};}{ 1946 bidi roman charset162 prq2 Liberation Serif Tur{\* alt Times
New Roman};}
+{ 1947 bidi roman charset177 prq2 Liberation Serif (Hebrew){\* alt Times New
Roman};}{ 1949 bidi roman charset186 prq2 Liberation Serif Baltic{\* alt Times
New Roman};}
+{ 1950 bidi roman charset163 prq2 Liberation Serif (Vietnamese){\* alt Times
New Roman};}{ 1952 bidi swiss charset238 prq2 Liberation Sans CE{\* alt
Arial};}{ 1953 bidi swiss charset204 prq2 Liberation Sans Cyr{\* alt Arial};}
+{ 1955 bidi swiss charset161 prq2 Liberation Sans Greek{\* alt Arial};}{ 1956
bidi swiss charset162 prq2 Liberation Sans Tur{\* alt Arial};}{ 1957 bidi
swiss charset177 prq2 Liberation Sans (H
core.git: Branch 'libreoffice-24-8' - 2 commits - sd/qa sd/source sw/source
sd/qa/unit/data/pptx/pres-with-notes.pptx |binary
sd/qa/unit/export-tests-ooxml4.cxx| 35 ++
sd/source/filter/eppt/epptooxml.hxx |4 +++
sd/source/filter/eppt/pptx-epptooxml.cxx | 32 +++
sw/source/core/crsr/swcrsr.cxx| 15
5 files changed, 80 insertions(+), 6 deletions(-)
New commits:
commit 76e9c0d24dc423cf65d885143810a5af7ec6598d
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 13 15:09:13 2024 +0200
Commit: Xisco Fauli
CommitDate: Fri Jun 21 12:44:25 2024 +0200
pptx: Don't export notes author/date when in privacy mode
Change-Id: Ia2f20b05b043d45df090f2843a4d365c692770fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168813
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168987
diff --git a/sd/qa/unit/data/pptx/pres-with-notes.pptx
b/sd/qa/unit/data/pptx/pres-with-notes.pptx
new file mode 100644
index ..25f9692a2a1c
Binary files /dev/null and b/sd/qa/unit/data/pptx/pres-with-notes.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml4.cxx
b/sd/qa/unit/export-tests-ooxml4.cxx
index 63af283d664f..0e11eb581bf0 100644
--- a/sd/qa/unit/export-tests-ooxml4.cxx
+++ b/sd/qa/unit/export-tests-ooxml4.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1095,6 +1096,40 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4,
testTdf102261_testParaTabStopDefaultDis
}
}
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testNotesAuthorDate)
+{
+createSdImpressDoc("pptx/pres-with-notes.pptx");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// 1. Remove all personal info, but keep note info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+
officecfg::Office::Common::Security::Scripting::KeepNoteAuthorDateInfoOnSaving::set(true,
+
pBatch);
+pBatch->commit();
+
+saveAndReload(u"Impress Office Open XML"_ustr);
+
+xmlDocUniquePtr pXml = parseExport(u"ppt/commentAuthors.xml"_ustr);
+assertXPath(pXml, "/p:cmAuthorLst/p:cmAuthor[@id=0]"_ostr, "name"_ostr,
"Hans Wurst");
+assertXPath(pXml, "/p:cmAuthorLst/p:cmAuthor[@id=1]"_ostr, "name"_ostr,
"Max Muster");
+
+pXml = parseExport(u"ppt/comments/comment1.xml"_ustr);
+assertXPath(pXml, "/p:cmLst/p:cm"_ostr, "dt"_ostr,
"2024-06-13T12:03:08.0");
+
+// 2. Remove all personal info
+
officecfg::Office::Common::Security::Scripting::KeepNoteAuthorDateInfoOnSaving::set(false,
+
pBatch);
+pBatch->commit();
+saveAndReload(u"Impress Office Open XML"_ustr);
+
+pXml = parseExport(u"ppt/commentAuthors.xml"_ustr);
+assertXPath(pXml, "/p:cmAuthorLst/p:cmAuthor[@id=0]"_ostr, "name"_ostr,
"Author1");
+assertXPath(pXml, "/p:cmAuthorLst/p:cmAuthor[@id=1]"_ostr, "name"_ostr,
"Author2");
+
+pXml = parseExport(u"ppt/comments/comment1.xml"_ustr);
+assertXPathNoAttribute(pXml, "/p:cmLst/p:cm"_ostr, "dt"_ostr);
+}
+
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4,
testTableCellVerticalPropertyRoundtrip)
{
createSdImpressDoc("pptx/tcPr-vert-roundtrip.pptx");
diff --git a/sd/source/filter/eppt/epptooxml.hxx
b/sd/source/filter/eppt/epptooxml.hxx
index c187c90c721c..9646afb865d8 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include "epptbase.hxx"
using ::sax_fastparser::FSHelperPtr;
@@ -139,6 +140,7 @@ private:
::sax_fastparser::FSHelperPtr mPresentationFS;
LayoutInfo mLayoutInfo[OOXML_LAYOUT_SIZE];
+std::unique_ptr mpAuthorIDs; // map authors to
remove personal info
std::vector< ::sax_fastparser::FSHelperPtr > mpSlidesFSArray;
sal_Int32 mnLayoutFileIdMax;
@@ -158,6 +160,8 @@ private:
/// Map of placeholder indexes for Master placeholders
std::unordered_map< css::uno::Reference, sal_Int32 >
maPlaceholderShapeToIndexMap;
+// Get author id to remove personal info
+size_t GetInfoID( const OUString sPersonalInfo ) const { return
mpAuthorIDs->GetInfoID(sPersonalInfo); }
struct AuthorComments {
sal_Int32 nId;
sal_Int32 nLastIndex;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 2d9e51e40fa5..728682f955d6 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pp
core.git: Branch 'feature/cib_contract49c' - sw/source
sw/source/uibase/shells/txtnum.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit f7402d54c96a3945e3df3f042cedc8ddec3185ea
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 20 08:25:46 2024 +0200
Commit: Thorsten Behrens
CommitDate: Thu Jun 20 21:43:33 2024 +0200
tdf#161653 Fix selecting from numbering dropdown
Change-Id: I5ba2133395619ec96b32940a6ceddf0c32615a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169253
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/shells/txtnum.cxx
b/sw/source/uibase/shells/txtnum.cxx
index 43c1b8d1aedd..e5d2089c1933 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -262,6 +262,8 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
case FN_SVX_SET_OUTLINE:
{
const SfxUInt16Item* pIndexItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_INDEX );
+if (!pIndexItem) // tdf#161653
+pIndexItem = rReq.GetArg(nSlot);
const SfxStringItem* pCharItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_CHAR );
const SfxStringItem* pFontItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_FONT );
core.git: Branch 'libreoffice-24-8' - sw/source
sw/source/uibase/shells/txtnum.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e0245c22b646ac22de476be0537d694704d56459
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 20 08:25:46 2024 +0200
Commit: Justin Luth
CommitDate: Thu Jun 20 16:17:36 2024 +0200
tdf#161653 Fix selecting from numbering dropdown
Change-Id: I5ba2133395619ec96b32940a6ceddf0c32615a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169252
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 41d26f14fffdb701f6e7ef459a11577725cd0d27)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169145
Tested-by: Justin Luth
Reviewed-by: Justin Luth
diff --git a/sw/source/uibase/shells/txtnum.cxx
b/sw/source/uibase/shells/txtnum.cxx
index 86aa9a6b224e..0941c702ff55 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -261,6 +261,8 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
case FN_SVX_SET_OUTLINE:
{
const SfxUInt16Item* pIndexItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_INDEX );
+if (!pIndexItem) // tdf#161653
+pIndexItem = rReq.GetArg(nSlot);
const SfxStringItem* pCharItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_CHAR );
const SfxStringItem* pFontItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_FONT );
core.git: sw/source
sw/source/uibase/shells/txtnum.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 41d26f14fffdb701f6e7ef459a11577725cd0d27
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 20 08:25:46 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 20 09:42:31 2024 +0200
tdf#161653 Fix selecting from numbering dropdown
Change-Id: I5ba2133395619ec96b32940a6ceddf0c32615a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169252
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/shells/txtnum.cxx
b/sw/source/uibase/shells/txtnum.cxx
index 86aa9a6b224e..0941c702ff55 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -261,6 +261,8 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq)
case FN_SVX_SET_OUTLINE:
{
const SfxUInt16Item* pIndexItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_INDEX );
+if (!pIndexItem) // tdf#161653
+pIndexItem = rReq.GetArg(nSlot);
const SfxStringItem* pCharItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_CHAR );
const SfxStringItem* pFontItem = rReq.GetArgs()->GetItem(
SID_ATTR_BULLET_FONT );
core.git: sw/qa sw/source
sw/qa/extras/rtfexport/data/text-change-tracking.rtf | 17 ++
sw/qa/extras/rtfexport/rtfexport8.cxx| 23 +++
sw/source/filter/ww8/rtfattributeoutput.cxx | 19 ++-
sw/source/filter/ww8/rtfattributeoutput.hxx |3 --
sw/source/filter/ww8/rtfexport.cxx | 14 ++-
sw/source/filter/ww8/rtfexport.hxx | 10
6 files changed, 76 insertions(+), 10 deletions(-)
New commits:
commit 63b46c2136d95960bab30a15e27bc94e6eefe6e6
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 17 11:51:41 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 20 09:22:30 2024 +0200
rtf: Don't export changes author/date when in privacy mode
Change-Id: Id8f8dea4563df3cfb0ea9009783886bdabf91b11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168996
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
diff --git a/sw/qa/extras/rtfexport/data/text-change-tracking.rtf
b/sw/qa/extras/rtfexport/data/text-change-tracking.rtf
new file mode 100644
index ..c6f72ceeade5
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/text-change-tracking.rtf
@@ -0,0 +1,17 @@
+{ tf1nsi\deff3deflang1025
+{ onttbl{ 0 roman prq2 charset0 Liberat;}{ 1 roman prq2 charset2 Symbol;}{ 2
swiss prq2 charset0 Arial;}{ 3 roman prq2 charset0 Liberation Serif{\* alt
Times New Roman};}{ 4 swiss prq2 charset0 Liberation Sans{\* alt Arial};}{ 5
nil prq2 charset0 Noto Sans CJK SC;}{ 6 nil prq2 charset0 Noto Sans
Devanagari;}{ 7 swiss prq0 charset0 Noto Sans Devanagari;}}
+{+{\stylesheet{\s0\snext0 tlchf6fs24lang1081
\ltrch\lang1031\langfe2052\hichf3\loch\widctlpar\hyphpar0spalpha\ltrpar+{\*+{\s16\sbasedon0\snext17
tlchf6fs28 \ltrch\hichf4\loch\sb240\sa120\keepn 4 s28\dbchf5 Heading;}
+{\s17\sbasedon0\snext17\loch\sl276\slmult1\sb0\sa140 Body Text;}
+{\s18\sbasedon17\snext18 tlchf7 \ltrch List;}
+{\s19\sbasedon0\snext19 tlchf7fs24i \ltrch\loch\sb120\sa120
oline s24\i caption;}
+{\s20\sbasedon0\snext20 tlchf7 \ltrch\loch
oline Index;}
+}{\* evtbl {Unknown;}{Max Mustermann;}}
+{\*\generator LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/c558004906bfaef6d1983e09473e4c236de730d3}{\info{+\hyphauto1
iewscale130 evisions ormshade
obrkwrptbl\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sftnnar\saftnnrlc\sectunlocked1\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134
tnbj tnstart1 tnrstcont tnnar etftnrstcontftnstart1ftnnrlc
+{\* tnsep+Test}{ evised evauth1 evdttm667323072 \loch
+Deleted}
+\par }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport8.cxx
b/sw/qa/extras/rtfexport/rtfexport8.cxx
index 1ed6eee0ded4..3f013605d625 100644
--- a/sw/qa/extras/rtfexport/rtfexport8.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport8.cxx
@@ -482,6 +482,29 @@ CPPUNIT_TEST_FIXTURE(Test, testNotesAuthorDate)
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aRtfContent.indexOf("\atndate", 0));
}
+CPPUNIT_TEST_FIXTURE(Test, testChangesAuthor)
+{
+createSwDoc("text-change-tracking.rtf");
+
+auto pBatch(comphelper::ConfigurationChanges::create());
+// Remove all personal info
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+saveAndReload(mpFilter);
+
+SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
+CPPUNIT_ASSERT(pStream);
+OString aRtfContent(read_uInt8s_ToOString(*pStream, pStream->TellEnd()));
+
+// Make sure user name was anonymized
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1),
+ aRtfContent.indexOf("\revtbl {Unknown;}{Max
Mustermann;}", 0));
+CPPUNIT_ASSERT(aRtfContent.indexOf("\revtbl {Author1;}{Author2;}", 0) >=
0);
+
+// Make sure no date is set
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aRtfContent.indexOf("\revdttmdel", 0));
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf158982)
{
auto verify = [this]() {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 22a76de4a109..07063fb4d5c5 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -626,13 +626,19 @@ void RtfAttributeOutput::Redline(const SwRedlineData*
pRedline)
if (!pRedline)
return;
+bool bRemoveCommentAuthorDates
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ && !SvtSecurityOptions::IsOptionSet(
+ SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo);
+
if (pRedline->GetType() == RedlineType::Insert)
{
m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVISED);
m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTH);
m_aRun->append(static_cast(
m_rExport.GetR
core.git: sw/CppunitTest_sw_rtfexport8.mk sw/qa sw/source
sw/CppunitTest_sw_rtfexport8.mk |4
sw/qa/extras/rtfexport/data/text-with-comment.rtf | 232 ++
sw/qa/extras/rtfexport/rtfexport8.cxx | 27 ++
sw/source/filter/ww8/rtfattributeoutput.cxx | 27 +-
sw/source/filter/ww8/rtfattributeoutput.hxx |4
5 files changed, 288 insertions(+), 6 deletions(-)
New commits:
commit 16c7a6f77e59c475bbb580ef1fd85428907a00f2
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 17 08:46:14 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jun 20 09:22:11 2024 +0200
rtf: Don't export notes author/date when in privacy mode
Change-Id: I6dd318fcae9470bb8fc911a8b4d7ff7c7d8f9636
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168984
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/CppunitTest_sw_rtfexport8.mk b/sw/CppunitTest_sw_rtfexport8.mk
index 94e535c0fbe2..2fabe631acda 100644
--- a/sw/CppunitTest_sw_rtfexport8.mk
+++ b/sw/CppunitTest_sw_rtfexport8.mk
@@ -15,4 +15,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_rtfexport8,abort))
endif
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_rtfexport8,\
+officecfg/registry \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/rtfexport/data/text-with-comment.rtf
b/sw/qa/extras/rtfexport/data/text-with-comment.rtf
new file mode 100644
index ..f05c3f3ca28f
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/text-with-comment.rtf
@@ -0,0 +1,232 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff43\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1031\deflangfe1031
hemelang1031hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman;}{ 1 bidi swiss charset0
prq2{\*\panose 020b0604020202020204}Arial;}
+{ 24 bidi roman charset1 prq2{\*\panose 0400}Mangal{\* alt
Courier New};}{ 34 bidi nil charset0 prq2{\*\panose
}Cambria Math;}{ 40 bidi roman charset0 prq2 Liberation
Serif{\* alt Times New Roman};}
+{ 41 bidi swiss charset0 prq2 Liberation Sans{\* alt Arial};}{ 42 bidi swiss
charset128 prq2 Noto Sans CJK SC;}{ 43 bidi swiss charset0 prq2 Noto Sans;}{
1525 bidi swiss charset128 prq2 @Noto Sans CJK SC;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ dbmajor 31501 bidi roman charset0 prq2{\*\panose
02020603050405020304}Times New Roman;}{ himajor 31502 bidi swiss charset0 prq2
Calibri Light;}
+{ bimajor 31503 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ lominor 31504 bidi roman charset0 prq2{\*\panose
02020603050405020304}Times New Roman;}
+{ dbminor 31505 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ himinor 31506 bidi swiss charset0 prq2 Calibri{\* alt Arial};}
+{ biminor 31507 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman;}{ 1542 bidi roman charset238 prq2 Times New Roman CE;}{ 1543 bidi
roman charset204 prq2 Times New Roman Cyr;}
+{ 1545 bidi roman charset161 prq2 Times New Roman Greek;}{ 1546 bidi roman
charset162 prq2 Times New Roman Tur;}{ 1547 bidi roman charset177 prq2 Times
New Roman (Hebrew);}
+{ 1548 bidi roman charset178 prq2 Times New Roman (Arabic);}{ 1549 bidi
roman charset186 prq2 Times New Roman Baltic;}{ 1550 bidi roman charset163
prq2 Times New Roman (Vietnamese);}{ 1552 bidi swiss charset238 prq2 Arial CE;}
+{ 1553 bidi swiss charset204 prq2 Arial Cyr;}{ 1555 bidi swiss charset161
prq2 Arial Greek;}{ 1556 bidi swiss charset162 prq2 Arial Tur;}{ 1557 bidi
swiss charset177 prq2 Arial (Hebrew);}
+{ 1558 bidi swiss charset178 prq2 Arial (Arabic);}{ 1559 bidi swiss
charset186 prq2 Arial Baltic;}{ 1560 bidi swiss charset163 prq2 Arial
(Vietnamese);}{ 1885 bidi nil charset161 prq2 Cambria Math Greek;}
+{ 1942 bidi roman charset238 prq2 Liberation Serif CE{\* alt Times New
Roman};}{ 1943 bidi roman charset204 prq2 Liberation Serif Cyr{\* alt Times
New Roman};}
+{ 1945 bidi roman charset161 prq2 Liberation Serif Greek{\* alt Times New
Roman};}{ 1946 bidi roman charset162 prq2 Liberation Serif Tur{\* alt Times
New Roman};}
+{ 1947 bidi roman charset177 prq2 Liberation Serif (Hebrew){\* alt Times New
Roman};}{ 1949 bidi roman charset186 prq2 Liberation Serif Baltic{\* alt Times
New Roman};}
+{ 1950 bidi roman charset163 prq2 Liberation Serif (Vietnamese){\* alt Times
New Roman};}{ 1952 bidi swiss charset238 prq2 Liberation Sans CE{\* alt
Arial};}{ 1953 bidi swiss charset204 prq2 Liberation Sans Cyr{\* alt Arial};}
+{ 1955 bidi swiss charset161 prq2 Liberation Sans Greek{\* alt Arial};}{ 1956
bidi swiss charset162 prq2 Liberation Sans Tur{\* alt Arial};}{ 1957 bidi
swiss charset177 prq2 Liberation Sans (Hebrew){\* alt Arial};}
+{ 1959 bidi swiss charset186 prq2 Liberation Sans Baltic{\* alt
core.git: sd/source
sd/source/filter/eppt/eppt.cxx | 35 ---
sd/source/filter/eppt/epptbase.hxx |1
sd/source/filter/eppt/pptx-epptbase.cxx | 21 ++
sd/source/filter/eppt/pptx-epptooxml.cxx | 22 ---
4 files changed, 24 insertions(+), 55 deletions(-)
New commits:
commit a063a8bc391ae3017a114a9a5edd8073067168dc
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 13 19:31:48 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 17 11:57:17 2024 +0200
Move duplicate code into shared method
Change-Id: I3859c3a491abbe74d12f08d86948196dddb462ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168822
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index bb0544c5d068..1d0f242c20b1 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1024,39 +1024,6 @@ bool PPTWriter::ImplCreateMainNotes()
return true;
}
-static OUString getInitials( const OUString& rName )
-{
-OUStringBuffer sInitials;
-
-const sal_Unicode * pStr = rName.getStr();
-sal_Int32 nLength = rName.getLength();
-
-while( nLength )
-{
-// skip whitespace
-while( nLength && (*pStr <= ' ') )
-{
-nLength--; pStr++;
-}
-
-// take letter
-if( nLength )
-{
-sInitials.append( *pStr );
-nLength--; pStr++;
-}
-
-// skip letters until whitespace
-while( nLength && (*pStr > ' ') )
-{
-nLength--; pStr++;
-}
-}
-
-return sInitials.makeStringAndClear();
-}
-
-
void PPTWriter::ImplExportComments( const uno::Reference< drawing::XDrawPage
>& xPage, SvMemoryStream& rBinaryTagData10Atom )
{
try
@@ -1087,7 +1054,7 @@ void PPTWriter::ImplExportComments( const uno::Reference<
drawing::XDrawPage >&
: xAnnotation->getAuthor() );
uno::Reference< text::XText > xText(
xAnnotation->getTextRange() );
OUString sText( xText->getString() );
-OUString sInitials( getInitials( sAuthor ) );
+OUString sInitials( GetInitials( sAuthor ) );
util::DateTime aEmptyDateTime;
util::DateTime aDateTime(bRemoveCommentAuthorDates ?
aEmptyDateTime
:
xAnnotation->getDateTime());
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index 70bcd3a4b6ce..18199210cc6b 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -379,6 +379,7 @@ protected:
::tools::RectangleMapRectangle( const css::awt::Rectangle& );
bool ContainsOtherShapeThanPlaceholders();
+static OUString GetInitials(std::u16string_view sName);
public:
PPTWriterBase();
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 1e2137cb8057..fe9444865797 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -997,4 +998,24 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders()
return bOtherThanPlaceHolders;
}
+OUString PPTWriterBase::GetInitials(std::u16string_view sName)
+{
+OUStringBuffer sRet;
+
+if (!sName.empty())
+{
+sRet.append(sName[0]);
+size_t nStart = 0, nOffset;
+
+while ((nOffset = sName.find(' ', nStart)) !=
std::u16string_view::npos)
+{
+if (nOffset + 1 < sName.size())
+sRet.append(sName[ nOffset + 1 ]);
+nStart = nOffset + 1;
+}
+}
+
+return sRet.makeStringAndClear();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 728682f955d6..f7379a3cd68e 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1017,26 +1017,6 @@ void PowerPointExport::WriteTransition(const
FSHelperPtr& pFS)
}
}
-static OUString lcl_GetInitials(std::u16string_view sName)
-{
-OUStringBuffer sRet;
-
-if (!sName.empty())
-{
-sRet.append(sName[0]);
-size_t nStart = 0, nOffset;
-
-while ((nOffset = sName.find(' ', nStart)) !=
std::u16string_view::npos)
-{
-if (nOffset + 1 < sName.size())
-sRet.append(sName[ nOffset + 1 ]);
-nStart = nOffset + 1;
-}
-}
-
-return sRet.makeStringAndClear();
-}
-
void PowerPointExport::WriteAuthors()
{
if (maAuthors.empty())
@@ -1056,7 +1036,7 @@ voi
core.git: 2 commits - sd/qa sd/source
sd/qa/unit/data/pptx/pres-with-notes.pptx |binary
sd/qa/unit/export-tests-ooxml4.cxx| 35 ++
sd/source/filter/eppt/eppt.cxx| 21 +-
sd/source/filter/eppt/eppt.hxx|4 +++
sd/source/filter/eppt/epptooxml.hxx |4 +++
sd/source/filter/eppt/pptx-epptooxml.cxx | 32 +++
6 files changed, 86 insertions(+), 10 deletions(-)
New commits:
commit a298ba36047e17cf6a0f6b3d17ae40aed282f47b
Author: Samuel Mehrbrodt
AuthorDate: Thu Jun 13 19:26:04 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 17 10:30:19 2024 +0200
ppt: Don't export notes author/date when in privacy mode
Change-Id: Id748b79e7685f5e99df142aa2aa9449a18a32d5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168821
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 32af30aecd97..bb0544c5d068 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -82,6 +83,7 @@ PPTWriter::PPTWriter( rtl::Reference xSvStorage,
mpVBA ( pVBA ),
mnExEmbed ( 0 ),
mpExEmbed ( new SvMemoryStream ),
+mpAuthorIDs ( new SvtSecurityMapPersonalInfo ),
mnPagesWritten ( 0 ),
mnTxId ( 0x7a2f64 ),
mnDiaMode ( 0 ),
@@ -149,8 +151,6 @@ void PPTWriter::exportPPTPost( )
mbStatus = true;
};
-static void ImplExportComments( const uno::Reference< drawing::XDrawPage >&
xPage, SvMemoryStream& rBinaryTagData10Atom );
-
void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum,
sal_uInt16 nMode,
bool bHasBackground, Reference< XPropertySet >
const & aXBackgroundPropSet )
{
@@ -1056,13 +1056,20 @@ static OUString getInitials( const OUString& rName )
return sInitials.makeStringAndClear();
}
-void ImplExportComments( const uno::Reference< drawing::XDrawPage >& xPage,
SvMemoryStream& rBinaryTagData10Atom )
+
+void PPTWriter::ImplExportComments( const uno::Reference< drawing::XDrawPage
>& xPage, SvMemoryStream& rBinaryTagData10Atom )
{
try
{
uno::Reference< office::XAnnotationAccess > xAnnotationAccess( xPage,
uno::UNO_QUERY_THROW );
uno::Reference< office::XAnnotationEnumeration >
xAnnotationEnumeration( xAnnotationAccess->createAnnotationEnumeration() );
+bool bRemoveCommentAuthorDates
+= SvtSecurityOptions::IsOptionSet(
+ SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo)
+ && !SvtSecurityOptions::IsOptionSet(
+
SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo);
+
sal_Int32 nIndex = 1;
while( xAnnotationEnumeration->hasMoreElements() )
@@ -1075,11 +1082,15 @@ void ImplExportComments( const uno::Reference<
drawing::XDrawPage >& xPage, SvMe
Point aPoint(o3tl::convert(aRealPoint2D.X, o3tl::Length::mm,
o3tl::Length::master),
o3tl::convert(aRealPoint2D.Y, o3tl::Length::mm,
o3tl::Length::master));
-OUString sAuthor( xAnnotation->getAuthor() );
+OUString sAuthor( bRemoveCommentAuthorDates
+? "Author" +
OUString::number(mpAuthorIDs->GetInfoID(xAnnotation->getAuthor() ))
+: xAnnotation->getAuthor() );
uno::Reference< text::XText > xText(
xAnnotation->getTextRange() );
OUString sText( xText->getString() );
OUString sInitials( getInitials( sAuthor ) );
-util::DateTime aDateTime( xAnnotation->getDateTime() );
+util::DateTime aEmptyDateTime;
+util::DateTime aDateTime(bRemoveCommentAuthorDates ?
aEmptyDateTime
+ :
xAnnotation->getDateTime());
if ( !sAuthor.isEmpty() )
PPTWriter::WriteCString( rBinaryTagData10Atom, sAuthor );
if ( !sText.isEmpty() )
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 1ef07d1dcff4..3d95b4380229 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -24,6 +24,7 @@
#include "escherex.hxx"
#include
#include
+#include
#include "pptexsoundcollection.hxx"
#include "text.hxx"
@@ -138,6 +139,7 @@ class PPTWriter final : public PPTWriterBase, public
PPTExBulletProvider
SvMemoryStream* mpVBA;
sal_uInt32 mnExEmbed;
std::unique_ptr mpEx
core.git: Branch 'feature/cib_contract49c' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c405694fce4c54ada5292f11286e99a8172d7e27 Author: Samuel Mehrbrodt AuthorDate: Mon Jun 10 10:41:09 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Jun 10 10:41:09 2024 +0200 Update git submodules * Update translations from branch 'feature/cib_contract49c' to 221d20eaf354f82b10065e8d9fc3b365182412c1 - Add translation for "Change bullet" btn Change-Id: Ib9c661f092449b1dfad0674dd765da6387ffe766 diff --git a/translations b/translations index 90e048d8ffa2..221d20eaf354 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 90e048d8ffa2e03a35e0a8f9f3c53bb293ea0942 +Subproject commit 221d20eaf354f82b10065e8d9fc3b365182412c1
translations.git: Branch 'feature/cib_contract49c' - source/de
source/de/cui/messages.po |6 ++ 1 file changed, 6 insertions(+) New commits: commit 221d20eaf354f82b10065e8d9fc3b365182412c1 Author: Samuel Mehrbrodt AuthorDate: Mon Jun 10 10:39:46 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Jun 10 10:40:55 2024 +0200 Add translation for "Change bullet" btn Change-Id: Ib9c661f092449b1dfad0674dd765da6387ffe766 diff --git a/source/de/cui/messages.po b/source/de/cui/messages.po index bc0fc0f5b1c..62cb35a3173 100644 --- a/source/de/cui/messages.po +++ b/source/de/cui/messages.po @@ -18488,6 +18488,12 @@ msgctxt "pickbulletpage|extended_tip|valueset" msgid "Click the bullet style that you want to use." msgstr "Klicken Sie auf den gewünschten Aufzählungsstil." +#. WfEwh +#: cui/uiconfig/ui/pickbulletpage.ui:52 +msgctxt "pickbulletpage|changeBulletBtn" +msgid "Change Bullet" +msgstr "Aufzählungszeichen wechseln" + #. K4D8E #: cui/uiconfig/ui/pickbulletpage.ui:50 msgctxt "pickbulletpage|label25"
core.git: cui/qa sw/uiconfig vcl/source
cui/qa/uitest/dialogs/shortcuts.py| 31 +++---
sw/uiconfig/swriter/ui/templatedialog2.ui |1
vcl/source/control/imivctl1.cxx |2 +
3 files changed, 15 insertions(+), 19 deletions(-)
New commits:
commit 30380c2f9888685ddceaafc9fb3a637e7167a3ac
Author: Samuel Mehrbrodt
AuthorDate: Thu Apr 25 15:10:49 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 10 07:13:22 2024 +0200
tdf#99528 Use vertical tabs in para dialog
Change-Id: I7ec61c07f75e9a8aa124ac5b3d67c90077cca033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166625
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/qa/uitest/dialogs/shortcuts.py
b/cui/qa/uitest/dialogs/shortcuts.py
index ac8a0a791496..947d94b910d7 100644
--- a/cui/qa/uitest/dialogs/shortcuts.py
+++ b/cui/qa/uitest/dialogs/shortcuts.py
@@ -13,25 +13,18 @@ from uitest.uihelper.common import get_state_as_dict
class Test(UITestCase):
def test_tab_navigation(self):
-with self.ui_test.create_doc_in_start_center("writer"):
-xWriterDoc = self.xUITest.getTopFocusWindow()
-
-with self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
-
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "0")
-
-for i in range(16):
-self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
-
-xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
-
-self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], "0")
-
-for i in reversed(range(16)):
-xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
-
-self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
+with self.ui_test.create_doc_in_start_center("writer"),\
+self.ui_test.execute_dialog_through_command(".uno:EditStyle")
as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+
+for i in range(16):
+self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
+xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
+
+for i in reversed(range(16)):
+self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"],
str(i))
+xTabs.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 97fde7653f39..ae467d56a486 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -122,6 +122,7 @@
True
True
True
+left
True
True
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index dca91c7d4163..a52a8634ff4b 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -220,6 +220,8 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry(size_t nPos)
{
pImpCursor->Clear();
maEntries.erase(maEntries.begin() + nPos);
+// Recalculate list positions
+nFlags &= ~IconChoiceFlags::EntryListPosValid;
RecalcAllBoundingRectsSmart();
}
core.git: Branch 'feature/cib_contract49c' - cui/source
cui/source/tabpages/numpages.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit bacf18009eadd72d6abb1618dc2870f4bd04
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 3 11:08:52 2024 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jun 7 22:13:47 2024 +0200
tdf#69724 Disable 'Change Bullet' btn until selection exists
Change-Id: I9c1fdeb4423a8fe45121ff58097582dcccdd12ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168372
Tested-by: allotropia jenkins
Reviewed-by: Thorsten Behrens
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 17269ef88d38..c9fb1c094373 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -333,6 +333,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container*
pPage, weld::DialogC
, m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset",
*m_xExamplesVS))
{
SetExchangeSupport();
+m_xBtChangeBullet->set_sensitive(false);
m_xExamplesVS->init(NumberingPageType::BULLET);
m_xExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage,
NumSelectHdl_Impl));
m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage,
DoubleClickHdl_Impl));
@@ -429,6 +430,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl,
ValueSet*, void)
if(!pActNum)
return;
+m_xBtChangeBullet->set_sensitive(true);
+
bPreset = false;
bModified = true;
sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
core.git: Branch 'feature/cib_contract49c' - sw/inc sw/source
sw/inc/doc.hxx |2 +-
sw/inc/editsh.hxx |2 +-
sw/source/core/doc/docnum.cxx |6 +++---
sw/source/core/edit/ednumber.cxx|2 +-
sw/source/uibase/shells/textsh1.cxx |4 +++-
5 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit b871938afe6d146a7b86fcbb3db120ac30225a7f
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 3 10:59:04 2024 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jun 7 22:13:30 2024 +0200
tdf#161248 Don't duplicate bullets used in document
Change-Id: I0ef01a6be8207d4cffc89b95dc9ca3bf1baf38d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168371
Tested-by: allotropia jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8f530d8646fa..a35954b7f8c8 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1103,7 +1103,7 @@ public:
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
sal_uInt16 FindNumRule( std::u16string_view rName ) const;
SwNumRule* FindNumRulePtr( const OUString& rName ) const;
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
// Deletion only possible if Rule is not used!
bool RenameNumRule(const OUString & aOldName, const OUString & aNewName,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 96433ea89955..f2c548229716 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -578,7 +578,7 @@ public:
text node belongs, which applies the found list style. */
const SwNumRule * SearchNumRule(const bool bNum,
OUString& sListId );
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
/** Undo.
Maintain UndoHistory in Document.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index afc6e7134b4b..58b58218053d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2521,9 +2521,9 @@ sal_uInt16 SwDoc::FindNumRule( std::u16string_view rName
) const
return USHRT_MAX;
}
-std::vector SwDoc::GetUsedBullets()
+std::set SwDoc::GetUsedBullets()
{
-std::vector aUsedBullets;
+std::set aUsedBullets;
for (size_t nRule = 0; nRule < mpNumRuleTable->size(); ++nRule)
{
for (int nLevel=0; nLevel<10; ++nLevel)
@@ -2538,7 +2538,7 @@ std::vector SwDoc::GetUsedBullets()
sal_UCS4 cBullet = rFormat.GetBulletChar();
OUString sBullet(&cBullet, 1);
OUString sFontName(aFont.GetFamilyName());
-aUsedBullets.emplace_back(sBullet + sFontName);
+aUsedBullets.emplace(sBullet + sFontName);
}
}
return aUsedBullets;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 7217b7fbd989..7e609ffebec0 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -879,7 +879,7 @@ const SwNumRule * SwEditShell::SearchNumRule( const bool
bNum,
sListId, GetLayout() );
}
-std::vector SwEditShell::GetUsedBullets()
+std::set SwEditShell::GetUsedBullets()
{
return GetDoc()->GetUsedBullets();
}
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 4f452a8add37..9e7e0d8a9e45 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2736,7 +2736,9 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_BUL_GET_DOC_BULLETS:
{
-std::vector aBullets = rSh.GetUsedBullets();
+std::set aBulletsSet = rSh.GetUsedBullets();
+std::vector aBullets;
+std::copy(aBulletsSet.begin(), aBulletsSet.end(),
std::back_inserter(aBullets));
SfxStringListItem aItem(FN_BUL_GET_DOC_BULLETS);
uno::Sequence aSeq(aBullets.data(),
static_cast(aBullets.size()));
core.git: cui/source
cui/source/tabpages/numpages.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b8a89b3356275e95e3fc78c79f55a209f8056556
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 3 11:08:52 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 3 20:22:23 2024 +0200
tdf#69724 Disable 'Change Bullet' btn until selection exists
Change-Id: I9c1fdeb4423a8fe45121ff58097582dcccdd12ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168359
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 343b0ce9c7f0..c0495541ca61 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -330,6 +330,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container*
pPage, weld::DialogC
, m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr,
*m_xExamplesVS))
{
SetExchangeSupport();
+m_xBtChangeBullet->set_sensitive(false);
m_xExamplesVS->init(NumberingPageType::BULLET);
m_xExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage,
NumSelectHdl_Impl));
m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage,
DoubleClickHdl_Impl));
@@ -426,6 +427,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl,
ValueSet*, void)
if(!pActNum)
return;
+m_xBtChangeBullet->set_sensitive(true);
+
bPreset = false;
bModified = true;
sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
core.git: sw/inc sw/source
sw/inc/doc.hxx |2 +-
sw/inc/editsh.hxx |2 +-
sw/source/core/doc/docnum.cxx |6 +++---
sw/source/core/edit/ednumber.cxx|2 +-
sw/source/uibase/shells/textsh1.cxx |4 +++-
5 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 00c92662a688e04c0dcec0db6c253689d662faeb
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 3 10:59:04 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 3 14:32:32 2024 +0200
tdf#161248 Don't duplicate bullets used in document
Change-Id: I0ef01a6be8207d4cffc89b95dc9ca3bf1baf38d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168358
Reviewed-by: Samuel Mehrbrodt
Tested-by: Jenkins
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 461f835bc2a5..77944005ec3d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1102,7 +1102,7 @@ public:
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode =
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
sal_uInt16 FindNumRule( std::u16string_view rName ) const;
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
SW_DLLPUBLIC SwNumRule* FindNumRulePtr( const OUString& rName ) const;
// Deletion only possible if Rule is not used!
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 85eb84bca3f5..0de62a1d27de 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -578,7 +578,7 @@ public:
text node belongs, which applies the found list style. */
const SwNumRule * SearchNumRule(const bool bNum,
OUString& sListId );
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
/** Undo.
Maintain UndoHistory in Document.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index c4afeac7c50f..93f29d72f1fb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2526,9 +2526,9 @@ sal_uInt16 SwDoc::FindNumRule( std::u16string_view rName
) const
return USHRT_MAX;
}
-std::vector SwDoc::GetUsedBullets()
+std::set SwDoc::GetUsedBullets()
{
-std::vector aUsedBullets;
+std::set aUsedBullets;
for (size_t nRule = 0; nRule < mpNumRuleTable->size(); ++nRule)
{
for (int nLevel=0; nLevel<10; ++nLevel)
@@ -2543,7 +2543,7 @@ std::vector SwDoc::GetUsedBullets()
sal_UCS4 cBullet = rFormat.GetBulletChar();
OUString sBullet(&cBullet, 1);
OUString sFontName(aFont.GetFamilyName());
-aUsedBullets.emplace_back(sBullet + sFontName);
+aUsedBullets.emplace(sBullet + sFontName);
}
}
return aUsedBullets;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index d2d2a0749043..6a60cd47dd40 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -876,7 +876,7 @@ const SwNumRule * SwEditShell::SearchNumRule( const bool
bNum,
sListId, GetLayout() );
}
-std::vector SwEditShell::GetUsedBullets()
+std::set SwEditShell::GetUsedBullets()
{
return GetDoc()->GetUsedBullets();
}
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index fa4de6bd9d0d..4606b6228bbc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2855,7 +2855,9 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_BUL_GET_DOC_BULLETS:
{
-std::vector aBullets = rSh.GetUsedBullets();
+std::set aBulletsSet = rSh.GetUsedBullets();
+std::vector aBullets;
+std::copy(aBulletsSet.begin(), aBulletsSet.end(),
std::back_inserter(aBullets));
SfxStringListItem aItem(FN_BUL_GET_DOC_BULLETS);
uno::Sequence aSeq(aBullets.data(),
static_cast(aBullets.size()));
core.git: vcl/source
vcl/source/control/imivctl1.cxx | 27 +++
vcl/source/control/ivctrl.cxx |4 ++--
2 files changed, 17 insertions(+), 14 deletions(-)
New commits:
commit f6ea343e6fb2dc3539823dee60c9c6f96fc16275
Author: Samuel Mehrbrodt
AuthorDate: Thu May 30 12:26:11 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 3 09:32:06 2024 +0200
tdf#161030 Improve vertical Tab list display
* Increase width a bit to allow for longer tab names
* Avoid jumping while moving through the list with arrow keys
Change-Id: Ie418dd40c5f69dcdea8fa07743ff26e3c9e04ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168251
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index ea69fbcfb99b..dca91c7d4163 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -92,7 +92,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( true );
-Size gridSize((nWinStyle & WB_DETAILS) ? 200 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
+Size gridSize((nWinStyle & WB_DETAILS) ? 150 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
if(pView->GetDPIScaleFactor() > 1)
{
gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
@@ -1942,19 +1942,22 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const
tools::Rectangle& rRect, bool bS
else
nDy = 0;
-tools::Long nDx;
-if( aVirtRect.Left() < aOutputArea.Left() )
-{
-// scroll to the left (nDx < 0)
-nDx = aVirtRect.Left() - aOutputArea.Left();
-}
-else if( aVirtRect.Right() > aOutputArea.Right() )
+tools::Long nDx = 0;
+
+// no horizontal scrolling needed in list mode
+if (!(nWinBits & WB_DETAILS))
{
-// scroll to the right (nDx > 0)
-nDx = aVirtRect.Right() - aOutputArea.Right();
+if( aVirtRect.Left() < aOutputArea.Left() )
+{
+// scroll to the left (nDx < 0)
+nDx = aVirtRect.Left() - aOutputArea.Left();
+}
+else if( aVirtRect.Right() > aOutputArea.Right() )
+{
+// scroll to the right (nDx > 0)
+nDx = aVirtRect.Right() - aOutputArea.Right();
+}
}
-else
-nDx = 0;
aOrigin.AdjustX(nDx );
aOrigin.AdjustY(nDy );
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index cb0c4e33d0c3..c17a0caf359d 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -447,9 +447,9 @@ VerticalTabControl::VerticalTabControl(vcl::Window*
pParent, bool bWithIcons)
SetType(WindowType::VERTICALTABCONTROL);
m_xChooser->SetSelectionMode(SelectionMode::Single);
m_xChooser->SetClickHdl(LINK(this, VerticalTabControl, ChosePageHdl_Impl));
-m_xChooser->set_width_request(110);
+m_xChooser->set_width_request(150);
m_xChooser->set_height_request(400);
-m_xChooser->SetSizePixel(Size(110, 400));
+m_xChooser->SetSizePixel(Size(150, 400));
m_xBox->set_vexpand(true);
m_xBox->set_hexpand(true);
m_xBox->set_expand(true);
core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/drawtemplatedialog.ui |2 +-
sc/uiconfig/scalc/ui/pagetemplatedialog.ui |2 +-
sc/uiconfig/scalc/ui/paratemplatedialog.ui |2 +-
sd/uiconfig/simpress/ui/templatedialog.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog1.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog16.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog2.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog4.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog8.ui |2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 797e879990f9db3373197a5a83639ad5aebba8c8
Author: Samuel Mehrbrodt
AuthorDate: Sat Apr 27 10:21:09 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 3 08:27:18 2024 +0200
Rename 'Organizer' to 'General' in style dialogs
This tab page has general information about the style - name, inheritance,
etc.
Change-Id: Ie06cf8b149a369117c5102ba7e2aae0d97249b83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166773
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
index df4c63ccfaa7..7a2881c3bd35 100644
--- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
@@ -123,7 +123,7 @@
True
False
-Organizer
+General
False
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index 09910e0d3776..41caaf10d788 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -124,7 +124,7 @@
True
False
-Organizer
+General
False
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index 903884b72156..1b72bd1d9132 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -123,7 +123,7 @@
True
False
-Organizer
+General
False
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui
b/sd/uiconfig/simpress/ui/templatedialog.ui
index 43ffe5db66ff..b08c242463ca 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -123,7 +123,7 @@
True
False
-Organizer
+General
False
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index a2228d743f17..acf3f3c141ba 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -144,7 +144,7 @@
True
False
-Organizer
+General
False
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui
b/sw/uiconfig/swriter/ui/templatedialog16.ui
index e3026565f5ac..8c8ff4799606 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -140,7 +140,7 @@
True
False
Name and hide user-defined
styles
-Organizer
+General
False
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 35dbb8a6a8fc..97fde7653f39 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -138,7 +138,7 @@
True
False
-Organizer
+General
False
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 453e75bc92b3..0df01f60d447 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -139,7 +139,7 @@
True
False
-Organizer
+General
False
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui
b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 61c439ff6488..a9510e9d842f 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -139,7 +139,7 @@
True
True
-Organizer
+General
False
core.git: vcl/inc vcl/source
vcl/inc/verticaltabctrl.hxx |2 ++
vcl/source/control/imivctl1.cxx |4 ++--
vcl/source/control/ivctrl.cxx | 14 ++
3 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 68260d7525aeaf38ac09ca9920fa1fa76dc8018a
Author: Samuel Mehrbrodt
AuthorDate: Mon Apr 29 15:14:48 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri May 31 13:45:24 2024 +0200
tdf#99528 Move through tabs with Ctrl-PageUp/Down keys
As required by test_tab_navigation unit test
Change-Id: Ia77aa57de420574922b4fd4a0759f18c2dc778f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166856
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx
index e00770b8d1f8..99c6cfeceeb0 100644
--- a/vcl/inc/verticaltabctrl.hxx
+++ b/vcl/inc/verticaltabctrl.hxx
@@ -53,6 +53,8 @@ public:
virtual ~VerticalTabControl() override;
virtual void dispose() override;
+virtual bool EventNotify(NotifyEvent& rNEvt) override;
+
sal_uInt16 GetPageCount() const { return m_xChooser->GetEntryCount(); }
const OUString& GetCurPageId() const { return m_sCurrentPageId; }
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 3071083494e1..ea69fbcfb99b 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -879,7 +879,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent&
rKEvt )
if( pCursor )
{
MakeEntryVisible( pCursor );
-if( nCode == KEY_UP )
+if( nCode == KEY_UP || (rKEvt.GetKeyCode().IsMod1() && nCode
== KEY_PAGEUP))
pNewCursor = pImpCursor->GoUpDown(pCursor,false);
else
pNewCursor = pImpCursor->GoPageUpDown(pCursor,false);
@@ -901,7 +901,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent&
rKEvt )
case KEY_PAGEDOWN:
if( pCursor )
{
-if( nCode == KEY_DOWN )
+if( nCode == KEY_DOWN || (rKEvt.GetKeyCode().IsMod1() && nCode
== KEY_PAGEDOWN) )
pNewCursor=pImpCursor->GoUpDown( pCursor,true );
else
pNewCursor=pImpCursor->GoPageUpDown( pCursor,true );
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index c7e76a75eab0..cb0c4e33d0c3 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -481,6 +481,20 @@ IMPL_LINK_NOARG(VerticalTabControl, ChosePageHdl_Impl,
SvtIconChoiceCtrl*, void)
SetCurPageId(pData->sId);
}
+bool VerticalTabControl::EventNotify(NotifyEvent& rNEvt)
+{
+if (rNEvt.GetType() == NotifyEventType::KEYINPUT)
+{
+sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+if (nCode == KEY_PAGEUP || nCode == KEY_PAGEDOWN)
+{
+m_xChooser->DoKeyInput(*(rNEvt.GetKeyEvent()));
+return true;
+}
+}
+return VclHBox::EventNotify(rNEvt);
+}
+
void VerticalTabControl::ActivatePage()
{
m_aActivateHdl.Call( this );
Re: ESC meeting agenda: 2024-05-23 16:00 CEST
* Vertical tabpages state (Samuel) + review the state in 1 week Here's the list of related bugs: *tdf#161006, tdf#161020, tdf#161047, tdf#161049 *Fixed with https://gerrit.libreoffice.org/c/core/+/168081 *tdf#161026 *Unclear problem, NEEDINFO *tdf#161030 *Fixed with https://gerrit.libreoffice.org/c/core/+/168251 So this should be in an acceptable state for 24.8 hopefully. Regards Samuel
core.git: sd/qa
sd/qa/unit/data/odp/tdf156955.odp |binary
sd/qa/unit/layout-tests.cxx |8
2 files changed, 8 insertions(+)
New commits:
commit 16da2bc87145f07f6f84fa69c76d461a31aea139
Author: Samuel Mehrbrodt
AuthorDate: Thu May 16 14:03:30 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu May 16 15:57:59 2024 +0200
tdf#156955 Add test
Change-Id: I02d2f437c3847970441dd489cc60beaf278b8d78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167741
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/qa/unit/data/odp/tdf156955.odp
b/sd/qa/unit/data/odp/tdf156955.odp
new file mode 100644
index ..ae8af600aa6d
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf156955.odp differ
diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx
index 8143b82e5a1b..7c15cad69954 100644
--- a/sd/qa/unit/layout-tests.cxx
+++ b/sd/qa/unit/layout-tests.cxx
@@ -323,6 +323,14 @@ CPPUNIT_TEST_FIXTURE(SdLayoutTest,
testFitToFrameTextFitting)
#endif
}
+CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTdf156955)
+{
+xmlDocUniquePtr pXmlDoc = load("odp/tdf156955.odp");
+
+// Make sure text box has the right size - without the fix it was 2759.
+assertXPath(pXmlDoc, "/metafile/push/push/textarray[5]"_ostr, "y"_ostr,
"3183");
+}
+
CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTdf148966)
{
// Test related to IgnoreBreakAfterMultilineField compatibility flag.
core.git: include/svx sd/source svx/sdi svx/source svx/uiconfig sw/inc sw/sdi sw/source
include/svx/nbdtmg.hxx |3
include/svx/numvset.hxx |7 ++
include/svx/svxids.hrc |7 +-
sd/source/ui/func/fuolbull.cxx |2
svx/sdi/svx.sdi | 18 +
svx/source/dialog/svxbmpnumvalueset.cxx | 26 +++-
svx/source/sidebar/nbdtmg.cxx| 24 +++
svx/source/tbxctrls/bulletsnumbering.cxx | 100 +--
svx/uiconfig/ui/numberingwindow.ui | 69 +
sw/inc/doc.hxx |1
sw/inc/editsh.hxx|1
sw/sdi/_textsh.sdi |5 +
sw/source/core/doc/docnum.cxx| 20 ++
sw/source/core/edit/ednumber.cxx |5 +
sw/source/uibase/shells/textsh1.cxx | 10 +++
sw/source/uibase/shells/txtnum.cxx | 18 -
16 files changed, 300 insertions(+), 16 deletions(-)
New commits:
commit c8a5dc46d11f2ef1e3a66d633730d9a700ced24a
Author: Samuel Mehrbrodt
AuthorDate: Mon May 6 09:20:58 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu May 16 09:17:09 2024 +0200
tdf#161056 Show bullets used in document in bullets dropdown
Change-Id: I40cfc39501006146f7c6c04a1f3c7cf877c6f1c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167186
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 894304e4c37d..8979b736e40c 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -145,7 +145,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
};
-class BulletsTypeMgr final : public NBOTypeMgrBase
+class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
@@ -161,6 +161,7 @@ class BulletsTypeMgr final : public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override;
+void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
std::u16string_view sFont, sal_uInt16 mLevel,bool isResetSize=false);
virtual OUString GetDescription(sal_uInt16 nIndex, bool isDefault)
override;
virtual bool IsCustomized(sal_uInt16 nIndex) override;
static BulletsTypeMgr& GetInstance();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 059d6b7bc558..d3b6e71a69e1 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -40,6 +40,7 @@ namespace com::sun::star {
enum class NumberingPageType
{
+DOCBULLET,
BULLET,
SINGLENUM,
OUTLINE,
@@ -55,6 +56,9 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
css::uno::Reference xFormatter;
css::lang::Locale aLocale;
+// Pair of bullet chars (first), and their respective font (second)
+std::vector> maCustomBullets;
+
css::uno::Sequence<
css::uno::Sequence<
css::beans::PropertyValue> > aNumSettings;
@@ -82,6 +86,9 @@ public:
css::uno::Reference const &
xFormatter,
const css::lang::Locale& rLocale);
+std::vector> GetCustomBullets() { return
maCustomBullets; }
+void SetCustomBullets(std::vector>
aCustomBullets);
+
virtual FactoryFunction GetUITestFactory() const override;
};
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b4e1a91d386a..68d02d4a86fc 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -185,6 +185,7 @@ class XFillGradientItem;
#define FN_BUL_NUM_RULE_INDEX TypedWhichId(FN_EDIT + 120) //
achieving num rule index
#define FN_NUM_NUM_RULE_INDEX TypedWhichId(FN_EDIT + 121)
#define FN_OUTLINE_RULE_INDEX TypedWhichId(FN_EDIT + 122)
+#define FN_BUL_GET_DOC_BULLETS TypedWhichId(FN_EDIT + 123)
#define FN_INSERT (SID_SW_START + 300) // 20300
#define FN_DELETE_BOOKMARK TypedWhichId(FN_INSERT + 1)
@@ -1058,8 +1059,12 @@ class XFillGradientItem;
#define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1210
)
#define SID_SET_DOCUMENT_LANGUAGE
TypedWhichId( SID_SVX_START + 1211 )
+#define SID_ATTR_BULLET_CHAR
TypedWhichId(SID_SVX_START + 1212)
+#define SID_ATTR_BULLET_FONT
TypedWhichId(SID_SVX_START + 1213)
+#define SID_ATTR_BULLET_INDEX
TypedWhichId(SID_SVX_START + 1214)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1211
+ 1 )
+#define SID_SVX_FIRSTFREE ( SID_SVX_START + 121
core.git: Branch 'libreoffice-24-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Paths.xcu |5 + 1 file changed, 5 insertions(+) New commits: commit 81bc6152fecfb9220ec1a36b8a7edc8634467e19 Author: Samuel Mehrbrodt AuthorDate: Thu May 2 10:23:22 2024 +0200 Commit: Xisco Fauli CommitDate: Tue May 7 18:17:02 2024 +0200 tdf#160153 Restore Storage config item Revert "[API CHANGE] Remove deprecated Storage config item" This reverts commit 3cee7edeb31ac64e078159c7a63ebf4f54793da7. As documented in the bug report, the config item is still used. Thus, remove the deprecation notice, too. Change-Id: Ia9beefe8e98bce8d70c546d27999d81c5cc9fd62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166904 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins (cherry picked from commit 80fcd2290dfc9748bb7f4e322b22b773b61daa67) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167219 Reviewed-by: Xisco Fauli diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a0aae4547ba8..b5b304b8f362 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -153,6 +153,11 @@ + + +$(userpath)/store + + true
core.git: svx/sdi
svx/sdi/svx.sdi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 505803e2cb4d60153be2218a17ede8e34d95b42e Author: Samuel Mehrbrodt AuthorDate: Mon May 6 14:02:34 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:13:00 2024 +0200 Point to TDF wiki Change-Id: Ib20ecddcdbbfbb39b1160508349e092db4a04e4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167200 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index bc53f325914c..d1eea8e2ca68 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -17,7 +17,7 @@ */ /* - * See https://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2#Slot_definitions + * See https://wiki.documentfoundation.org/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2#Slot_definitions * for details on what these mean, and what values to use. * Likely many of the existing ones are not defined correctly. *
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Paths.xcu |5 + 1 file changed, 5 insertions(+) New commits: commit 80fcd2290dfc9748bb7f4e322b22b773b61daa67 Author: Samuel Mehrbrodt AuthorDate: Thu May 2 10:23:22 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:12:40 2024 +0200 tdf#160153 Restore Storage config item Revert "[API CHANGE] Remove deprecated Storage config item" This reverts commit 3cee7edeb31ac64e078159c7a63ebf4f54793da7. As documented in the bug report, the config item is still used. Thus, remove the deprecation notice, too. Change-Id: Ia9beefe8e98bce8d70c546d27999d81c5cc9fd62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166904 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a0aae4547ba8..b5b304b8f362 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -153,6 +153,11 @@ + + +$(userpath)/store + + true
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog4.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2f141c543494f44eab05db79533c60d342213901 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:45:44 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 22:12:19 2024 +0200 tdf#99528 Use vertical tabs in frame style dialog Change-Id: Iae4fa2ef7050f963a85b8f348269cbe8f2f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166861 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui index 76911e0709c8..453e75bc92b3 100644 --- a/sw/uiconfig/swriter/ui/templatedialog4.ui +++ b/sw/uiconfig/swriter/ui/templatedialog4.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog8.ui |1 + 1 file changed, 1 insertion(+) New commits: commit e5e9ed7b87072c3c6366f50127cf2b9cf6bf4499 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:01:22 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 14:03:46 2024 +0200 tdf#99528 Use vertical tabs in page dialog Change-Id: Ie4a905be356848c998b3fca457abfec9856c9383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166746 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui index ad3a600c5f04..61c439ff6488 100644 --- a/sw/uiconfig/swriter/ui/templatedialog8.ui +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/paratemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2a41f854ceb2860239b1d7ec8fbc3d460c7499a1 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:34:45 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:45:05 2024 +0200 tdf#99528 Use vertical tabs in Calc paragraph styles dialog Change-Id: I1528a3b38dac3c69b80b294a156359b5dc34f5bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166859 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui index 83d7ff8da59e..903884b72156 100644 --- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/formatcellsdialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 2199e603691a770ea6b67cbaba4ce1e0ce7b1919 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:10:15 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:14:35 2024 +0200 tdf#99528 Use vertical tabs in 'Format cells' dialog Change-Id: Id3ea15b1ae2ea22762f9c645e42548399eec3b0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166748 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index ea0daf8e9fd5..d4104ef99913 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -92,6 +92,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/pagetemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit d71ea85d286a9a89e6cf784da90a820a09c0db2e Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:32:30 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 13:06:27 2024 +0200 tdf#99528 Use vertical tabs in Calc page styles dialog Change-Id: Ia08a7351470a1561269238c29af3da58fc0b8e20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166858 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui index e8b40d391540..09910e0d3776 100644 --- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui @@ -107,6 +107,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog16.ui |1 + 1 file changed, 1 insertion(+) New commits: commit d9bcf481b40d2a20169a98eb53caf7b19a03f3b8 Author: Samuel Mehrbrodt AuthorDate: Mon Apr 29 08:18:23 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 11:55:37 2024 +0200 tdf#99528 Use vertical tabs in list style dialog Change-Id: Ia9bcf82a3966e01fab2181235313c54f6898f0c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166862 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui index f769a21ddd90..e3026565f5ac 100644 --- a/sw/uiconfig/swriter/ui/templatedialog16.ui +++ b/sw/uiconfig/swriter/ui/templatedialog16.ui @@ -122,6 +122,7 @@ True True True +left True True
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/drawtemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 971db10d73a0fe80cceca70d19edd02de30be414 Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:27:31 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 11:02:36 2024 +0200 tdf#99528 Use vertical tabs in Calc draw styles dialog Change-Id: Idff126955c7b4721a2009febbde6a138bc4af93e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166857 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui index b20a03b54dae..df4c63ccfaa7 100644 --- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sd/uiconfig
sd/uiconfig/simpress/ui/templatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 67dc0edb688d345607ae6afe3ad849f143804e28 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 16:39:14 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 10:18:43 2024 +0200 tdf#99528 Use vertical tabs in 'Edit Style' dialog Change-Id: Ia581c92952d16d71ace8511b502304cdb9014479 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166760 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui index 9e424e03d349..43ffe5db66ff 100644 --- a/sd/uiconfig/simpress/ui/templatedialog.ui +++ b/sd/uiconfig/simpress/ui/templatedialog.ui @@ -106,6 +106,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/framedialog.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d700acbcba68e8b56e22db53bfcdfeb4c5777b9c Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 14:49:58 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 6 09:13:04 2024 +0200 tdf#99528 Use vertical tabs in Frame dialog Change-Id: Ie0de985765cd00e376b6e15782fb8ba666af8bf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166741 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui index f5725f3cdfc8..7e8979f0f451 100644 --- a/sw/uiconfig/swriter/ui/framedialog.ui +++ b/sw/uiconfig/swriter/ui/framedialog.ui @@ -1,5 +1,5 @@ - + @@ -92,6 +92,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog1.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 62172db2d71fdc49a3ad9c177b8635353b90a7eb Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:43:43 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 13:14:24 2024 +0200 tdf#99528 Use vertical tabs in character style dialog Change-Id: If6ae98f7d1ca1e92e38b1a277b528fa436791174 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166860 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui index e97d41ab80d2..a2228d743f17 100644 --- a/sw/uiconfig/swriter/ui/templatedialog1.ui +++ b/sw/uiconfig/swriter/ui/templatedialog1.ui @@ -127,6 +127,7 @@ True True True +left True True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/templatedialog8.ui | 361 -- 1 file changed, 59 insertions(+), 302 deletions(-) New commits: commit 951562bc555a6011b39f3c5c02a784d541f01224 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:00:59 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 11:18:00 2024 +0200 Save with newer Glade version Change-Id: Id4d172ebb5265e418b9b3c8bea0a4dacf2ae27cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166745 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui index 10455153fd4a..ad3a600c5f04 100644 --- a/sw/uiconfig/swriter/ui/templatedialog8.ui +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -1,34 +1,31 @@ - + -False -False -6 +False +6 Page Style +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Help True -True -True +True +True True @@ -42,8 +39,8 @@ _Reset True -True -True +True +True True @@ -56,9 +53,9 @@ _Apply True -True -True -True +True +True +True True @@ -71,9 +68,9 @@ Standard True -True -True -True +True +True +True False @@ -85,10 +82,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -101,8 +98,8 @@ _Cancel True -True -True +True +True True @@ -115,47 +112,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -164,42 +137,18 @@ True -True +True Organizer -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -211,43 +160,19 @@ True -True +True Page 1 -False +False True -False
core.git: 2 commits - sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/ui/formatcellsdialog.ui | 287 ++-- sd/uiconfig/simpress/ui/templatedialog.ui | 533 -- 2 files changed, 119 insertions(+), 701 deletions(-) New commits: commit 7e553a56c6a5aa7f4b1f01df52ed9607d3397cfc Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 15:09:59 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 08:30:53 2024 +0200 Save with newer Glade version Change-Id: Ib1380e4771bbeeaebece1bb5bae0617e588ec378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166747 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index b18ec5c62814..ea0daf8e9fd5 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -1,33 +1,30 @@ - + -False -6 +False +6 Format Cells True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True True @@ -40,10 +37,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -56,8 +53,8 @@ _Cancel True -True -True +True +True True @@ -70,8 +67,8 @@ _Help True -True -True +True +True True @@ -85,47 +82,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -134,42 +107,18 @@ True -False +False Numbers -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -181,43 +130,19 @@ True -False +False Font 1 -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -229,43 +154,19 @@ True -False +False Font
core.git: sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/drawtemplatedialog.ui | 503 - sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 265 ++- sc/uiconfig/scalc/ui/paratemplatedialog.ui | 325 +++--- sw/uiconfig/swriter/ui/templatedialog1.ui | 273 ++- sw/uiconfig/swriter/ui/templatedialog16.ui | 287 +++- sw/uiconfig/swriter/ui/templatedialog4.ui | 333 +++ 6 files changed, 336 insertions(+), 1650 deletions(-) New commits: commit 9ec6bfb598f39ebdb3e6698b5411ace951a53a8d Author: Samuel Mehrbrodt AuthorDate: Sat Apr 27 10:15:25 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 2 08:30:22 2024 +0200 Save with newer Glade version Change-Id: I0b3c4d263cef98ae9b28b863e25def3819ca9186 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166772 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui index 2a2ca1f3e632..b20a03b54dae 100644 --- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui @@ -1,33 +1,30 @@ - + -False -6 +False +6 Drawing Style True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True True @@ -40,9 +37,9 @@ _Standard True -True -True -True +True +True +True False @@ -54,10 +51,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -70,8 +67,8 @@ _Cancel True -True -True +True +True True @@ -84,8 +81,8 @@ _Help True -True -True +True +True True @@ -99,47 +96,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -148,42 +121,18 @@ True -False +False Organizer -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -195,43 +144,19 @@ True -True +True Line 1 -False +False True -False
core.git: cui/uiconfig vcl/inc vcl/source
cui/uiconfig/ui/hyperlinkdialog.ui |1
vcl/inc/verticaltabctrl.hxx|2 -
vcl/source/control/imivctl.hxx |2 -
vcl/source/control/imivctl1.cxx| 67 +
vcl/source/control/ivctrl.cxx |4 +-
vcl/source/window/builder.cxx | 14 +++
6 files changed, 50 insertions(+), 40 deletions(-)
New commits:
commit b64751ba28fd69fb2a93a21b10a92b68f4dd2097
Author: Samuel Mehrbrodt
AuthorDate: Fri Apr 26 10:47:00 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Apr 29 07:52:27 2024 +0200
tdf#99528 Properly layout vertical tabs without icons
Implement a proper list mode for VerticalTabControl.
Before this was only used in the Hyperlink dialog with large icons.
Change-Id: I227643392ef4840a70b379734e2993db0f13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166702
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui
b/cui/uiconfig/ui/hyperlinkdialog.ui
index b8819f74d31a..c0eb4f085906 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -123,6 +123,7 @@
True
True
left
+icons
diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx
index c5942799b381..666bef474172 100644
--- a/vcl/inc/verticaltabctrl.hxx
+++ b/vcl/inc/verticaltabctrl.hxx
@@ -49,7 +49,7 @@ class VerticalTabControl final : public VclHBox
VerticalTabPageData* GetPageData(const SvxIconChoiceCtrlEntry* pEntry)
const;
public:
-VerticalTabControl(vcl::Window* pParent);
+VerticalTabControl(vcl::Window* pParent, bool bWithIcons);
virtual ~VerticalTabControl() override;
virtual void dispose() override;
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index 5a052c083efa..c29068442728 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -303,7 +303,7 @@ public:
SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; }
voidSetCursor( SvxIconChoiceCtrlEntry* );
-SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false
);
+SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos );
voidMakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool
bBound = true );
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 1364dc4f44d0..6508c4fe12c3 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -92,7 +92,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( true );
-Size gridSize(100,70);
+Size gridSize((nWinStyle & WB_DETAILS) ? 200 : 100, (nWinStyle &
WB_DETAILS) ? 20 : 70);
if(pView->GetDPIScaleFactor() > 1)
{
gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
@@ -157,11 +157,6 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle )
eSelectionMode = SelectionMode::NONE;
if( !(nWinStyle & (WB_ALIGN_TOP | WB_ALIGN_LEFT)))
nWinBits |= WB_ALIGN_LEFT;
-if( nWinStyle & WB_DETAILS )
-{
-if (!m_pColumns)
-SetColumn( 0, SvxIconChoiceCtrlColumnInfo() );
-}
}
IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar,
void )
@@ -608,7 +603,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const
MouseEvent& rMEvt)
if(aDocPos.X()>=aOutputSize.Width() || aDocPos.Y()>=aOutputSize.Height())
return false;
ToDocPos( aDocPos );
-SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos, true );
+SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos );
if( pEntry )
MakeEntryVisible( pEntry, false );
@@ -785,7 +780,7 @@ bool SvxIconChoiceCtrl_Impl::MouseMove( const MouseEvent&
rMEvt )
return false;
else if( nWinBits & WB_HIGHLIGHTFRAME )
{
-SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos, true );
+SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos );
SetEntryHighlightFrame( pEntry, false );
}
else
@@ -1513,7 +1508,7 @@ void SvxIconChoiceCtrl_Impl::SetNoSelection()
}
}
-SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point&
rDocPos, bool bHit )
+SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos
)
{
CheckBoundingRects();
// search through z-order list from the end
@@ -1522,24 +1517,9 @@ SvxIconChoiceCtrlEntry*
SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos,
{
nCount--;
SvxIconChoiceCtrlEntry* pEntry = maZOrderList[ nCount ];
-if( pEntry->aRect.Contains( rDocPos ) )
-{
-if( bHit )
-
core.git: cui/uiconfig
cui/uiconfig/ui/hyperlinkdialog.ui | 222 ++--- 1 file changed, 63 insertions(+), 159 deletions(-) New commits: commit 535391b31abafb02e5a4451e30a14a5605d05ff4 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 10:09:06 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Sat Apr 27 09:29:14 2024 +0200 Save with newer Glade version Change-Id: If36d812ba976bc3331086b5beb5493f20c0556ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166701 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index c598e02093e4..b8819f74d31a 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -1,33 +1,33 @@ - + -False +False True True -6 +6 Hyperlink -0 -0 -dialog +0 +0 +dialog -False +False True True vertical 6 -False -end +False +end Reset True -True -True +True +True Resets the entries in the dialog to their original state. @@ -44,8 +44,8 @@ Apply True -True -True +True +True Applies the data to your document. @@ -62,10 +62,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +78,8 @@ _Cancel True -True -True +True +True True @@ -97,8 +97,8 @@ _Help True -True -True +True +True True @@ -112,46 +112,22 @@ False True -end +end 0 True -True +True True True -left +left True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -160,14 +136,14 @@ True -False +False vertical True -False -This is where you create a hyperlink to a Web page. -res/hlinettp.png +False +This is where you create a hyperlink to a Web page. +res/hlinettp.png 6 @@ -179,10 +155,10 @@ True -False +False _Internet -True -internet +True +internet False @@ -192,38 +168,14 @@ -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False
core.git: editeng/source
editeng/source/editeng/impedit3.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit d84c900bb78168dd9bd0fd1ea02c0769a5ba5f14 Author: Samuel Mehrbrodt AuthorDate: Mon Jan 15 16:53:50 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Fri Apr 26 11:36:35 2024 +0200 tdf#156955 Properly align text when tabstop is outside of textbox Co-authored-by: Tibor Nagy Change-Id: I9f7ead01d93e0701f8df30ad1dcfe24ef0af7067 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162113 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 72bc2022b1ea..c0a8b1fc734c 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1096,6 +1096,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) aCurrentTab.nTabPortion = nTmpPortion; } +if (nMaxLineWidth < aCurrentTab.nTabPos && nTmpWidth != nMaxLineWidth - 1) +aCurrentTab.nTabPos = nMaxLineWidth - 1; + pPortion->SetKind(PortionKind::TAB); pPortion->SetExtraValue( aCurrentTab.aTabStop.GetFill() ); pPortion->setWidth( aCurrentTab.nTabPos - (nTmpWidth+nStartX) );
core.git: 2 commits - sw/uiconfig
sw/uiconfig/swriter/ui/paradialog.ui | 364 +++--- sw/uiconfig/swriter/ui/templatedialog2.ui | 575 -- 2 files changed, 142 insertions(+), 797 deletions(-) New commits: commit 7bbeba7fe8b094e218bd57f613eaefdf47ff88de Author: Samuel Mehrbrodt AuthorDate: Thu Apr 25 14:46:16 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Apr 26 08:45:02 2024 +0200 Save with newer Glade version Change-Id: I37188d82d87724c70b8e33bc65e56f091d5587e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166623 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui index 0014cf943ddd..3f12d683e6fa 100644 --- a/sw/uiconfig/swriter/ui/paradialog.ui +++ b/sw/uiconfig/swriter/ui/paradialog.ui @@ -1,36 +1,33 @@ - + -False -False -6 +False +6 Paragraph +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True +Unsaved modifications to this tab are reverted. True -Unsaved modifications to this tab are reverted. Revert any changes made on the tab shown here to the settings that were present when this dialog was opened. @@ -45,12 +42,11 @@ -_Standard -False -True -True -True -True +_Standard +True +True +True +True False @@ -62,10 +58,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +74,8 @@ _Cancel True -True -True +True +True True @@ -92,8 +88,8 @@ _Help True -True -True +True +True True @@ -107,47 +103,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -156,42 +128,18 @@ True -False +False Indents & Spacing -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -203,44 +151,20 @@ True -False +False Alignment 0.5 1 -False +False
core.git: 2 commits - helpcontent2 officecfg/registry sd/source
helpcontent2|2 +- officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |2 +- sd/source/ui/view/ToolBarManager.cxx|3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) New commits: commit dee3e2d7c8d412951099e4425e6ece24431cd98d Author: Samuel Mehrbrodt AuthorDate: Thu Apr 25 13:53:18 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Apr 25 18:23:40 2024 +0200 Related tdf#87676 Enable text formatting toolbar when in a text box Use the second row (hiding the shapes toolbar) to show the text formatting toolbar when the user is inside a text box. This helps users to do basic text formatting at the place where they expect the controls from Writer, Calc, etc. Otherwise, when the Sidebar is switched to another Deck, finding the text formatting functions can be hard in the classic toolbar layout. Change-Id: I8d6f54e6f3f44917b0c89ae699c2798e4f6b86a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166621 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index 234502d43185..8475ac8c9847 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -755,7 +755,7 @@ true - false + true Text Formatting diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 7dd95c962499..5296b7bd94ef 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1079,6 +1079,8 @@ void ToolBarRules::SelectionHasChanged ( case ::sd::ViewShell::ST_HANDOUT: mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function, ToolBarManager::msDrawingObjectToolBar); + mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent, + ToolBarManager::msToolBar); break; default: break; @@ -1122,6 +1124,7 @@ void ToolBarRules::SubShellAdded ( break; case ToolbarId::Draw_Text_Toolbox_Sd: + mpToolBarManager->RemoveToolBar(ToolBarManager::ToolBarGroup::Permanent, ToolBarManager::msToolBar); mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTextObjectBar); break; commit bdc90ee923fc68f57fc7234192be2ba512797775 Author: Olivier Hallot AuthorDate: Thu Apr 25 13:23:35 2024 -0300 Commit: Gerrit Code Review CommitDate: Thu Apr 25 18:23:35 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to db688bf5d40a94939f8e6ab35744c267d35b39ab - tdf#132253 Hyperlink tab in Characters is gone. Change-Id: Ic146695c24e488fc5c0d0cebce2e43769ac37a7a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166640 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 686da2a7ece1..db688bf5d40a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 686da2a7ece1ce03db28cfba2747870c88a9ca2e +Subproject commit db688bf5d40a94939f8e6ab35744c267d35b39ab
core.git: include/svx svx/source
include/svx/nbdtmg.hxx|1 -
svx/source/sidebar/nbdtmg.cxx | 11 ++-
2 files changed, 2 insertions(+), 10 deletions(-)
New commits:
commit a600cb4865f2b4bce872a000c2614cf6478b1ee0
Author: Samuel Mehrbrodt
AuthorDate: Thu Apr 25 09:06:57 2024 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Apr 25 13:47:04 2024 +0200
Remove unused fields
Unused since f944648e0f5d52605a267ed50bba4bfc035aecc6
Change-Id: Id5f5a77df8afdf15d99989b86bb04179d86ae92b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166614
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 81ef80223496..894304e4c37d 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -72,7 +72,6 @@ class SVX_DLLPUBLIC BulletsSettings
{
public:
vcl::Font aFont;
-OUStringsDescription;
sal_UCS4cBulletChar;
boolbIsCustomized;
BulletsSettings() : cBulletChar(0), bIsCustomized(false) {}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index ced78fe6bc61..26e26c8a3152 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -341,16 +341,9 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uInt1
}
}
-OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/)
+OUString BulletsTypeMgr::GetDescription(sal_uInt16 /*nIndex*/, bool
/*isDefault*/)
{
-OUString sRet;
-
-if ( nIndex >= DEFAULT_BULLET_TYPES )
-return sRet;
-else
-sRet = pActualBullets[nIndex]->sDescription;
-
-return sRet;
+return OUString();
}
bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e212d987a76f5df1091a1f70ff9557568402d4ba Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 11:24:22 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:23:24 2024 +0200 tdf#33603 Typo: 'Notes Panel' -> 'Notes Pane' Similiar to 'Slide Pane' Change-Id: If96afc4c054bbbff7c9bf8c5f4309e8eeb419d77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166005 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Sarper Akdemir diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 358190e43fae..caffed00b5d4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -26,7 +26,7 @@ - Notes Panel + Notes Pane 1
core.git: sd/sdi
sd/sdi/sdraw.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 39803b859ac935aaec1ad4d66038d3c92d907ae3 Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:55:31 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:23:03 2024 +0200 tdf#33603 Allow adding Notes Panel to toolbar/menubar/keyboard shortcuts Change-Id: Ic3e8f6b5a0cc8697c62e8f10f69ff53859f33d3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166004 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 5a5d192a212a..9c2493ea2476 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4401,9 +4401,9 @@ SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS Asynchron; -AccelConfig = FALSE, -MenuConfig = FALSE, -ToolBoxConfig = FALSE, +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, GroupId = SfxGroupId::View; ]
core.git: 2 commits - officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 sd/Library_sd.mk | 1 sd/inc/app.hrc | 1 sd/sdi/ViewShellBase.sdi | 2 sd/sdi/sdraw.sdi | 4 sd/source/ui/app/sddll.cxx | 2 sd/source/ui/dlg/NotesChildWindow.cxx| 631 -- sd/source/ui/inc/NotesChildWindow.hxx| 107 - sd/source/ui/view/GraphicViewShellBase.cxx | 2 sd/source/ui/view/ViewShellBase.cxx | 4 sd/source/ui/view/drvwshrg.cxx | 4 sd/uiconfig/simpress/menubar/menubar.xml | 2 12 files changed, 10 insertions(+), 752 deletions(-) New commits: commit 933d9d8b4b9e90f3c3f3842af27588a251a699df Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:55:01 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:22:53 2024 +0200 tdf#33603 Make notes panel available in readonly mode Change-Id: I2dd10802f3798b2e87833d3cd8ebd21366e0f546 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166003 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 924f60f61a69..5a5d192a212a 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4393,7 +4393,7 @@ SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS [ AutoUpdate = TRUE, FastCall = FALSE, -ReadOnlyDoc = FALSE, +ReadOnlyDoc = TRUE, Toggle = FALSE, Container = TRUE, RecordAbsolute = FALSE, commit ede2f1e6eefbc6471f0163c21430c2f747bb0e67 Author: Samuel Mehrbrodt AuthorDate: Thu Apr 11 10:19:40 2024 +0200 Commit: Sarper Akdemir CommitDate: Mon Apr 15 08:22:45 2024 +0200 tdf#33603 Fix Close button not working in Notes Pane Remove duplicate command and now unused NotesChildWindow Change-Id: Idef94086ca91dd1474070c426c37ef921ad4fa03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166002 Tested-by: Jenkins Reviewed-by: Sarper Akdemir diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 370984a7e5d9..358190e43fae 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -24,7 +24,7 @@ S~lide - + Notes Panel diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index cd1dba8ac8ca..9180714846d2 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -231,7 +231,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/dlg/AnimationChildWindow \ sd/source/ui/dlg/LayerTabBar \ sd/source/ui/dlg/NavigatorChildWindow \ - sd/source/ui/dlg/NotesChildWindow \ sd/source/ui/dlg/PaneChildWindows \ sd/source/ui/dlg/PaneShells \ sd/source/ui/dlg/SpellDialogChildWindow \ diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 45d20f874d38..7a2334b47ed8 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -422,7 +422,6 @@ #define SID_LEFT_PANE_IMPRESS (SID_SD_START+414) #define SID_LEFT_PANE_DRAW (SID_SD_START+415) #define SID_BOTTOM_PANE_IMPRESS (SID_SD_START+416) -#define SID_NOTES_WINDOW(SID_SD_START+417) // FREE #define SID_NORMAL_MULTI_PANE_GUI TypedWhichId(SID_SD_START+420) #define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421) diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index f39368368f1d..f196e549ba25 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -32,7 +32,7 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] -SID_NOTES_WINDOW +SID_BOTTOM_PANE_IMPRESS [ ExecMethod = Execute; StateMethod = GetState; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index ce0eb521e9ec..924f60f61a69 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4388,7 +4388,7 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW GroupId = SfxGroupId::Modify; ] -SfxVoidItem NotesChildWindow SID_NOTES_WINDOW +SfxBoolItem BottomPaneImpress SID_BOTTOM_PANE_IMPRESS [ AutoUpdate = TRUE, diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 67019328b6e2..c1e76ee7e0a7 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include
core.git: Branch 'feature/cib_contract49' - 2 commits - cui/source include/svx officecfg/registry sc/source svx/source sw/qa
cui/source/tabpages/numpages.cxx | 23 +-
include/svx/strings.hrc|9 --
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 35 +
sc/source/ui/view/output2.cxx | 14 ++-
svx/source/dialog/svxbmpnumvalueset.cxx| 48 -
svx/source/sidebar/nbdtmg.cxx | 26 ++-
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py |3
7 files changed, 74 insertions(+), 84 deletions(-)
New commits:
commit 22abd40d51fd6be26eae529a3380c09a5b647cec
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 11:55:30 2024 +0100
Commit: Thorsten Behrens
CommitDate: Sun Apr 7 01:00:16 2024 +0200
tdf#108697 Allow modifying default bullet selection
Allow to change bullets in configuration.
Change-Id: Iab26118dd597417997d6f0a7355f516a4da97ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163735
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 2179ad2cf107..efd1192bc03d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
@@ -119,19 +120,6 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const
SequenceGetSelectedItemId() - 1];
-const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
+sal_Unicode cChar =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get()[nIndex].toChar();
+vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+rActBulletFont.SetFamilyName(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get()[nIndex]);
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 80066b3d33f3..75e0c42cffbb 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1367,15 +1367,6 @@
#define RID_SVXSTR_ERR_OLD_PASSWD
NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password")
#define RID_SVXSTR_ERR_REPEAT_PASSWD
NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match")
-#define RID_SVXSTR_BULLET_DESCRIPTION_0
NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_1
NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_2
NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_3
NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_4
NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled
out")
-#define RID_SVXSTR_BULLET_DESCRIPTION_5
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_6
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_7
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
-
// do not translate this; instead describe the nth numbering style
(LC_NumberingLevel) defined by your locale
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 9fe1915a8b9c..616ae5bf2955 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3343,6 +3343,41 @@
+
+
+Contains Favorite characters
+
+
+
+ List of default bullets
+
+
+ •
+ ●
+
+
+ ➔
+ ➢
+ ✗
+ ✔
+
+
+
+
+ List of default bullet fonts. Matching font for
`DefaultBullets`.
+
+
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+
core.git: Branch 'libreoffice-24-2' - sw/qa sw/source
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 11 +++
sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt |binary
sw/source/core/access/AccessibilityCheck.cxx |5 +
3 files changed, 16 insertions(+)
New commits:
commit 7a61065bb8ccf33fb1918218bf2febd30e786bf4
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 18 15:19:42 2024 +0100
Commit: Caolán McNamara
CommitDate: Sun Mar 31 22:37:34 2024 +0200
tdf#159918 a11y check: Don't warn about tabs in ToC
Change-Id: Ifde41deb66c8dcb72842e18e539609ff351be832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164972
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit c6075e716200e9c6bae1b10be2cf10013958e83a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165424
Reviewed-by: Caolán McNamara
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 117b48d01661..bfe2e08d8543 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -251,6 +251,17 @@ scanAccessibilityIssuesOnNodes(SwDoc* pDocument)
return aIssues;
}
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckTabsinTOC)
+{
+createSwDoc("Tabs-in-TOC.odt");
+SwDoc* pDoc = getSwDoc();
+CPPUNIT_ASSERT(pDoc);
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(0), aIssues.size());
+}
+
void checkIssuePosition(std::shared_ptr const&
pIssue, int nLine,
sal_Int32 nStart, sal_Int32 nEnd, SwNodeOffset nIndex)
{
diff --git a/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
new file mode 100644
index ..2b3ce54cc5a3
Binary files /dev/null and b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index e515b5cae7ed..dfa94c3ed9ab 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -901,6 +901,11 @@ public:
}
case ' ':
{
+// Don't warn about tabs in ToC
+auto pSection =
SwDoc::GetCurrSection(SwPosition(*pTextNode, 0));
+if (pSection && pSection->GetTOXBase())
+continue;
+
if (bPreviousWasChar)
{
++nTabCount;
core.git: sw/qa sw/source
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 11 +++
sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt |binary
sw/source/core/access/AccessibilityCheck.cxx |5 +
3 files changed, 16 insertions(+)
New commits:
commit c6075e716200e9c6bae1b10be2cf10013958e83a
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 18 15:19:42 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Mar 28 10:43:17 2024 +0100
tdf#159918 a11y check: Don't warn about tabs in ToC
Change-Id: Ifde41deb66c8dcb72842e18e539609ff351be832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164972
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 117b48d01661..bfe2e08d8543 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -251,6 +251,17 @@ scanAccessibilityIssuesOnNodes(SwDoc* pDocument)
return aIssues;
}
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckTabsinTOC)
+{
+createSwDoc("Tabs-in-TOC.odt");
+SwDoc* pDoc = getSwDoc();
+CPPUNIT_ASSERT(pDoc);
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollection().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(0), aIssues.size());
+}
+
void checkIssuePosition(std::shared_ptr const&
pIssue, int nLine,
sal_Int32 nStart, sal_Int32 nEnd, SwNodeOffset nIndex)
{
diff --git a/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
new file mode 100644
index ..2b3ce54cc5a3
Binary files /dev/null and b/sw/qa/core/accessibilitycheck/data/Tabs-in-TOC.odt
differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index d43a6919adf2..a1fed7c1ffd1 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -907,6 +907,11 @@ public:
}
case ' ':
{
+// Don't warn about tabs in ToC
+auto pSection =
SwDoc::GetCurrSection(SwPosition(*pTextNode, 0));
+if (pSection && pSection->GetTOXBase())
+continue;
+
if (bPreviousWasChar)
{
++nTabCount;
core.git: Branch 'feature/allo_contract45533' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0bda223a7e5d31d02c974f3ad0c4073176a385a6 Author: Samuel Mehrbrodt AuthorDate: Tue Mar 19 08:33:41 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Mar 19 08:33:41 2024 +0100 Release 7.6.6.3 diff --git a/configure.ac b/configure.ac index ca0808baea3e..db853c345ef8 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.6.6.1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.6.3],[],[],[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
core.git: Branch 'feature/cib_contract49' - 6 commits - sd/source svx/source sw/qa sw/source
sd/source/ui/func/fuformatpaintbrush.cxx| 11 -
svx/source/svdraw/svdedxv.cxx |4
sw/qa/extras/uiwriter/uiwriter6.cxx | 98
sw/source/core/doc/DocumentContentOperationsManager.cxx | 86 +++---
sw/source/core/txtnode/txatritr.cxx |9 -
sw/source/uibase/shells/textsh.cxx | 15 ++
6 files changed, 189 insertions(+), 34 deletions(-)
New commits:
commit 8d5440ff250cc5c9f071f312f5d6d48c91cdb068
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 7 22:51:51 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:33:50 2024 +0100
tdf#160071 Don't clone formatting to whole boxes
when clicking into an empty area of that box
Change-Id: I383f1584f446e29454eda2177c8bae0f6587e42d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164555
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index ef1ea258c78f..d4476f4b7ca6 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -146,13 +146,6 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent&
rMEvt)
}
unmarkimpl( mpView );
-
-if (aVEvt.mpObj)
-{
-sal_uInt16 nHitLog = sal_uInt16 (
mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),
nHitLog, false/*bToggle*/);
-return true;
-}
}
return false;
}
commit 792b099e9de18f7c6e2099199452827a4b8401bf
Author: Oliver Specht
AuthorDate: Thu Mar 7 12:47:22 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:32:52 2024 +0100
tdf#159726 Improve Clone formatting
Paragraph attributes and lists are copied if there is no source
selection or the source selection includes at least a full paragraph.
They are only applied to an empty or a paragraph selection.
As in tdf#160069 requested the clone formatting function is only enabled
in text edit mode.
Change-Id: I789402a7928837bb85ec941fd6f958d12585ac40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164533
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
(cherry picked from commit 456d0216aae69c39b12a5df749525589871272a7)
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 9bbd30939d53..ef1ea258c78f 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -290,7 +290,9 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats,
bool bNoParagraphForma
if( rMarkList.GetMarkCount() == 1 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-if( pObj &&
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
+const OutlinerView* pOLV =
rDrawViewShell.GetDrawView()->GetTextEditOutlinerView();
+if( pObj && pOLV &&
+
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
return;
}
rSet.DisableItem( SID_FORMATPAINTBRUSH );
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 6955e52b3fc7..7a8d71e0d34b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2814,7 +2814,9 @@ sal_Int32
SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr& rFor
OutlinerView* pOLV = GetTextEditOutlinerView();
-bool isParaSelection = pOLV ? pOLV->GetEditView().IsSelectionFullPara() :
false;
+bool isParaSelection
+= pOLV ? !pOLV->GetEditView().HasSelection() ||
pOLV->GetEditView().IsSelectionFullPara()
+ : false;
rFormatSet = std::make_shared(GetModel().GetItemPool(),
GetFormatRangeImpl(pOLV !=
nullptr, isParaSelection));
if (pOLV)
commit 3c3022ba86cedc083d2f22c2517c6de9a9bef676
Author: Stephan Bergmann
AuthorDate: Mon Nov 6 15:44:46 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:29:11 2024 +0100
Fix SwLanguageIterator::Next for RES_TXTATR_AUTOFMT
...following advice by mstahl, as discussed in the comments starting at
<https://gerrit.libreoffice.org/c/core/+/158732/2#message-053bc195667ee3ba396ed12a85f3af8d4b7e5efc>
"tdf#157667 sw track changes: fix cycle case on multiple words", which had
started to cause
> /sw/inc/txatritr.hxx:69:18: runtime error: downcast of address
0x603001b45d90 which does not point to an object of type 'const SvxLanguageItem'
> 0x603001b45d90: note: object is of type 'SwFormatAutoForma
core.git: sd/source
sd/source/ui/func/fuformatpaintbrush.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 9476f5ae4bff9817b9e699f7abea5690ec7ffd87
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 7 22:51:51 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 8 04:33:29 2024 +0100
tdf#160071 Don't clone formatting to whole boxes
when clicking into an empty area of that box
Change-Id: I383f1584f446e29454eda2177c8bae0f6587e42d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164555
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 89eecc13f989..d66e00466072 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -145,13 +145,6 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent&
rMEvt)
}
unmarkimpl( mpView );
-
-if (aVEvt.mpObj)
-{
-sal_uInt16 nHitLog = sal_uInt16 (
mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),
nHitLog, false/*bToggle*/);
-return true;
-}
}
return false;
}
core.git: cui/source include/svx officecfg/registry svx/source sw/qa
cui/source/tabpages/numpages.cxx | 23 +-
include/svx/strings.hrc|9 --
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 35 +
svx/source/dialog/svxbmpnumvalueset.cxx| 48 -
svx/source/sidebar/nbdtmg.cxx | 26 ++-
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py |3
6 files changed, 66 insertions(+), 78 deletions(-)
New commits:
commit f944648e0f5d52605a267ed50bba4bfc035aecc6
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 11:55:30 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 13:26:20 2024 +0100
tdf#108697 Allow modifying default bullet selection
Allow to change bullets in configuration.
Change-Id: Iab26118dd597417997d6f0a7355f516a4da97ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163735
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 36868e3579ab..8bba652c594e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -55,6 +55,7 @@
#include
#include
#include
+#include
#include
#include
@@ -122,19 +123,6 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const
SequenceGetSelectedItemId() - 1];
-const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;
+sal_Unicode cChar =
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get()[nIndex].toChar();
+vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+rActBulletFont.SetFamilyName(
+
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get()[nIndex]);
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index eb8e06f0c4c7..3813f9dfceca 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1367,15 +1367,6 @@
#define RID_SVXSTR_ERR_OLD_PASSWD
NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password")
#define RID_SVXSTR_ERR_REPEAT_PASSWD
NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match")
-#define RID_SVXSTR_BULLET_DESCRIPTION_0
NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_1
NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_2
NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_3
NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_4
NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled
out")
-#define RID_SVXSTR_BULLET_DESCRIPTION_5
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_6
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
-#define RID_SVXSTR_BULLET_DESCRIPTION_7
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
-
// do not translate this; instead describe the nth numbering style
(LC_NumberingLevel) defined by your locale
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index adfa422f01b0..e43a6ac23765 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3327,6 +3327,41 @@
+
+
+Contains Favorite characters
+
+
+
+ List of default bullets
+
+
+ •
+ ●
+
+
+ ➔
+ ➢
+ ✗
+ ✔
+
+
+
+
+ List of default bullet fonts. Matching font for
`DefaultBullets`.
+
+
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+ OpenSymbol
+
+
+
Contains settings that specify the common
core.git: svx/source
svx/source/dialog/svxbmpnumvalueset.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit db54b44c15ed234b54ed81998ec824f0770b1b3c
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 12:42:52 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 07:41:41 2024 +0100
Fix indentation
Change-Id: If70ef4b92e6998be5d18b8b557fab27c17bb11bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163747
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 802e881ec1da..29dc2ddcc3df 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -440,9 +440,9 @@ void SvxNumValueSet::SetNumberingSettings(
SetStyle( GetStyle()|WB_VSCROLL);
for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
{
-InsertItem( i + 1, i );
-if( i < 8 )
-SetItemText(i + 1,
SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
+InsertItem(i + 1, i);
+if (i < 8)
+SetItemText(i + 1, SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
}
}
core.git: include/svx svx/source svx/uiconfig
include/svx/strings.hrc |1 -
svx/source/tbxctrls/bulletsnumbering.cxx |2 --
svx/uiconfig/ui/numberingwindow.ui |3 ++-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit fe4cd0cebdbf9412e26f8182e79f97bb844d94af
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 22 14:09:12 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 26 07:41:02 2024 +0100
Set button label directly in ui file
Change-Id: If9e22982f4f7c276d19167ff365e1b4e290e3de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163748
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c43bf8203981..eb8e06f0c4c7 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1108,7 +1108,6 @@
#define RID_SVXSTR_DEFAULT
NC_("RID_SVXSTR_DEFAULT", "Default")
#define RID_SVXSTR_FRAME
NC_("RID_SVXSTR_FRAME", "Borders")
#define RID_SVXSTR_FRAME_STYLE
NC_("RID_SVXSTR_FRAME_STYLE", "Border Style")
-#define RID_SVXSTR_CUSTOMIZE
NC_("RID_SVXSTR_CUSTOMIZE", "Customize...")
#define RID_SVXSTR_BY_AUTHOR
NC_("RID_SVXSTR_BY_AUTHOR", "By author")
#define RID_SVXSTR_PAGES
NC_("RID_SVXSTR_PAGES", "Pages")
#define RID_SVXSTR_CLEARFORM
NC_("RID_SVXSTR_CLEARFORM", "Clear formatting")
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx
b/svx/source/tbxctrls/bulletsnumbering.cxx
index e1a55a112346..e7ccc6238800 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -107,7 +107,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
mxValueSet->SetOutputSizePixel(aSize);
mxValueSet->SetColor(Application::GetSettings().GetStyleSettings().GetFieldColor());
-OUString aMoreItemText = SvxResId( RID_SVXSTR_CUSTOMIZE );
if ( mePageType == NumberingPageType::BULLET )
AddStatusListener( ".uno:CurrentBulletListType" );
else if ( mePageType == NumberingPageType::SINGLENUM )
@@ -117,7 +116,6 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl&
rController,
auto xImage =
vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:OutlineBullet",
mrController.getFrameInterface());
mxMoreButton->set_image(xImage);
-mxMoreButton->set_label(aMoreItemText);
mxMoreButton->connect_clicked(LINK(this, NumberingPopup,
VSButtonClickSetHdl));
mxValueSet->SetSelectHdl(LINK(this, NumberingPopup, VSSelectValueSetHdl));
diff --git a/svx/uiconfig/ui/numberingwindow.ui
b/svx/uiconfig/ui/numberingwindow.ui
index e303830fc01e..db44aeee4d8c 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -1,5 +1,5 @@
-
+
@@ -51,6 +51,7 @@
+Customize...
True
True
True
core.git: cui/uiconfig
cui/uiconfig/ui/securityoptionsdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 132abb81ce48e43a23266345e4c4494c5e200a4f Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 12:25:56 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 19 08:00:11 2024 +0100 Adapt tooltip to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I0718443452b9285c8e7ba0d742aed790ed6a2403 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163433 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui index aa23fef47395..dd09839d8335 100644 --- a/cui/uiconfig/ui/securityoptionsdialog.ui +++ b/cui/uiconfig/ui/securityoptionsdialog.ui @@ -294,7 +294,7 @@ True -Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. +Select to remove user data from file properties, comments and tracked changes when saving.
core.git: include/sfx2
include/sfx2/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70b287d599a2bbddd8c67f51809a0513c2bdb2e6
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 15 16:11:12 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Feb 15 21:22:33 2024 +0100
Improve wording for security warning infobar
Change-Id: I385ec268f4848f02d8fe49d24e32b0b9729acded
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163444
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d28fa1cc22b7..1c3fafa074c0 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -42,7 +42,7 @@
#define STR_AUTOMATICVERSIONNC_("STR_AUTOMATICVERSION",
"Automatically saved version")
#define STR_EXPORTBUTTONNC_("STR_EXPORTBUTTON",
"Export")
#define STR_LABEL_FILEFORMATNC_("STR_LABEL_FILEFORMAT",
"File format:")
-#define STR_HIDDENINFO_CONTAINS NC_("STR_HIDDENINFO_CONTAINS",
"This document contains:
")
+#define STR_HIDDENINFO_CONTAINS NC_("STR_HIDDENINFO_CONTAINS",
"The document contains the following potentially sensitive elements:")
#define STR_HIDDENINFO_RECORDCHANGES
NC_("STR_HIDDENINFO_RECORDCHANGES", "Recorded changes")
#define STR_HIDDENINFO_NOTESNC_("STR_HIDDENINFO_NOTES",
"Notes")
#define STR_HIDDENINFO_DOCVERSIONS
NC_("STR_HIDDENINFO_DOCVERSIONS", "Document versions")
core.git: Branch 'feature/cib_contract49' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1a78c310d641e8ef2c1dce7c23ba12ea6301196 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:57:29 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 14:57:29 2024 +0100 Update git submodules * Update translations from branch 'feature/cib_contract49' to fc16cea11ae46d68031e19e78fe897b888ea4028 - Better translation for hidden info warndialog Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10 diff --git a/translations b/translations index 8c644e56a715..fc16cea11ae4 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 8c644e56a715d9a35c2ad30bae112836451e88fa +Subproject commit fc16cea11ae46d68031e19e78fe897b888ea4028
translations.git: Branch 'feature/cib_contract49' - source/de source/fr
source/de/sfx2/messages.po |2 +- source/fr/sfx2/messages.po |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fc16cea11ae46d68031e19e78fe897b888ea4028 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:57:10 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:57:10 2024 +0100 Better translation for hidden info warndialog Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10 diff --git a/source/de/sfx2/messages.po b/source/de/sfx2/messages.po index 24ec2ee0843..a849981a697 100644 --- a/source/de/sfx2/messages.po +++ b/source/de/sfx2/messages.po @@ -147,7 +147,7 @@ msgid "" "This document contains: " " " msgstr "" -"Das Dokument enthält: " +"Das Dokument enthält folgende möglicherweise sicherheitsrelevante Elemente: " " " #. 8tujE diff --git a/source/fr/sfx2/messages.po b/source/fr/sfx2/messages.po index daa4936507e..ad25a4ccb55 100644 --- a/source/fr/sfx2/messages.po +++ b/source/fr/sfx2/messages.po @@ -147,7 +147,7 @@ msgid "" "This document contains: " " " msgstr "" -"Ce document contient : " +"Ce document contient les éléments suivants susceptibles d'avoir une incidence sur la sécurité: " " " #. 8tujE
core.git: Branch 'feature/cib_contract49' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 07e60be2ca49a60deb448e606c361153c0b251a2 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:37:25 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 14:37:25 2024 +0100 Update git submodules * Update translations from branch 'feature/cib_contract49' to 8c644e56a715d9a35c2ad30bae112836451e88fa - Adjust tooltip translations Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e - Add missing fr translations Follow-up to 79f9243e81eda3ab113d75538686ab81770c2c5d Change-Id: I83351fe0d0ef6c1c17b48e99d1e80ab2cdb03e05 - Add fr translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: I497f6270322380d2d05716e81949434f75df8602 - Backport fr translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I955422a5fd582c6ff9909d89fda76dbbd956a1c5 - Version 7.6.3.2, tag libreoffice-7.6.3.2 Change-Id: I4772fc0f2abffbb8015ee096bb9a4fc6d257d7cb - update translations for 7.6.3 rc2 and force-fix errors using pocheck Change-Id: If5b89e12a3fdc3f94dd4159a89fe0a9c3a1bcf1c (cherry picked from commit 9a36aad0f1471adcb3a93d9be53f9e19aef8b8cf) - Branch libreoffice-7-6-3 This is 'libreoffice-7-6-3' - the stable branch for the 7.6.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I145b9af8d0a5c8319c63b139562c86caa94670e2 - Add translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: Ida57eb3b5034ec57266e8b95928c59a1d5efd065 - Backport translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I597ba186fb8736a50e141da34aea5dbc475f8652 diff --git a/translations b/translations index 102138605bd8..8c644e56a715 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 102138605bd81680ce6b3e4645b956225b9a2b0a +Subproject commit 8c644e56a715d9a35c2ad30bae112836451e88fa
translations.git: Branch 'feature/cib_contract49' - source/de source/fr
source/de/cui/messages.po |4 ++-- source/fr/cui/messages.po |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8c644e56a715d9a35c2ad30bae112836451e88fa Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:36:33 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:37:14 2024 +0100 Adjust tooltip translations Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e diff --git a/source/de/cui/messages.po b/source/de/cui/messages.po index 8ea424a18f5..b7d6bebb8c5 100644 --- a/source/de/cui/messages.po +++ b/source/de/cui/messages.po @@ -19569,8 +19569,8 @@ msgstr "Persönliche _Informationen beim Speichern entfernen" #. kjZqN #: cui/uiconfig/ui/securityoptionsdialog.ui:297 msgctxt "extended_tip|removepersonal" -msgid "Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General." -msgstr "Aktivieren, damit Benutzerdaten immer aus den Datei-Eigenschaften entfernt werden. Ist diese Option nicht aktiviert, können Sie die persönlichen Informationen für das aktuelle Dokument immer noch unter »Datei ▸ Eigenschaften… ▸ Register: Allgemein« mit der Schaltfläche »Zurücksetzen« entfernen." +msgid "Select to always remove user data from the file properties." +msgstr "Aktivieren, damit Benutzerdaten beim Speichern aus den Datei-Eigenschaften entfernt werden." #. y5FFs #: cui/uiconfig/ui/securityoptionsdialog.ui:308 diff --git a/source/fr/cui/messages.po b/source/fr/cui/messages.po index bf5ff22b2a1..8d4d5b4d838 100644 --- a/source/fr/cui/messages.po +++ b/source/fr/cui/messages.po @@ -19567,8 +19567,8 @@ msgstr "_Supprimer les informations personnelles lors de l'enregistrement" #. kjZqN #: cui/uiconfig/ui/securityoptionsdialog.ui:297 msgctxt "extended_tip|removepersonal" -msgid "Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General." -msgstr "Cliquez ici pour que les données d'utilisateur soient toujours supprimées des propriétés du fichier. Si cette option n'est pas sélectionnée, vous avez toujours la possibilité de supprimer les informations personnelles du document actif en choisissant Fichier - Propriétés - Général, puis en cliquant sur le bouton Réinitialiser les propriétés." +msgid "Select to always remove user data from the file properties." +msgstr "Cliquez ici pour que les données d'utilisateur soient toujours supprimées des propriétés du fichier." #. y5FFs #: cui/uiconfig/ui/securityoptionsdialog.ui:308
core.git: Branch 'feature/cib_contract49' - cui/uiconfig
cui/uiconfig/ui/securityoptionsdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25bbcea1b875ab0a93972ef34c26f9533f559de3 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 14:32:08 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 15 14:32:08 2024 +0100 Adjust tooltip after recent changes Change-Id: I5690bca0f6bea31b9cf1cf4f00501fdb0b56 diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui index 62c4c7be93da..1d10b7191cc7 100644 --- a/cui/uiconfig/ui/securityoptionsdialog.ui +++ b/cui/uiconfig/ui/securityoptionsdialog.ui @@ -294,7 +294,7 @@ True -Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. +Select to always remove user data from the file properties.
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5d06a8032b1eec029f408411f432d76addbdf76 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 13:19:20 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Feb 15 13:19:20 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c1725e2c3209e09c04c22bdfbe4e933d6aec67dc - Adapt help to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I1f02667cc8aff9f74b84a0ee2f4e06ba8ded4be2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163435 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index ac406bcc9472..c1725e2c3209 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ac406bcc94724248ab5d2327a65dd0bf821e18c3 +Subproject commit c1725e2c3209e09c04c22bdfbe4e933d6aec67dc
help.git: source/text
source/text/shared/optionen/securityoptionsdialog.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1725e2c3209e09c04c22bdfbe4e933d6aec67dc Author: Samuel Mehrbrodt AuthorDate: Thu Feb 15 12:45:27 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Feb 15 13:19:19 2024 +0100 Adapt help to recent changes This option is not the equivalent of resetting the user properties in File->Properties, so remove that information from the tooltip. Change-Id: I1f02667cc8aff9f74b84a0ee2f4e06ba8ded4be2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163435 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/optionen/securityoptionsdialog.xhp b/source/text/shared/optionen/securityoptionsdialog.xhp index 162a856f79..385ec61f53 100644 --- a/source/text/shared/optionen/securityoptionsdialog.xhp +++ b/source/text/shared/optionen/securityoptionsdialog.xhp @@ -56,7 +56,7 @@ Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments. Remove personal information on saving - Select to always remove user data from file properties, comments and tracked changes. The names of authors in comments and changes will be replaced by generic values as "Author1", "Author2" and so forth. Time values will also be reset to a single standard value. If this option is not selected, you can still remove the personal information for the current document with the Reset Properties button on File - Properties - General. + Select to remove user data from file properties, comments and tracked changes when saving. The names of authors in comments and changes will be replaced by generic values as "Author1", "Author2" and so forth. Time values will also be reset to a single standard value. No personal metadata will be exported. Recommend password protection on saving Select to always enable the Save with password option in the file save dialogs. Deselect the option to save files by default without password.
core.git: Branch 'distro/cib/libreoffice-6-4' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
sfx2/source/doc/docfile.cxx|3 +++
2 files changed, 12 insertions(+)
New commits:
commit dcb2e2515bad3028918e0121068fac7b1d6881d3
Author: Samuel Mehrbrodt
AuthorDate: Mon Feb 5 14:12:53 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Feb 8 08:48:08 2024 +0100
tdf#158975 Add option to not write temp file next to local file
This causes permission issues in some setups.
See bug report for details.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163003
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit cf616121ed48c8df96104bc35abf3b55b8862043)
Change-Id: If97030f95185ab96e21cec968b734fba8a811f9d
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3fdf08d9e19a..b47794f128c4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5489,6 +5489,15 @@
true
+
+
+ Determines if temp files are placed next to the local file
when a file is saved.
+ If this is false, the temp file will be placed in the default temp
directory.
+ Placing the temp file next to the local file will increase
performance, but it might lead
+ to permission issues such as described in this bug:
https://bugs.documentfoundation.org/show_bug.cgi?id=158975
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 8c0d101c4ea9..5c4116f2308e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3674,6 +3674,9 @@ OUString GetLogicBase(std::unique_ptr
const & pImpl)
// permission only to create the specifically named output file in that
directory.
#if !HAVE_FEATURE_MACOSX_SANDBOX
+if (!officecfg::Office::Common::Misc::TempFileNextToLocalFile::get())
+return aLogicBase;
+
if (comphelper::isFileUrl(pImpl->m_aLogicName) && !pImpl->m_pInStream)
{
// Try to create the temp file in the same directory when storing.
core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 + sfx2/source/doc/docfile.cxx|2 ++ 2 files changed, 11 insertions(+) New commits: commit cf616121ed48c8df96104bc35abf3b55b8862043 Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 14:12:53 2024 +0100 Commit: Miklos Vajna CommitDate: Thu Feb 8 08:29:09 2024 +0100 tdf#158975 Add option to not write temp file next to local file This causes permission issues in some setups. See bug report for details. Change-Id: If97030f95185ab96e21cec968b734fba8a811f9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163003 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 3b66f6a8394b..adfa422f01b0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5218,6 +5218,15 @@ true + + + Determines if temp files are placed next to the local file when a file is saved. + If this is false, the temp file will be placed in the default temp directory. + Placing the temp file next to the local file will increase performance, but it might lead + to permission issues such as described in this bug: https://bugs.documentfoundation.org/show_bug.cgi?id=158975 + +true + Allows to specify whether the OOo document file locking diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index fe1f5d0b773c..88f712e6989b 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -4006,6 +4006,8 @@ OUString GetLogicBase(const INetURLObject& rURL, std::unique_ptr (void) rURL; (void) pImpl; #else +if (!officecfg::Office::Common::Misc::TempFileNextToLocalFile::get()) +return aLogicBase; if (!pImpl->m_bHasEmbeddedObjects // Embedded objects would mean a special base, ignore that. && rURL.GetProtocol() == INetProtocol::File && !pImpl->m_pInStream)
core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c58f42c1bd2ec1b24f02a27c952e88d43ee07beb Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 12:24:58 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 5 14:47:11 2024 +0100 Tabs to spaces Change-Id: I794548f4a5c18c3cbf100940adf3ec5095293ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162996 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index f1f947324c12..3b66f6a8394b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5167,8 +5167,8 @@ DIN Light,1509,-503,1509,-483,1997,483 - B Nazanin,1343,-705,1990,-1045,1990,1045 - B Nazanin,1341,-707,2126,-1120,2126,1120 + B Nazanin,1343,-705,1990,-1045,1990,1045 + B Nazanin,1341,-707,2126,-1120,2126,1120
core.git: sd/source
sd/source/ui/view/DocumentRenderer.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 5f9ce732300d3301b574b569fe331e8a93057e73 Author: Samuel Mehrbrodt AuthorDate: Mon Feb 5 12:23:26 2024 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 5 14:33:20 2024 +0100 Fix typo in comment Also relayout the text Change-Id: Id774c5a5089e1c031ae705e6b23281e882b6739f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162995 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index c7587a1d2d40..a8d5a6f1de25 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2123,13 +2123,10 @@ private: else nPaperBin = rInfo.mpPrinter->GetPaperBin(); -// For pages larger then the printable area there -// are three options: +// For pages larger than the printable area there are three options: // 1. Scale down to the page to the printable area. -// 2. Print only the upper left part of the page -//(without the unprintable borders). -// 3. Split the page into parts of the size of the -// printable area. +// 2. Print only the upper left part of the page (without the unprintable borders). +// 3. Split the page into parts of the size of the printable area. const bool bScalePage (mpOptions->IsPageSize()); const bool bCutPage (mpOptions->IsCutPage()); MapMode aMap (rInfo.maMap);
core.git: sw/qa sw/source
sw/qa/uitest/data/tdf159428.odt |binary
sw/qa/uitest/navigator/tdf159428.py | 49 +++
sw/source/uibase/utlui/content.cxx | 111 +---
3 files changed, 104 insertions(+), 56 deletions(-)
New commits:
commit 070b4ddda4983773e8a989a116924bee0f651f25
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 29 16:04:45 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 5 07:50:17 2024 +0100
tdf#159428 Prefer heading over bookmarks in Navigator
When a bookmark is in a heading, highlighting the heading
is more important than highlighting the bookmark.
Change-Id: I6348e42b14ece226a25961bd3145193645972e79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162694
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/uitest/data/tdf159428.odt b/sw/qa/uitest/data/tdf159428.odt
new file mode 100644
index ..6b30d6bf0cdc
Binary files /dev/null and b/sw/qa/uitest/data/tdf159428.odt differ
diff --git a/sw/qa/uitest/navigator/tdf159428.py
b/sw/qa/uitest/navigator/tdf159428.py
new file mode 100644
index ..3a8634a57629
--- /dev/null
+++ b/sw/qa/uitest/navigator/tdf159428.py
@@ -0,0 +1,49 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class tdf159428(UITestCase):
+
+def test_tdf159428(self):
+global selectionChangedResult
+with self.ui_test.load_file(get_url_for_data_file('tdf159428.odt')):
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.xUITest.executeCommand(".uno:Sidebar")
+xWriterEdit.executeAction("SIDEBAR", mkPropertyValues({"PANEL":
"SwNavigatorPanel"}))
+
+xNavigatorPanel =
self.ui_test.wait_until_child_is_available('NavigatorPanel')
+xContentTree = xNavigatorPanel.getChild("contenttree")
+
+# select fist bookmark - Heading "H1" should be tracked
+self.xUITest.executeCommand(".uno:GoToNextPara")
+self.xUITest.executeCommand(".uno:GoToNextPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"111", "END_POS": "119"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "H1")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "H1")
+
+# select second bookmark - Heading "H1 mit Lesezeichen" should be
tracked
+self.xUITest.executeCommand(".uno:GoToNextPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "18"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "H1 mit Lesezeichen")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "H1 mit
Lesezeichen")
+
+# select third bookmark - no heading tracked
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+self.xUITest.executeCommand(".uno:GoToPrevPara")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"141", "END_POS": "146"}))
+self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "Lesezeichen 3")
+
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"],
"Lesezeichen 3")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 5655b67ceab1..b058cf46c464 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4305,52 +4305,6 @@ void SwContentTree::UpdateTracking()
aContentAtPos.pFndTextAttr);
return;
}
-// bookmarks - track first bookmark at cursor
-if (mTrackContentType[ContentTypeId::BOOKMARK] &&
-(m_pActiveShell->GetSelectionType() & SelectionType::Text))
-{
-SwPa
core.git: oox/source sw/CppunitTest_sw_ooxmlexport21.mk sw/qa
oox/source/core/xmlfilterbase.cxx | 43 +++-
sw/CppunitTest_sw_ooxmlexport21.mk |4 +
sw/qa/extras/ooxmlexport/data/personalmetadata.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 39 ++
4 files changed, 77 insertions(+), 9 deletions(-)
New commits:
commit 1e49f469afcbf3d1abec25451117f5f10d3ba825
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 29 11:25:17 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 29 13:18:04 2024 +0100
Don't export personal metadata to OOXML in privacy mode
Change-Id: Iac0985783a0c7334bd6ee3cfcaf37c135ac452ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162682
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 2e7ce9a75cbc..7afb84cad2c6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -622,6 +623,12 @@ writeElement( const FSHelperPtr& pDoc, sal_Int32
nXmlElement, const LanguageTag&
static void
writeCoreProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >& xProperties )
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo);
+bool bRemoveUserInfo
+= bRemovePersonalInfo
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo);
+
OUString sValue;
if( rSelf.getVersion() == oox::core::ISOIEC_29500_2008 )
{
@@ -670,8 +677,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
if (it->second >>= aValue)
writeElement( pCoreProps, FSNS( XML_cp, XML_contentType ), aValue
);
}
-writeElement( pCoreProps, FSNS( XML_dcterms, XML_created ),
xProperties->getCreationDate() );
-writeElement( pCoreProps, FSNS( XML_dc, XML_creator ),
xProperties->getAuthor() );
+if (!bRemoveUserInfo)
+{
+writeElement(pCoreProps, FSNS(XML_dcterms, XML_created),
xProperties->getCreationDate());
+writeElement(pCoreProps, FSNS(XML_dc, XML_creator),
xProperties->getAuthor());
+}
writeElement( pCoreProps, FSNS( XML_dc, XML_description ),
xProperties->getDescription() );
it = aUserDefinedProperties.find("OOXMLCorePropertyIdentifier");
@@ -683,10 +693,18 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
}
writeElement( pCoreProps, FSNS( XML_cp, XML_keywords ),
xProperties->getKeywords() );
writeElement( pCoreProps, FSNS( XML_dc, XML_language ),
LanguageTag( xProperties->getLanguage()) );
-writeElement( pCoreProps, FSNS( XML_cp, XML_lastModifiedBy ),
xProperties->getModifiedBy() );
-writeElement( pCoreProps, FSNS( XML_cp, XML_lastPrinted ),
xProperties->getPrintDate() );
-writeElement( pCoreProps, FSNS( XML_dcterms, XML_modified ),
xProperties->getModificationDate() );
-writeElement( pCoreProps, FSNS( XML_cp, XML_revision ),
xProperties->getEditingCycles() );
+
+if (!bRemoveUserInfo)
+{
+writeElement(pCoreProps, FSNS(XML_cp, XML_lastModifiedBy),
xProperties->getModifiedBy());
+writeElement(pCoreProps, FSNS(XML_cp, XML_lastPrinted),
xProperties->getPrintDate());
+writeElement(pCoreProps, FSNS(XML_dcterms, XML_modified),
+ xProperties->getModificationDate());
+}
+if (!bRemovePersonalInfo)
+{
+writeElement(pCoreProps, FSNS(XML_cp, XML_revision),
xProperties->getEditingCycles());
+}
writeElement( pCoreProps, FSNS( XML_dc, XML_subject ),
xProperties->getSubject() );
writeElement( pCoreProps, FSNS( XML_dc, XML_title ),
xProperties->getTitle() );
@@ -706,6 +724,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties
static void
writeAppProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties
>& xProperties )
{
+bool bRemovePersonalInfo
+=
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo);
+bool bRemoveUserInfo
+= bRemovePersonalInfo
+ &&
!SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo);
rSelf.addRelation(
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";,
u"docProps/app.xml" );
@@ -720,7 +743,8 @@ writeAppProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >
comphelper::SequenceAsHashMap
aUserDefinedProperties(xUserDefinedProper
core.git: cui/source cui/uiconfig include/unotools officecfg/registry sw/qa unotools/source xmloff/source
cui/source/inc/securityoptions.hxx |3
cui/source/options/securityoptions.cxx |6 +
cui/uiconfig/ui/securityoptionsdialog.ui | 48 ++---
include/unotools/securityoptions.hxx |1
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 ++
sw/qa/extras/odfexport/odfexport2.cxx | 18
unotools/source/config/securityoptions.cxx |9 ++
xmloff/source/core/SettingsExportHelper.cxx| 10 ++
8 files changed, 93 insertions(+), 10 deletions(-)
New commits:
commit ba8911931c18e6a4cc737ffc9f0f415f1ba794d7
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 25 13:01:24 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Fri Jan 26 07:08:19 2024 +0100
Don't export printer name & config in privacy mode
Don't export printer name & printer config when
RemovePersonalInfoOnSaving is enabled, as it might contain
sensitive data such as printer location.
Add an option to export printer settings even when
RemovePersonalInfoOnSaving is enabled.
Change-Id: I3d2ca91ad2032050c919d382c11c9ceabf331770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162577
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/inc/securityoptions.hxx
b/cui/source/inc/securityoptions.hxx
index 981c9ac29bf8..a86b4f0c605a 100644
--- a/cui/source/inc/securityoptions.hxx
+++ b/cui/source/inc/securityoptions.hxx
@@ -53,6 +53,8 @@ namespace svx
std::unique_ptr m_xNoteAuthorImg;
std::unique_ptr m_xDocumentVersionCB;
std::unique_ptr m_xDocumentVersionImg;
+std::unique_ptr m_xPrinterSettingsCB;
+std::unique_ptr m_xPrinterSettingsImg;
public:
SecurityOptionsDialog(weld::Window* pParent);
@@ -68,6 +70,7 @@ namespace svx
bool IsRemoveDocUserInfoChecked() const { return
m_xDocPropertiesCB->get_active(); }
bool IsRemoveNoteAuthorInfoChecked() const { return
m_xNoteAuthorCB->get_active(); }
bool IsRemoveDocVersionInfoChecked() const { return
m_xDocumentVersionCB->get_active(); }
+bool IsKeepPrinterSettingsChecked() const { return
m_xPrinterSettingsCB->get_active(); }
bool IsRecommPasswdChecked() const { return
m_xRecommPasswdCB->get_active(); }
bool IsCtrlHyperlinkChecked() const { return
m_xCtrlHyperlinkCB->get_active(); }
bool IsBlockUntrustedRefererLinksChecked() const { return
m_xBlockUntrustedRefererLinksCB->get_active(); }
diff --git a/cui/source/options/securityoptions.cxx
b/cui/source/options/securityoptions.cxx
index f42b0c35dd4b..d99ad64e545e 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -73,6 +73,8 @@ SecurityOptionsDialog::SecurityOptionsDialog(weld::Window*
pParent)
, m_xNoteAuthorImg(m_xBuilder->weld_widget("locknoteauthor"))
, m_xDocumentVersionCB(m_xBuilder->weld_check_button("documentversion"))
, m_xDocumentVersionImg(m_xBuilder->weld_widget("lockdocumentversion"))
+, m_xPrinterSettingsCB(m_xBuilder->weld_check_button("printersettings"))
+, m_xPrinterSettingsImg(m_xBuilder->weld_widget("lockprintersettings"))
{
m_xRemovePersInfoCB->connect_toggled(LINK(this, SecurityOptionsDialog,
ShowPersonalInfosToggle));
init();
@@ -103,6 +105,8 @@ void SecurityOptionsDialog::init()
*m_xNoteAuthorImg);
enableAndSet(SvtSecurityOptions::EOption::DocWarnKeepDocVersionInfo,
*m_xDocumentVersionCB,
*m_xDocumentVersionImg);
+enableAndSet(SvtSecurityOptions::EOption::DocKeepPrinterSettings,
*m_xPrinterSettingsCB,
+*m_xPrinterSettingsImg);
enableAndSet(SvtSecurityOptions::EOption::DocWarnRecommendPassword,
*m_xRecommPasswdCB,
*m_xRecommPasswdImg);
enableAndSet(SvtSecurityOptions::EOption::CtrlClickHyperlink,
*m_xCtrlHyperlinkCB,
@@ -128,6 +132,7 @@ bool SecurityOptionsDialog::SetSecurityOptions()
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo,
IsRemoveDocUserInfoChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo,
IsRemoveNoteAuthorInfoChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnKeepDocVersionInfo,
IsRemoveDocVersionInfoChecked(), bModified);
+CheckAndSave(SvtSecurityOptions::EOption::DocKeepPrinterSettings,
IsKeepPrinterSettingsChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::DocWarnRecommendPassword,
IsRecommPasswdChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::CtrlClickHyperlink,
IsCtrlHyperlinkChecked(), bModified);
CheckAndSave(SvtSecurityOptions::EOption::BlockUntrustedRefererLinks,
IsBlockUntrustedRefererLinksChecked(), bModified);
@@ -143,6 +148,7 @@
core.git: sw/qa xmloff/source
sw/qa/extras/odfexport/data/personalmetadata.odt |binary
sw/qa/extras/odfexport/odfexport2.cxx| 39 ++
xmloff/source/meta/xmlmetae.cxx | 40 ---
3 files changed, 61 insertions(+), 18 deletions(-)
New commits:
commit c479944eb4f9f5a22c7b248185f22c86ea85d12a
Author: Samuel Mehrbrodt
AuthorDate: Tue Jan 23 15:53:28 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 25 16:51:06 2024 +0100
Don't export personal metadata when user wishes not to
Currently the metadata is only reset to default when the option
to remove personal metadata is active.
And some metadata was still exported which might contain personal data.
Now the following elements won't be exported anymore when the
RemovePersonalInfoOnSaving
option is set to true:
* meta:initial-creator
* meta:creation-date
* dc:date
* dc:creator
* meta:printed-by
* meta:print-date
* meta:editing-duration
* meta:editing-cycles
* meta:template
Change-Id: Ibad57fdbff04bf285881826820ec3ddb01ffbb36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162553
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/extras/odfexport/data/personalmetadata.odt
b/sw/qa/extras/odfexport/data/personalmetadata.odt
new file mode 100644
index ..9af4e0a3442f
Binary files /dev/null and b/sw/qa/extras/odfexport/data/personalmetadata.odt
differ
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx
b/sw/qa/extras/odfexport/odfexport2.cxx
index 708a4f94cba0..4160f48ab388 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -27,9 +27,11 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
#include
@@ -565,6 +567,43 @@ CPPUNIT_TEST_FIXTURE(Test, tdf150927)
assertXPath(pXmlDoc,
"/office:document-styles/office:automatic-styles/style:style[@style:family='table']"_ostr,
2);
}
+CPPUNIT_TEST_FIXTURE(Test, testPersonalMetaData)
+{
+// 1. Remove personal info, keep user info
+auto pBatch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Security::Scripting::RemovePersonalInfoOnSaving::set(true,
pBatch);
+
officecfg::Office::Common::Security::Scripting::KeepDocUserInfoOnSaving::set(true,
pBatch);
+pBatch->commit();
+
+loadAndReload("personalmetadata.odt");
+xmlDocUniquePtr pXmlDoc = parseExport("meta.xml");
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:initial-creator"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:creation-date"_ostr, 1);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:date"_ostr, 1);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:creator"_ostr,
1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:printed-by"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:print-date"_ostr, 1);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-duration"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-cycles"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:template"_ostr, 0);
+
+// 2. Remove user info too
+
officecfg::Office::Common::Security::Scripting::KeepDocUserInfoOnSaving::set(false,
pBatch);
+pBatch->commit();
+
+loadAndReload("personalmetadata.odt");
+pXmlDoc = parseExport("meta.xml");
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:initial-creator"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:creation-date"_ostr, 0);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:date"_ostr, 0);
+assertXPath(pXmlDoc, "/office:document-meta/office:meta/dc:creator"_ostr,
0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:printed-by"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:print-date"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-duration"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:editing-cycles"_ostr, 0);
+assertXPath(pXmlDoc,
"/office:document-meta/office:meta/meta:template"_ostr, 0);
+}
+
CPPUNIT_TEST_FIXTURE(Test, tdf151100)
{
// Similar to tdf135942
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 395772ab2aca..608ba86de7da 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -95,6 +95,9 @@ void SvXMLMetaExport::SimpleDateTimeElement( const
ut
core.git: Branch 'libreoffice-24-2-0' - cui/source
cui/source/options/optaboutconfig.cxx | 28
cui/source/options/optaboutconfig.hxx |5 +++--
2 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 89807b69090d657bbd52dce74be4bfe024179036
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 15 08:15:46 2024 +0100
Commit: Xisco Fauli
CommitDate: Wed Jan 24 09:49:59 2024 +0100
tdf#159186 Use changed value when editing string-list a second time
Change-Id: I0e26a053b3b5fb04abf87894bcfebccea8bdd26f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162074
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 76ce6466b814bb9ff119f4f83795a2aeefc28793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162097
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
(cherry picked from commit 395c8cfb770e7424fd99b884f568a32fcc7a728f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162145
Reviewed-by: Michael Stahl
Reviewed-by: Michael Weghorn
Reviewed-by: Ilmari Lauhakangas
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 1b02642e6d00..f927363f8650 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -70,15 +70,18 @@ struct UserData
bool bIsReadOnly;
bool bWasModified;
OUString sPropertyPath;
+Any aPropertyValue;
OUString sTooltip;
int aLineage;
Reference aXNameAccess;
-explicit UserData(OUString aPropertyPath, OUString aTooltip, bool
isReadOnly, bool wasModified)
+explicit UserData(OUString aPropertyPath, Any aPropValue, OUString
aTooltip, bool isReadOnly,
+ bool wasModified)
: bIsPropertyPath(true)
, bIsReadOnly(isReadOnly)
, bWasModified(wasModified)
, sPropertyPath(std::move(aPropertyPath))
+, aPropertyValue(aPropValue)
, sTooltip(std::move(aTooltip))
, aLineage(0)
{
@@ -187,9 +190,10 @@ IMPL_STATIC_LINK_NOARG(CuiAboutConfigTabPage,
ValidNameHdl, SvxNameDialog&, bool
CuiAboutConfigTabPage::~CuiAboutConfigTabPage() {}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp,
-const OUString& rStatus, const
OUString& rType,
-const OUString& rValue, const
OUString& rTooltip,
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, Any
aPropertyValue,
+const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue,
+const OUString& rTooltip,
const weld::TreeIter* pParentEntry,
bool bInsertToPrefBox,
bool bIsReadOnly, bool bWasModified)
{
@@ -197,8 +201,8 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
if (bOnlyModified && !bWasModified)
return;
-m_vectorUserData.push_back(
-std::make_unique(rPropertyPath, rTooltip, bIsReadOnly,
bWasModified));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
aPropertyValue, rTooltip,
+ bIsReadOnly,
bWasModified));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -689,8 +693,9 @@ void CuiAboutConfigTabPage::FillItems(const
Reference& xNameAccess,
for (int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
-InsertEntry(sPath, sPath.copy(index + 1), item, sType,
sValue.makeStringAndClear(),
-sTooltip, pParentEntry, !bLoadAll, bReadOnly,
bWasModified);
+InsertEntry(sPath, aNode, sPath.copy(index + 1), item, sType,
+sValue.makeStringAndClear(), sTooltip, pParentEntry,
!bLoadAll, bReadOnly,
+bWasModified);
}
}
}
@@ -940,10 +945,8 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl,
weld::Button&, void)
else if (sPropertyType == "string-list")
{
SvxListDialog aListDialog(m_xDialog.get());
-Reference xConfigAccess
-= getConfigAccess(pUserData->sPropertyPath, false);
-Any aNode = xConfigAccess->getByName(sPropertyName);
-uno::Sequence aList =
aNode.get>();
+uno::Sequence aList
+= pUserData->aPropertyValue.get>();
aListDialog.SetEntries(
comphelper::sequenceToContainer>(aList));
core.git: sw/inc sw/source
sw/inc/PostItMgr.hxx |4 +
sw/source/uibase/docvw/PostItMgr.cxx | 84 +++
sw/source/uibase/docvw/edtwin.cxx| 19 +++
sw/source/uibase/inc/edtwin.hxx |1
sw/source/uibase/misc/swruler.cxx|3 -
5 files changed, 80 insertions(+), 31 deletions(-)
New commits:
commit b9368eab798a766b5a24658c783a6ee73dbf2caa
Author: Samuel Mehrbrodt
AuthorDate: Mon Jan 22 10:57:06 2024 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 22 12:19:47 2024 +0100
tdf#159145 Allow changing width of comment column on right border
not only on the ruler as implemented in
ac2720dcbe4e51e7f6733a385b5f7b571c6431e9
Change-Id: Ib3709e97be312a7e20302ffa703e847f9efa3110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162365
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index ec6604c43a23..2278ae05ea6f 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -150,7 +150,8 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool ShowScrollbar(const tools::ULong aPage) const;
bool HasNotes() const ;
bool ShowNotes() const;
-void SetSidebarWidth(sal_uInt16 nPx);
+void SetSidebarWidth(Point aPoint);
+tools::Rectangle GetSidebarRect(const Point& rPointLogic);
tools::ULong GetSidebarWidth(bool bPx = false) const;
tools::ULong GetSidebarBorderWidth(bool bPx = false) const;
@@ -183,6 +184,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool IsHit(const Point &aPointPixel);
/// Get the matching window that is responsible for handling mouse
events of rPointLogic, if any.
vcl::Window* IsHitSidebarWindow(const Point& rPointLogic);
+bool IsHitSidebarDragArea(const Point& rPointLogic);
Color GetArrowColor(sal_uInt16 aDirection, tools::ULong aPage) const;
sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField*
pField) const;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 24abcc14a2a5..7af447a63a5d 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1979,32 +1979,25 @@ bool SwPostItMgr::ShowScrollbar(const tools::ULong
aPage) const
return false;
}
-bool SwPostItMgr::IsHit(const Point &aPointPixel)
+bool SwPostItMgr::IsHit(const Point& aPointPixel)
{
-if (HasNotes() && ShowNotes())
-{
-const Point aPoint = mpEditWin->PixelToLogic(aPointPixel);
-const SwRootFrame* pLayout = mpWrtShell->GetLayout();
-SwRect aPageFrame;
-const tools::ULong nPageNum = SwPostItHelper::getPageInfo( aPageFrame,
pLayout, aPoint );
-if( nPageNum )
-{
-tools::Rectangle aRect;
-OSL_ENSURE(mPages.size()>nPageNum-1,"SwPostitMgr:: page container
size wrong");
-aRect = mPages[nPageNum-1]->eSidebarPosition ==
sw::sidebarwindows::SidebarPosition::LEFT
-?
tools::Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height()))
-: tools::Rectangle(
Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) ,
Size(GetSidebarWidth(),aPageFrame.Height()));
-if (aRect.Contains(aPoint))
-{
-// we hit the note's sidebar
-// lets now test for the arrow area
-if (mPages[nPageNum-1]->bScrollbar)
-return ScrollbarHit(nPageNum,aPoint);
-else
-return false;
-}
-}
-}
+if (!HasNotes() || !ShowNotes())
+return false;
+
+const Point aPoint = mpEditWin->PixelToLogic(aPointPixel);
+tools::Rectangle aRect(GetSidebarRect(aPoint));
+if (!aRect.Contains(aPoint))
+return false;
+
+// we hit the note's sidebar
+// lets now test for the arrow area
+SwRect aPageFrame;
+const tools::ULong nPageNum
+= SwPostItHelper::getPageInfo(aPageFrame, mpWrtShell->GetLayout(),
aPoint);
+if (!nPageNum)
+return false;
+if (mPages[nPageNum - 1]->bScrollbar)
+return ScrollbarHit(nPageNum, aPoint);
return false;
}
@@ -2038,6 +2031,38 @@ vcl::Window* SwPostItMgr::IsHitSidebarWindow(const
Point& rPointLogic)
return pRet;
}
+tools::Rectangle SwPostItMgr::GetSidebarRect(const Point& rPointLogic)
+{
+const SwRootFrame* pLayout = mpWrtShell->GetLayout();
+SwRect aPageFrame;
+const tools::ULong nPageNum = SwPostItHelper::getPageInfo(aPageFrame,
pLayout, rPointLogic);
+if (!nPageNum)
+return tools::Rectangle();
+
+OSL_ENSURE(mPages.size() > nPageNum - 1, "SwPostitMgr:: page con
core.git: Branch 'libreoffice-24-2' - chart2/qa oox/inc oox/source
chart2/qa/extras/chart2import.cxx | 11 +++
chart2/qa/extras/data/pptx/tdf146487.pptx |binary
oox/inc/drawingml/chart/plotareaconverter.hxx |3 +++
oox/inc/drawingml/chart/typegroupconverter.hxx |3 +++
oox/source/drawingml/chart/chartspaceconverter.cxx | 14 +-
oox/source/drawingml/chart/plotareaconverter.cxx | 10 +-
oox/source/drawingml/chart/typegroupconverter.cxx |9 +
7 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit 13be76e4d58db7ff892dff900e7734ac424bd8dd
Author: Samuel Mehrbrodt
AuthorDate: Mon Aug 14 15:59:18 2023 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jan 22 08:28:13 2024 +0100
tdf#146487 Don't show generic diagram title when there is an empty title
given
Bugdoc has autoTitleDeleted set to false (so title should be visible), but
then an empty title is given.
In this case no default string should be added to the title, only in case
of Pie Charts.
Any other Chart types show the default title in MS-Office.
Co-authored-by: Balazs Varga
Change-Id: Ib445099a4a3d113cff6b1ffdfd093fe41c34716b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155681
Tested-by: Samuel Mehrbrodt
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit c205194b8c54011af4b2cd34fbc00f4885883643)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162270
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index f7324c94754f..7c24ff6110ba 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1979,6 +1979,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205)
CPPUNIT_ASSERT_EQUAL(OUString("Firstline
Secondline
Thirdline"), aTitle);
}
+CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487)
+{
+loadFromFile(u"pptx/tdf146487.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+Reference xTitled(xChartDoc, uno::UNO_QUERY_THROW);
+uno::Reference xTitle = xTitled->getTitleObject();
+CPPUNIT_ASSERT_MESSAGE("chart doc should not have a title", !xTitle.is());
+}
+
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel)
{
// Bar chart area size is fixed (not automatic) so we can't resize
diff --git a/chart2/qa/extras/data/pptx/tdf146487.pptx
b/chart2/qa/extras/data/pptx/tdf146487.pptx
new file mode 100644
index ..2a78ae5d859b
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf146487.pptx differ
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx
b/oox/inc/drawingml/chart/plotareaconverter.hxx
index b520c6b4816c..988405b3247c 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -74,6 +74,8 @@ public:
/** Returns the automatic chart title if the chart contains only one
series. */
const OUString& getAutomaticTitle() const { return maAutoTitle; }
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const { return
mbSingleSeriesTitle; }
/** Returns true, if chart type supports wall and floor format in 3D mode.
*/
boolisWall3dChart() const { return mbWall3dChart; }
@@ -82,6 +84,7 @@ private:
boolmb3dChart;
boolmbWall3dChart;
boolmbPieChart;
+boolmbSingleSeriesTitle;;
};
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx
b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 2e3aae5a2a10..6b780dd0ae15 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -133,6 +133,9 @@ public:
/** Returns series title, if the chart type group contains only one single
series. */
OUStringgetSingleSeriesTitle() const;
+/** Returns true, if the chart contains only one series and have title
textbox (even empty). */
+boolisSingleSeriesTitle() const;
+
/** Creates a coordinate system according to the contained chart type. */
css::uno::Reference< css::chart2::XCoordinateSystem >
createCoordinateSystem();
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index c83ed37e9c02..f9b370e04d8f 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -183,7 +184,18 @@ void ChartSpaceCon
