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

[Luboš Luňák (via logerrit)]

 sd/source/ui/view/sdview.cxx      |    3 +--
 svtools/source/svhtml/parhtml.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 89101372c892d2ec3cfa8008101cbfb56ac1cf99
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Mar 2 18:11:53 2022 +0100
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Mar 2 20:52:16 2022 +0100

    remove self-assign
    
    Change-Id: Idd0dfd7c68dfc19458a710c79234dd76e6f91ab2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130893
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index b33734208edc..7e589642d0f2 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1079,7 +1079,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
                     aToken = aToken.toString().toAsciiLowerCase();
 
                     if (!maNamespace.isEmpty() && o3tl::starts_with(aToken, 
maNamespace))
-                        aToken = aToken.remove( 0, maNamespace.getLength());
+                        aToken.remove( 0, maNamespace.getLength());
 
                     if( HtmlTokenId::NONE == (nRet = GetHTMLToken( aToken )) )
                         // Unknown control
commit 390bba81f590cc885582d17a2f78d0465e39fb72
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 2 16:26:53 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 2 20:52:05 2022 +0100

    cid#1485150 silence Uncaught exception
    
    Change-Id: Ib7aa5dc2cd7e32d31e9da84e6dcb9e6ce5b472d3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130888
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 100374ae8205..e6173fdb9a09 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -145,7 +145,7 @@ View::~View()
 
     if (mxDropMediaSizeListener)
     {
-        mxDropMediaSizeListener->dispose();
+        suppress_fun_call_w_exception(mxDropMediaSizeListener->dispose());
         mxDropMediaSizeListener.clear();
     }
 
@@ -157,7 +157,6 @@ View::~View()
     while(PaintWindowCount())
     {
         // remove all registered OutDevs
-        // cid#1485150 silence Uncaught exception
         
suppress_fun_call_w_exception(DeleteWindowFromPaintView(GetFirstOutputDevice()));
     }
 }