extensions/source/update/check/download.cxx | 4 ++--
svx/source/sidebar/nbdtmg.cxx | 5 +++--
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit b03cc1dd65908a40e804c48f52f42fc6ece63ab2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jan 15 20:16:31 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 16 10:33:02 2023 +0000
cid#1474008 silence Unchecked return value from library
Change-Id: I23228ae5d61654e2c2d401453bc741a2a6074278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145539
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index ba371bdee570..8f090ed9b6dd 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -234,9 +234,9 @@ static bool curl_run(std::u16string_view rURL, OutData&
out, const OString& aPro
(void)curl_easy_setopt(pCURL, CURLOPT_FOLLOWLOCATION, 1);
// only allow redirect to https://
#if (LIBCURL_VERSION_MAJOR > 7) || (LIBCURL_VERSION_MAJOR == 7 &&
LIBCURL_VERSION_MINOR >= 85)
- curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS_STR, "https");
+ (void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS_STR, "https");
#else
- curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+ (void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS,
CURLPROTO_HTTPS);
#endif
// write function
commit 093a7f422c1184fb8043740cfb6a4f03ed328fa6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jan 15 20:15:19 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 16 10:32:55 2023 +0000
cid#1519046 Uninitialized scalar variable
bogus, but earlier return makes things easier anyway
Change-Id: Id6c0a72b0ec9bbae061cc1f883b383fbef88e771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145538
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 2519ece7e60c..5cc216324a58 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -300,6 +300,9 @@ sal_uInt16
BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
void BulletsTypeMgr::ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel)
{
+ if ( nIndex >= DEFAULT_BULLET_TYPES )
+ return;
+
if ( mLevel == sal_uInt16(0xFFFF) || mLevel == 0)
return;
@@ -314,8 +317,6 @@ void BulletsTypeMgr::ReplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uIn
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
sal_UCS4 cChar = aFmt.GetBulletChar();
std::optional<vcl::Font> pFont = aFmt.GetBulletFont();
- if ( nIndex >= DEFAULT_BULLET_TYPES )
- return;
pActualBullets[nIndex]->cBulletChar = cChar;
if ( pFont )
commit 8003a7b117f822a03b661db86534cc6b4787475a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jan 15 20:13:33 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 16 10:32:47 2023 +0000
cid#1412875 Uninitialized pointer field
Change-Id: I551a18eddb5a2f436ecb947411faef09ac74d016
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145537
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 9ec8167fbfdd..26d8876a8906 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -65,7 +65,8 @@ namespace cairo
pDisplay(pSysDat.pDisplay),
hDrawable(pSysDat.hDrawable),
pVisual(pSysDat.pVisual),
- nScreen(pSysDat.nScreen)
+ nScreen(pSysDat.nScreen),
+ pRenderFormat(nullptr)
{}
X11SysData::X11SysData( const SystemEnvData& pSysDat, const SalFrame*
pReference ) :
