[Libreoffice-commits] core.git: 2 commits - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/misc/translatelangselect.cxx |    1 -
 sw/source/uibase/uiview/viewport.cxx      |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9fc42afd17e9115b488401f64804479e7a76a300
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Nov 12 19:49:40 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Nov 13 11:04:07 2023 +0100

    ofz#64106 Null-dereference READ
    
    Change-Id: Ie279f9f54fa6cc7fcc6add9b737d2c5dc248a236
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159349
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/uiview/viewport.cxx 
b/sw/source/uibase/uiview/viewport.cxx
index b66bbadab3bf..08d9b0c39338 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -315,8 +315,9 @@ void SwView::SetVisArea( const Point &rPt, bool 
bUpdateScrollbar )
 
 void SwView::CheckVisArea()
 {
-    m_pHScrollbar->SetAuto( m_pWrtShell->GetViewOptions()->getBrowseMode() &&
-                            !GetViewFrame().GetFrame().IsInPlace() );
+    if (m_pHScrollbar)
+        m_pHScrollbar->SetAuto( m_pWrtShell->GetViewOptions()->getBrowseMode() 
&&
+                                !GetViewFrame().GetFrame().IsInPlace() );
     if ( IsDocumentBorder() )
     {
         if ( m_aVisArea.Left() != DOCUMENTBORDER ||
commit 333070dd1ca45e1966f312ba78dbc5985ab814d7
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Nov 12 20:59:21 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Nov 13 11:03:56 2023 +0100

    don't need this in the end
    
    Change-Id: Iebb5131209c289bd797682c8f79d925449b551e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159350
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/ui/misc/translatelangselect.cxx 
b/sw/source/ui/misc/translatelangselect.cxx
index 7b3c35528e0a..4de844e04343 100644
--- a/sw/source/ui/misc/translatelangselect.cxx
+++ b/sw/source/ui/misc/translatelangselect.cxx
@@ -159,7 +159,6 @@ IMPL_LINK_NOARG(SwTranslateLangSelectDlg, 
LangSelectTranslateHdl, weld::Button&,
     SwTranslateHelper::TranslateAPIConfig aConfig({ aAPIUrl, aAuthKey, 
aTargetLang });
     SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, aConfig, 
m_bCancelTranslation);
     m_xDialog->response(RET_OK);
-    m_bTranslationStarted = false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */