core.git: chart2/source
chart2/source/view/charttypes/PieChart.cxx | 28 ---
chart2/source/view/charttypes/VSeriesPlotter.cxx | 16 +++--
2 files changed, 9 insertions(+), 35 deletions(-)
New commits:
commit dc8c295605d190d0fc9d4a9a8b369c319be9d44b
Author: Justin Luth
AuthorDate: Thu Jan 25 08:58:43 2024 -0500
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Jan 28 06:18:59 2024 +0100
chart2: use std::clamp
Change-Id: I9fab21a889587e1eaf709e6bd31d0a0d6078c8f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162586
Reviewed-by: Justin Luth
Tested-by: Jenkins
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index efbef5a083eb..5e3a6dcaad17 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -506,17 +506,8 @@ void PieChart::createTextLabelShape(
{
sal_Int32 nX1 = aPieLabelInfo.aOuterPosition.getX();
sal_Int32 nY1 = aPieLabelInfo.aOuterPosition.getY();
-sal_Int32 nX2 = nX1;
-sal_Int32 nY2 = nY1;
-if (nX1 < aRect.getMinX())
-nX2 = aRect.getMinX();
-else if (nX1 > aRect.getMaxX())
-nX2 = aRect.getMaxX();
-
-if (nY1 < aRect.getMinY())
-nY2 = aRect.getMinY();
-else if (nY1 > aRect.getMaxY())
-nY2 = aRect.getMaxY();
+const sal_Int32 nX2 = std::clamp(nX1, aRect.getMinX(),
aRect.getMaxX());
+const sal_Int32 nY2 = std::clamp(nY1, aRect.getMinY(),
aRect.getMaxY());
const sal_Int32 nLabelSquaredDistanceFromOrigin
= (nX2 - aOrigin.X) * (nX2 - aOrigin.X) + (nY2 - aOrigin.Y) *
(nY2 - aOrigin.Y);
@@ -1286,20 +1277,11 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested(
const awt::Size& rPageSi
{
if( labelInfo.bMoved && labelInfo.bShowLeaderLine )
{
+const basegfx::B2IRectangle
aRect(lcl_getRect(labelInfo.xLabelGroupShape));
sal_Int32 nX1 = labelInfo.aOuterPosition.getX();
sal_Int32 nY1 = labelInfo.aOuterPosition.getY();
-sal_Int32 nX2 = nX1;
-sal_Int32 nY2 = nY1;
-::basegfx::B2IRectangle aRect( lcl_getRect(
labelInfo.xLabelGroupShape ) );
-if( nX1 < aRect.getMinX() )
-nX2 = aRect.getMinX();
-else if( nX1 > aRect.getMaxX() )
-nX2 = aRect.getMaxX();
-
-if( nY1 < aRect.getMinY() )
-nY2 = aRect.getMinY();
-else if( nY1 > aRect.getMaxY() )
-nY2 = aRect.getMaxY();
+const sal_Int32 nX2 = std::clamp(nX1, aRect.getMinX(),
aRect.getMaxX());
+const sal_Int32 nY2 = std::clamp(nY1, aRect.getMinY(),
aRect.getMaxY());
//when the line is very short compared to the page size don't
create one
::basegfx::B2DVector aLength(nX1-nX2, nY1-nY2);
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ef13248bf0a6..f3a3a8bebd61 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -707,20 +707,12 @@ rtl::Reference
VSeriesPlotter::createDataLabel( const rtl::Referen
// "ShowCustomLeaderLines"
rDataSeries.getModel()->getFastPropertyValue(
PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES ).get())
{
+const basegfx::B2IRectangle aRect(
+BaseGFXHelper::makeRectangle(aRelPos,
xTextShape->getSize()));
sal_Int32 nX1 = rScreenPosition2D.X;
sal_Int32 nY1 = rScreenPosition2D.Y;
-sal_Int32 nX2 = nX1;
-sal_Int32 nY2 = nY1;
-::basegfx::B2IRectangle
aRect(BaseGFXHelper::makeRectangle(aRelPos, xTextShape->getSize()));
-if (nX1 < aRelPos.X)
-nX2 = aRelPos.X;
-else if (nX1 > aRect.getMaxX())
-nX2 = aRect.getMaxX();
-
-if (nY1 < aRect.getMinY())
-nY2 = aRect.getMinY();
-else if (nY1 > aRect.getMaxY())
-nY2 = aRect.getMaxY();
+const sal_Int32 nX2 = std::clamp(nX1, aRelPos.X,
aRect.getMaxX());
+const sal_Int32 nY2 = std::clamp(nY1, aRect.getMinY(),
aRect.getMaxY());
//when the line is very short compared to the page size
don't create one
::basegfx::B2DVector aLength(nX1 - nX2, nY1 - nY2);
core.git: Branch 'libreoffice-24-2' - cui/uiconfig
cui/uiconfig/ui/linetabpage.ui |1 + 1 file changed, 1 insertion(+) New commits: commit c664e7a5ce4001b677e67e4b40780d1babf683c3 Author: Caolán McNamara AuthorDate: Fri Jan 26 14:34:40 2024 + Commit: Taichi Haradaguchi <20001...@ymail.ne.jp> CommitDate: Sun Jan 28 05:46:35 2024 +0100 invalid cast from 'GtkImage' to 'GtkLabel' since: commit fe946f86ad6586fa810cae5c0f246389a285e172 Date: Wed Nov 29 15:25:06 2023 +0100 Bump Glade version Change-Id: Ide86220f260dac40395389530e7221ea8de8f092 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162611 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui index 2a2c1b2e15f5..e28eb4b95c19 100644 --- a/cui/uiconfig/ui/linetabpage.ui +++ b/cui/uiconfig/ui/linetabpage.ui @@ -230,6 +230,7 @@ False 0 True +
core.git: chart2/source
chart2/source/view/charttypes/PieChart.cxx | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 5e81ce5aec86ef5a93cc9cb4445fc4983e8a59ea Author: Justin Luth AuthorDate: Thu Jan 25 08:41:41 2024 -0500 Commit: Taichi Haradaguchi <20001...@ymail.ne.jp> CommitDate: Sun Jan 28 05:40:51 2024 +0100 chart2: use NormAngle360 In various places, the degrees refer to an area/width, and in those cases 360 means everything, so mk correctly removed NormAngle for those situations. But now copy/paste has added that to areas where a simple angle is being described, and in those cases using NormAngle360 is better. Change-Id: I4aa722c4a635f862dae5405f2ee929215a42faf9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162585 Reviewed-by: Justin Luth Tested-by: Jenkins diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index b9dd0517cf1f..efbef5a083eb 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -386,12 +386,10 @@ void PieChart::createTextLabelShape( aOuterCirclePoint.Y - aPieLabelInfo.aOrigin.getY() ); double fSquaredPieRadius = aRadiusVector.scalar(aRadiusVector); double fPieRadius = sqrt( fSquaredPieRadius ); -double fAngleDegree -= rParam.mfUnitCircleStartAngleDegree + rParam.mfUnitCircleWidthAngleDegree / 2.0; -while (fAngleDegree > 360.0) -fAngleDegree -= 360.0; -while (fAngleDegree < 0.0) -fAngleDegree += 360.0; +const double fHalfWidthAngleDegree = rParam.mfUnitCircleWidthAngleDegree / 2.0; +// fAngleDegree: the angle through the center of the slice / the bisecting ray +const double fAngleDegree += NormAngle360(rParam.mfUnitCircleStartAngleDegree + fHalfWidthAngleDegree); awt::Point aOuterPosition = PlottingPositionHelper::transformSceneToScreenPosition( m_aPosHelper.transformUnitCircleToScene(fAngleDegree, rParam.mfUnitCircleOuterRadius, 0),
core.git: 2 commits - cui/source desktop/source include/unotools officecfg/registry sw/inc sw/source sw/uiconfig unotools/source
cui/source/options/optgdlg.cxx|6
desktop/source/lib/init.cxx |2
include/unotools/compatibility.hxx| 269 ++---
include/unotools/itemholderbase.hxx |1
officecfg/registry/cppheader.xsl | 12
sw/inc/strings.hrc| 21 +
sw/inc/viewsh.hxx |2
sw/source/core/doc/DocumentSettingManager.cxx | 40 +-
sw/source/core/view/viewsh.cxx| 12
sw/source/ui/config/optcomp.cxx | 404 +++---
sw/source/uibase/inc/optcomp.hxx | 19 -
sw/uiconfig/swriter/ui/optcompatpage.ui | 33 --
unotools/source/config/compatibility.cxx | 391 +
unotools/source/config/itemholder1.cxx|4
14 files changed, 255 insertions(+), 961 deletions(-)
New commits:
commit d3f0e7867555dbf55a3e6be48e6c7bf957ef8907
Author: Mike Kaganski
AuthorDate: Sun Jan 28 05:04:28 2024 +0600
Commit: Mike Kaganski
CommitDate: Sun Jan 28 04:33:50 2024 +0100
tdf#159382: make edits of compat option in dialog apply immediately
Change-Id: I1e0e3f259bfc0700d1bd8b1cace905ff5848f6a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162652
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index e20eb3c27871..b4fb99df081a 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -443,6 +443,8 @@ public:
void SetEmptyDbFieldHidesPara(bool bEmptyDbFieldHidesPara);
+void SetNoSpaceAfterHangingFootnoteNumber(bool bNew);
+
// DOCUMENT COMPATIBILITY FLAGS END
// Calls Idle-formatter of Layout.
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index e7dfd326791f..6dfed8d075a6 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1047,6 +1047,18 @@ void SwViewShell::SetEmptyDbFieldHidesPara(bool
bEmptyDbFieldHidesPara)
EndAction();
}
+void SwViewShell::SetNoSpaceAfterHangingFootnoteNumber(bool bNew)
+{
+IDocumentSettingAccess& rIDSA = getIDocumentSettingAccess();
+if (rIDSA.get(DocumentSettingId::NO_SPACE_AFTER_HANGING_FOOTNOTE_NUMBER)
!= bNew)
+{
+SwWait aWait(*GetDoc()->GetDocShell(), true);
+rIDSA.set(DocumentSettingId::NO_SPACE_AFTER_HANGING_FOOTNOTE_NUMBER,
bNew);
+const SwInvalidateFlags nInv = SwInvalidateFlags::Size |
SwInvalidateFlags::Pos | SwInvalidateFlags::PrtArea;
+lcl_InvalidateAllContent(*this, nInv);
+}
+}
+
void SwViewShell::Reformat()
{
SwWait aWait( *GetDoc()->GetDocShell(), true );
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 4f482c459e62..1c70a9ca3b55 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -304,8 +304,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
break;
case
DocumentSettingId::NO_SPACE_AFTER_HANGING_FOOTNOTE_NUMBER:
-m_pWrtShell->GetDoc()->getIDocumentSettingAccess().set(
-
DocumentSettingId::NO_SPACE_AFTER_HANGING_FOOTNOTE_NUMBER, bChecked);
+
m_pWrtShell->SetNoSpaceAfterHangingFootnoteNumber(bChecked);
break;
default:
commit c4a3b1503199037e83526244bffc6adc0c310216
Author: Mike Kaganski
AuthorDate: Sun Jan 28 04:31:51 2024 +0600
Commit: Mike Kaganski
CommitDate: Sun Jan 28 04:33:38 2024 +0100
Simplify massively over-engineered compatibility options
They seem to be designed with multi-dimensional flexibility in mind;
it is stored as an array of lists, each having a name and a module.
The name may mean a filter. It may have a special name "_user" with
unclear meaning.
But it only ever used a single item in the array, named "_default",
in a single module (swriter). Everything else was only read into a
hidden listbox in Compatibility dialog, and never shown nor used.
Make ir much simpler. Just use the "_default" item. It is possible
to expand it later, if needed; but the previous complexity was bad
for maintenance and adding new options.
Translatable descriptions of the options were moved from UI file
to sw/inc/strings.hrc, and used in a structure that clearly maps
them to respective identifiers, to avoid fragile hidden dependency
on order of different lists.
Change-Id: I78ac5add8a872613e1fb388e4b8cc4fbf4362adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162651
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 941164e5044f..1b8e6f58fde7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1494,8 +1494,10 @@ bool OfaLanguagesTabPage::FillItemSet(
core.git: Branch 'libreoffice-24-2' - svl/source
svl/source/crypto/cryptosign.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 42e06fb686d4c02fc6efaf0a792319147e3d62bf Author: Noel Grandin AuthorDate: Fri Jan 26 12:22:36 2024 +0200 Commit: Thorsten Behrens CommitDate: Sat Jan 27 22:47:20 2024 +0100 tdf#159381 TimeStamp(RFC3161) create problem by asn1 format error. DER rules say that BOOLEAN values are either FALSE (0x00) or TRUE (0xff) Change-Id: I59f57557fbc4d6447e0d8e994b04adda1ee8c1a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162597 Tested-by: Noel Grandin Reviewed-by: Noel Grandin (cherry picked from commit d2d8f8bf82558d9aa548fb9f13bed410e0baf79b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162614 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index a234afccbc27..3fe6ae90ab34 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -1037,6 +1037,7 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer) ts_digest.len = aTsHashResult.size(); unsigned char cOne = 1; +unsigned char cTRUE = 0xff; // under DER rules true is 0xff, false is 0x00 src.version.type = siUnsignedInteger; src.version.data = &cOne; src.version.len = sizeof(cOne); @@ -1056,8 +1057,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer) src.nonce.len = sizeof(nNonce); src.certReq.type = siUnsignedInteger; -src.certReq.data = &cOne; -src.certReq.len = sizeof(cOne); +src.certReq.data = &cTRUE; +src.certReq.len = sizeof(cTRUE); src.extensions = nullptr;
core.git: Branch 'distro/collabora/co-24.04' - sal/osl
sal/osl/unx/file.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit e31d85d948838d93f8c04a8b91f507a4e31f5a3e Author: Noel Grandin AuthorDate: Sat Jan 27 21:52:09 2024 +0200 Commit: Michael Meeks CommitDate: Sat Jan 27 20:41:01 2024 + cool#8016 open files using O_CLOEXEC which is useful to speed up exec'ing/spawning subprograms, and avoids various leakage issues. Change-Id: Ie06ceb6b377e9d5cca8c017c5666564f6bed482f diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 41ce0aae9aba..213dc6ab53de 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1139,6 +1139,9 @@ oslFileError openFilePath(const OString& filePath, oslFileHandle* pHandle, if (isForbidden( filePath, uFlags )) return osl_File_E_ACCES; +// set close-on-exec by default +flags |= O_CLOEXEC; + /* open the file */ int fd = open_c( filePath, flags, mode ); if (fd == -1)
core.git: icon-themes/colibre_dark_svg icon-themes/colibre_svg icon-themes/karasa_jaga_svg icon-themes/sukapura_dark_svg icon-themes/sukapura_svg
icon-themes/colibre_dark_svg/vcl/res/pen.svg | 2 icon-themes/colibre_svg/vcl/res/pen.svg | 2 icon-themes/karasa_jaga_svg/sd/res/chart.svg | 2 icon-themes/karasa_jaga_svg/svx/res/pr010.svg | 8 icon-themes/karasa_jaga_svg/svx/res/pr05.svg | 8 icon-themes/karasa_jaga_svg/vcl/res/pen.svg | 6 icon-themes/sukapura_dark_svg/chart2/res/donut3d_52x60.svg| 2 icon-themes/sukapura_dark_svg/chart2/res/donut3dexploded_52x60.svg| 2 icon-themes/sukapura_dark_svg/chart2/res/donut_52x60.svg | 2 icon-themes/sukapura_dark_svg/chart2/res/donutexploded_52x60.svg | 2 icon-themes/sukapura_dark_svg/chart2/res/pie3d_52x60.svg | 16 icon-themes/sukapura_dark_svg/chart2/res/pie3dexploded_52x60.svg | 16 icon-themes/sukapura_dark_svg/chart2/res/pie_52x60.svg| 16 icon-themes/sukapura_dark_svg/chart2/res/pieexploded_52x60.svg| 16 icon-themes/sukapura_dark_svg/chart2/res/valueaxisstepped3d_52x60.svg | 25 icon-themes/sukapura_dark_svg/chart2/res/valueaxissteppedboth_52x60.svg | 25 icon-themes/sukapura_dark_svg/chart2/res/valueaxissteppedlines_52x60.svg | 25 icon-themes/sukapura_dark_svg/cmd/sc_bmpmask.svg | 2 icon-themes/sukapura_dark_svg/sd/res/presenterscreen-BorderToolbarTop.svg | 2 icon-themes/sukapura_dark_svg/svx/res/a11y_check_issues_found.svg | 3136 -- icon-themes/sukapura_svg/chart2/res/donut3d_52x60.svg | 2 icon-themes/sukapura_svg/chart2/res/donut3dexploded_52x60.svg | 2 icon-themes/sukapura_svg/chart2/res/donut_52x60.svg | 2 icon-themes/sukapura_svg/chart2/res/donutexploded_52x60.svg | 2 icon-themes/sukapura_svg/chart2/res/pie3d_52x60.svg | 16 icon-themes/sukapura_svg/chart2/res/pie3dexploded_52x60.svg | 16 icon-themes/sukapura_svg/chart2/res/pie_52x60.svg | 16 icon-themes/sukapura_svg/chart2/res/pieexploded_52x60.svg | 16 icon-themes/sukapura_svg/chart2/res/valueaxisstepped3d_52x60.svg | 25 icon-themes/sukapura_svg/chart2/res/valueaxissteppedboth_52x60.svg| 25 icon-themes/sukapura_svg/chart2/res/valueaxissteppedlines_52x60.svg | 25 icon-themes/sukapura_svg/cmd/sc_bmpmask.svg | 2 icon-themes/sukapura_svg/sd/res/presenterscreen-BorderToolbarTop.svg | 2 icon-themes/sukapura_svg/svx/res/a11y_check_issues_found.svg | 3136 -- 34 files changed, 34 insertions(+), 6568 deletions(-) New commits: commit ace5f5cbee7ea2c21ff9a3fe9b859b83a006edd6 Author: Ilmari Lauhakangas AuthorDate: Fri Jan 26 18:41:27 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jan 27 20:46:31 2024 +0100 tdf#158939 icon-themes: remove leftover reference images from SVGs Change-Id: Iccb7eaa0999f351cc365b52b5ce543f177ab00aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162631 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre_dark_svg/vcl/res/pen.svg b/icon-themes/colibre_dark_svg/vcl/res/pen.svg index b94a62aaac5f..7068f03aa614 100644 --- a/icon-themes/colibre_dark_svg/vcl/res/pen.svg +++ b/icon-themes/colibre_dark_svg/vcl/res/pen.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> diff --git a/icon-themes/colibre_svg/vcl/res/pen.svg b/icon-themes/colibre_svg/vcl/res/pen.svg index 332b3428f669..b4ee5cc555c9 100644 --- a/icon-themes/colibre_svg/vcl/res/pen.svg +++ b/icon-themes/colibre_svg/vcl/res/pen.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> diff --git a/icon-themes/karasa_jaga_svg/sd/res/chart.svg b/icon-themes/karasa_jaga_svg/sd/res/chart.svg index 574780dba8da..2bced015bcbf 100644 --- a/icon-themes/karasa_jaga_svg/sd/res/chart.svg +++ b/icon-themes/karasa_jaga_svg/sd/res/chart.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>x2="14.287499" xlink:href="#b" y1="288.268737" >y2="293.560387"/>x1="11.641666" x2="11.641666" xlink:href="#b" y1="282.977067" >y2="288.268717"/>x1="8.995833" x2="8.995833" xlink:href="#b" y1="285.6229" >y2="290.91455"/>x1="6.34" x2="6.34" xlink:href="#b" y1="289.591653" >y2="294.354163"/>height="1.055826" width="1.042098" x="-.021049" y="-.027913">stdDeviation=".14155209"/
core.git: chart2/source cui/source dbaccess/source editeng/source extensions/source forms/source include/svl reportdesign/source sc/qa sc/source sd/source sfx2/source starmath/source svl/qa svl/source
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |8 - chart2/source/controller/itemsetwrapper/ItemConverter.cxx |2 chart2/source/controller/main/ChartTransferable.cxx |2 chart2/source/view/main/ChartItemPool.cxx |4 chart2/source/view/main/ChartView.cxx |4 chart2/source/view/main/DrawModelWrapper.cxx |4 cui/source/tabpages/TextColumnsPage.cxx |4 cui/source/tabpages/connect.cxx |8 - cui/source/tabpages/measure.cxx | 12 - cui/source/tabpages/textanim.cxx | 14 - cui/source/tabpages/textattr.cxx |8 - cui/source/tabpages/tpshadow.cxx |4 dbaccess/source/ui/control/sqledit.cxx| 12 - dbaccess/source/ui/dlg/DbAdminImpl.cxx|2 dbaccess/source/ui/dlg/dbadmin.cxx|2 editeng/source/editeng/editdoc.cxx|4 editeng/source/editeng/impedit4.cxx | 10 - editeng/source/editeng/impedit5.cxx |2 editeng/source/outliner/outlvw.cxx|2 editeng/source/rtf/rtfitem.cxx|4 editeng/source/rtf/svxrtf.cxx |8 - editeng/source/uno/unofdesc.cxx | 14 - editeng/source/uno/unoipset.cxx |6 editeng/source/uno/unotext.cxx|2 extensions/source/propctrlr/fontdialog.cxx|4 forms/source/richtext/richtextengine.cxx | 10 - include/svl/itempool.hxx | 69 +--- include/svl/poolitem.hxx | 36 ++-- reportdesign/source/ui/report/ReportController.cxx|2 sc/qa/unit/subsequent_export_test.cxx | 12 - sc/source/core/data/attarray.cxx | 10 - sc/source/core/data/docpool.cxx |2 sc/source/core/data/documen3.cxx |8 - sc/source/core/data/documen9.cxx |8 - sc/source/core/data/document.cxx |4 sc/source/core/data/drwlayer.cxx | 20 +- sc/source/core/data/fillinfo.cxx |6 sc/source/core/data/global.cxx|4 sc/source/core/data/patattr.cxx |2 sc/source/core/data/stlsheet.cxx | 16 +- sc/source/core/data/table4.cxx|2 sc/source/filter/ftools/ftools.cxx|2 sc/source/filter/rtf/rtfparse.cxx |2 sc/source/filter/xml/xmlfonte.cxx |2 sc/source/ui/app/drwtrans.cxx |2 sc/source/ui/app/msgpool.cxx |2 sc/source/ui/docshell/docfunc.cxx |2 sc/source/ui/undo/undoblk.cxx |2 sc/source/ui/unoobj/defltuno.cxx | 12 - sc/source/ui/view/printfun.cxx|6 sd/source/core/drawdoc.cxx|2 sd/source/core/drawdoc2.cxx |2 sd/source/core/drawdoc4.cxx | 10 - sd/source/core/stlpool.cxx|2 sd/source/core/stlsheet.cxx |6 sd/source/ui/annotations/annotationmanager.cxx|4 sd/source/ui/dlg/dlgolbul.cxx |2 sd/source/ui/func/fuolbull.cxx|2 sd/source/ui/unoidl/unomodel.cxx |2 sd/source/ui/unoidl/unopback.cxx |6 sd/source/ui/view/viewshel.cxx|2 sfx2/source/control/shell.cxx |2 sfx2/source/dialog/tabdlg.cxx |2 sfx2/source/explorer/nochaos.cxx |4 starmath/source/smediteng.cxx |8 - svl/qa/unit/items/stylepool.cxx |4 svl/source/items/itempool.cxx | 108 +++--- svl/source/items/itemprop.cxx |4 svl/source/items/itemset.cxx | 20 +- svl/source/items/poolitem.cxx |3 svx/source/dialog/hdft.cxx|2 svx/source/dialog/weldeditview.cxx| 12 - svx/source/engine3d/view3d1.cxx |4 svx/source/svdraw/svdattr.cxx
core.git: svl/source
svl/source/crypto/cryptosign.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit d2d8f8bf82558d9aa548fb9f13bed410e0baf79b Author: Noel Grandin AuthorDate: Fri Jan 26 12:22:36 2024 +0200 Commit: Noel Grandin CommitDate: Sat Jan 27 17:44:36 2024 +0100 tdf#159381 TimeStamp(RFC3161) create problem by asn1 format error. DER rules say that BOOLEAN values are either FALSE (0x00) or TRUE (0xff) Change-Id: I59f57557fbc4d6447e0d8e994b04adda1ee8c1a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162597 Tested-by: Noel Grandin Reviewed-by: Noel Grandin diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index a234afccbc27..3fe6ae90ab34 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -1037,6 +1037,7 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer) ts_digest.len = aTsHashResult.size(); unsigned char cOne = 1; +unsigned char cTRUE = 0xff; // under DER rules true is 0xff, false is 0x00 src.version.type = siUnsignedInteger; src.version.data = &cOne; src.version.len = sizeof(cOne); @@ -1056,8 +1057,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer) src.nonce.len = sizeof(nNonce); src.certReq.type = siUnsignedInteger; -src.certReq.data = &cOne; -src.certReq.len = sizeof(cOne); +src.certReq.data = &cTRUE; +src.certReq.len = sizeof(cTRUE); src.extensions = nullptr;
core.git: basctl/source binaryurp/source chart2/qa chart2/source comphelper/source configmgr/source connectivity/source cppuhelper/source cui/source dbaccess/source desktop/source editeng/source embed
basctl/source/dlged/dlgedclip.cxx |2 binaryurp/source/bridge.cxx|2 chart2/qa/extras/chart2export.cxx |4 chart2/source/controller/dialogs/tp_AxisPositions.cxx |2 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |4 chart2/source/controller/main/ChartController_Window.cxx |4 chart2/source/controller/main/ObjectHierarchy.cxx |2 chart2/source/model/template/ChartTypeTemplate.cxx |2 chart2/source/model/template/PieChartTypeTemplate.cxx |4 chart2/source/tools/DataSeriesHelper.cxx |4 chart2/source/tools/ReferenceSizeProvider.cxx |4 chart2/source/view/charttypes/VSeriesPlotter.cxx |4 chart2/source/view/main/ShapeFactory.cxx |4 comphelper/source/misc/backupfilehelper.cxx|2 comphelper/source/misc/mimeconfighelper.cxx| 12 +- configmgr/source/writemodfile.cxx |4 connectivity/source/commontools/ConnectionWrapper.cxx |4 connectivity/source/manager/mdrivermanager.cxx |2 cppuhelper/source/propertysetmixin.cxx |4 cppuhelper/source/servicemanager.cxx |4 cui/source/customize/SvxConfigPageHelper.cxx |6 - cui/source/customize/SvxNotebookbarConfigPage.cxx |2 cui/source/customize/cfg.cxx | 18 +-- cui/source/dialogs/scriptdlg.cxx | 10 - cui/source/options/certpath.cxx|2 cui/source/options/optlingu.cxx|2 dbaccess/source/core/dataaccess/databasecontext.cxx|2 dbaccess/source/core/dataaccess/datasource.cxx |2 dbaccess/source/filter/xml/xmlExport.cxx |2 dbaccess/source/ui/browser/exsrcbrw.cxx|2 dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 dbaccess/source/ui/misc/UITools.cxx|2 desktop/source/app/check_ext_deps.cxx |2 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|2 desktop/source/deployment/gui/dp_gui_theextmgr.cxx |4 desktop/source/lib/init.cxx| 10 - desktop/source/migration/migration.cxx | 22 +-- editeng/source/accessibility/AccessibleEditableTextPara.cxx|4 embeddedobj/source/commonembedding/embedobj.cxx|2 embeddedobj/source/commonembedding/miscobj.cxx |2 embeddedobj/source/commonembedding/xfactory.cxx|4 embeddedobj/source/general/docholder.cxx |2 embeddedobj/source/general/xcreator.cxx|2 embeddedobj/source/msole/olecomponent.cxx |6 - embeddedobj/source/msole/oleembed.cxx |2 embeddedobj/source/msole/ownview.cxx |4 embedserv/source/embed/docholder.cxx |4 embedserv/source/embed/intercept.cxx |2 extensions/qa/bibliography/bibliography.cxx|2 extensions/source/bibliography/general.cxx |2 extensions/source/ole/oleobjw.cxx |2 extensions/source/propctrlr/formcomponenthandler.cxx |6 - extensions/source/propctrlr/genericpropertyhandler.cxx |2 extensions/source/propctrlr/propcontroller.cxx |2 extensions/source/update/check/updatehdl.cxx |2 filter/source/graphic/GraphicExportFilter.cxx |2 filter/source/msfilter/eschesdo.cxx|2 filter/source/pdf/pdfdialog.cxx|2 filter/source/pdf/pdfexport.cxx|4 filter/source/xsltdialog/xmlfiltertestdialog.cxx |4 filter/source/xsltfilter/LibXSLTTransformer.cxx|2 forms/source/component/ComboBox.cxx|4 forms/source/component/FormComponent.cxx |2 forms/source/component/ListBox.cxx |2 fpicker/source/office/OfficeControlAccess.cxx
core.git: svx/source
svx/source/form/formcontroller.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db227dc7d032d642983c313ab74c34a301464c2a Author: Mike Kaganski AuthorDate: Sat Jan 27 08:18:14 2024 +0100 Commit: Mike Kaganski CommitDate: Sat Jan 27 11:07:32 2024 +0100 Avoid incorrect overwrite the value It would ignore the "enabled" state, if it its read-only is false Change-Id: I155a0621d967b1026c7f83316db8b595e9d507c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162613 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 0fb1bd64c942..e39367b98353 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -2125,7 +2125,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl) bool bTouch = true; if (::comphelper::hasProperty(FM_PROP_ENABLED, xSet)) bTouch = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ENABLED)); -if (::comphelper::hasProperty(FM_PROP_READONLY, xSet)) +if (bTouch && ::comphelper::hasProperty(FM_PROP_READONLY, xSet)) bTouch = !::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_READONLY)); if (!bTouch)
