Repository.mk | 1
configmgr/source/valueparser.cxx | 1
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 1
extras/Module_extras.mk | 1
extras/Package_autotext.mk | 14
----------
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 1
sc/source/ui/view/tabview.cxx | 4 ++
svtools/source/brwbox/datwin.cxx | 1
svx/source/stbctrls/zoomsliderctrl.cxx | 1
sw/source/core/view/pagepreviewlayout.cxx | 3 ++
11 files changed, 11 insertions(+), 18 deletions(-)
New commits:
commit a025eef0034e76e91b9fa4a2e33b133ce6dd07eb
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Nov 17 14:49:39 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Nov 18 22:24:40 2024 +0100
cid#1606638 silence Overflowed integer argument
and
cid#1608572 Overflowed integer argument
cid#1607772 Overflowed integer argument
cid#1607196 Overflowed integer argument
cid#1606568 Overflowed return value
cid#1607573 Overflowed return value
Change-Id: I9a701b19026572127399712c3b660094f2a0bd40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176740
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 04d2059c1de9..edf39add25e5 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -201,6 +201,7 @@ template< typename T > css::uno::Any parseListValue(
}
if (text.length != 0) {
for (xmlreader::Span t(text);;) {
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
sal_Int32 i = rtl_str_indexOfStr_WithLength(
t.begin, t.length, sep.begin, sep.length);
T val;
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index e3789008306f..67acb9c7cdc7 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -581,6 +581,7 @@ OUString replaceOrigin(
size_t write_pos = 0;
while (nBytes > 0)
{
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
sal_Int32 index = rtl_str_indexOfChar_WithLength( pBytes, nBytes, '%'
);
if (index < 0) {
if (! use_filtered) // opt
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 9088af8a6e24..363bd1d54113 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1773,6 +1773,7 @@ void ScTabView::DoHSplit(tools::Long nSplitPos)
}
else
{
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
SCCOL nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT );
tools::Long nLeftWidth = nSplitPos -
pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
if ( nLeftWidth < 0 ) nLeftWidth = 0;
@@ -1839,7 +1840,10 @@ void ScTabView::DoVSplit(tools::Long nSplitPos)
else
{
if ( aOldMode == SC_SPLIT_NONE )
+ {
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
nOldDelta = aViewData.GetPosY( SC_SPLIT_BOTTOM );
+ }
else
nOldDelta = aViewData.GetPosY( SC_SPLIT_TOP );
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 01e8c9997f23..a05c3e3f149c 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -55,6 +55,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
if ( !aText.isEmpty() )
{
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
OUString aVal = rDev.GetEllipsisString(aText,aInnerRect.GetWidth() -
2*MIN_COLUMNWIDTH);
vcl::Font aFont( rDev.GetFont() );
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 0a0346f38129..632f4dc826e5 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -122,6 +122,7 @@ sal_uInt16 SvxZoomSliderControl::Offset2Zoom( tools::Long
nOffset ) const
// returns the offset to the left control border
tools::Long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
{
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
const tools::Long nControlWidth = getControlRect().GetWidth();
tools::Long nRet = nSliderXOffset;
diff --git a/sw/source/core/view/pagepreviewlayout.cxx
b/sw/source/core/view/pagepreviewlayout.cxx
index 35bf15bdc48c..a1627def992b 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -936,7 +936,10 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
nScrollAmount = (mnPreviewLayoutHeight - gnYFree) * _nWinPagesToScroll;
}
else
+ {
+ // coverity[ tainted_data_return : FALSE ] version 2023.12.2
nScrollAmount = _nWinPagesToScroll *
maPaintedPreviewDocRect.GetHeight();
+ }
// check, if preview layout size values are valid.
// If not, the checks for an adjustment of the scroll amount aren't useful.
commit 331bcad4dbe923f4ce47cfe1de64ea0ffbe5a6ce
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Nov 18 20:07:23 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Nov 18 22:24:27 2024 +0100
Revert "add an autotext 'common' directory like templates/common"
This reverts commit 3b267b65d24616fe49ca1410b123d186a59541d0.
reports of test failures at:
https://gerrit.libreoffice.org/c/core/+/176508
Nothing depends on this right now, so I'll have second go at this later.
Change-Id: I95999f05c69fa9b2459128116927616b1f6a9ca5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176743
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index a263a235925a..c90c56880147 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -960,7 +960,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extensions_OOoSpotlightImporter \
) \
extras_autocorr \
- extras_autotext \
extras_autotextuser \
extras_cfgsrvnolang \
extras_cfgusr \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index ed9a1e33e0ce..0c04202e8a20 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_gallsystem \
CustomTarget_templates \
Package_autocorr \
- Package_autotext \
Package_autotextuser \
Package_cfgsrvnolang \
Package_cfgusr \
diff --git a/extras/Package_autotext.mk b/extras/Package_autotext.mk
deleted file mode 100644
index d5b5c6471fc8..000000000000
--- a/extras/Package_autotext.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call
gb_Package_Package,extras_autotext,$(gb_CustomTarget_workdir)/extras/source/autotext))
-
-$(eval $(call
gb_Package_add_empty_directory,extras_autotext,$(LIBO_SHARE_FOLDER)/autotext/common))
-
-# vim: set noet sw=4 ts=4:
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index fa25191be2a4..b5b304b8f362 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -34,7 +34,6 @@
</node>
<node oor:name="AutoText" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
- <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/common"
oor:op="fuse"/>
<node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)"
oor:op="fuse"/>
</node>
<prop oor:name="WritePath">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 09ca450b00fe..5fa9ec24c2f5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1377,7 +1377,6 @@
</info>
<value>
<it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
- <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/common</it>
<it>$(userurl)/autotext</it>
</value>
</prop>
