cui/source/dialogs/hldoctp.cxx | 11 +++++++---- drawinglayer/source/tools/primitive2dxmldump.cxx | 2 +- emfio/qa/cppunit/emf/EmfImportTest.cxx | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit 6605f58aeddb21629b842040b81df55a29443fd0 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 5 16:29:08 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Sep 5 20:06:47 2024 +0200 cui: fix another plausible crash Similar to 6633afe0ff18e5921eb96be2f863f28bd7e1110d "fix crash in Hyperlink dialog" Change-Id: Ia53ffeffaca775c66fb269e109d5fdb8c32d0066 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172917 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index c8ed1de2fa6b..52bda50b47ef 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -216,10 +216,13 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, weld::Button&, void) weld::WaitObject aWait(mpDialog->getDialog()); - if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) - mxMarkWnd->RefreshTree ( u""_ustr ); - else - mxMarkWnd->RefreshTree ( maStrURL ); + if (mxMarkWnd) + { + if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) + mxMarkWnd->RefreshTree ( u""_ustr ); + else + mxMarkWnd->RefreshTree ( maStrURL ); + } } else mxMarkWnd->SetError( LERR_DOCNOTOPEN ); commit 629a9d68eeadd1f1349c97c0131c7d1d55ad867b Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 5 17:24:33 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Sep 5 20:06:21 2024 +0200 drawinglayer: getHeight() -> getWidth() Since 01ded1e6d362dbcd7148334c6965d6ad00981d4a "WMF tdf#55058 tdf#142722 Add implementation of BitBlt and StretchBlt" Change-Id: Ib99e940c954fe44f2dbee2b14dfa9d2c79468500 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172919 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx index 527889cd7399..61c9f5ca447a 100644 --- a/drawinglayer/source/tools/primitive2dxmldump.cxx +++ b/drawinglayer/source/tools/primitive2dxmldump.cxx @@ -707,7 +707,7 @@ void Primitive2dXmlDump::decomposeAndWrite( { rWriter.startElement("data"); OUString aBitmapData = u""_ustr; - for (tools::Long x = 0; x < rSizePixel.getHeight(); x++) + for (tools::Long x = 0; x < rSizePixel.getWidth(); x++) { if (x != 0) aBitmapData = aBitmapData + ","; diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index ddb37d9dd085..71ae6b80fbee 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -146,7 +146,8 @@ CPPUNIT_TEST_FIXTURE(Test, testDrawImagePointsTypeBitmap) "ffffff,fbfbfb,fefefe,ffffff,fcfcfc,ffffff,fdfdfd,ffffff,ffffff,ffffff,ffffff,fbfbfb," "010101,ffffff,fefefe,ffffff,ffffff,ffffff,fcfcfc,ffffff,fafafa,ffffff,ffffff,fefefe," "ffffff,fdfdfd,fefefe,fefefe,ffffff,ffffff,fdfdfd,fffbfb,1e0000,8f4347,b13a3e,b82d32," - "bb3438,b73237,b63338,b33035,b63338"_ustr); + "bb3438,b73237,b63338,b33035,b63338,b83338,b9313b,b9313b,b83239,b83338,b63338,b53438," + "b63539,b53335,ba3236,a2393e,1c0000"_ustr); } CPPUNIT_TEST_FIXTURE(Test, testDrawString)
