[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - starmath/source

[Caolán McNamara (via logerrit)]

 starmath/source/view.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1232444faf7f311d5d79f0e0291a8e261f8258b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 15 11:25:28 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Sep 15 16:54:44 2022 +0200

    Conditional jump or move depends on uninitialised value
    
    ==1533286== Conditional jump or move depends on uninitialised value(s)
    ==1533286==    at 0x12DEC3C9: param_double_validate (gparamspecs.c:592)
    ==1533286==    by 0x12DEF924: g_param_value_validate (gparam.c:700)
    ==1533286==    by 0x12DEFA9A: object_set_property (gobject.c:1594)
    ==1533286==    by 0x12DF1F96: g_object_set_valist (gobject.c:2538)
    ==1533286==    by 0x12DF2253: g_object_set (gobject.c:2705)
    ==1533286==    by 0x241E8C44: gtk_adjustment_configure (gtkadjustment.c:833)
    ==1533286==    by 0x23B6310A: (anonymous 
namespace)::GtkInstanceScrolledWindow::vadjustment_configure(int, int, int, 
int, int, int) (gtkinst.cxx:8207)
    ==1533286==    by 0x23B63D3D: virtual thunk to (anonymous 
namespace)::GtkInstanceScrolledWindow::vadjustment_configure(int, int, int, 
int, int, int) (gtkinst.cxx:0)
    ==1533286==    by 0x36424112: SmGraphicWindow::Resize() (view.cxx:227)
    
    Change-Id: Ib81e26b1042e7a5eebd0a2b561f57f7b4eb25dd4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139977
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e5f67a040a85..2ddb7a23043b 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -100,6 +100,8 @@ using namespace css::uno;
 
 SmGraphicWindow::SmGraphicWindow(SmViewShell& rShell)
     : InterimItemWindow(&rShell.GetViewFrame()->GetWindow(), 
"modules/smath/ui/mathwindow.ui", "MathWindow")
+    , nLinePixH(GetSettings().GetStyleSettings().GetScrollBarSize())
+    , nColumnPixW(nLinePixH)
     , nZoom(100)
     // continue to use user-scrolling to make this work equivalent to how it 
'always' worked
     , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow", 
true))
@@ -108,8 +110,6 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell& rShell)
 {
     InitControlBase(mxGraphic->GetDrawingArea());
 
-    nColumnPixW = nLinePixH = 
GetSettings().GetStyleSettings().GetScrollBarSize();
-
     mxScrolledWindow->connect_hadjustment_changed(LINK(this, SmGraphicWindow, 
ScrollHdl));
     mxScrolledWindow->connect_vadjustment_changed(LINK(this, SmGraphicWindow, 
ScrollHdl));