canvas/source/directx/dx_9rm.cxx | 2 +- connectivity/source/drivers/ado/AConnection.cxx | 2 +- connectivity/source/drivers/ado/Awrapado.cxx | 4 ++-- drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx | 2 +- editeng/qa/unit/core-test.cxx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit a6e0ba8386dc99a6a6ef1a117d74f0d91fb6e8d0 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Jan 24 18:01:48 2026 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Jan 24 16:24:54 2026 +0100 Use some more IID_PPV_ARGS_Helper to avoid reinterpret_cast It was already used in commits like e2bfc34d146806a8f96be0cd2323d716f12cba4e (Reimplement OleComponentNative_Impl to use IGlobalInterfaceTable, 2024-03-11). Change-Id: I8fd60d8eab3ce2d16bfd6766b7fcdcb8b0b182ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198041 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 93738b3455cf..303ef2ac31fc 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -748,7 +748,7 @@ namespace dxcanvas sal::systools::COMReference<IDirect3DSurface9> DXRenderModule::createSystemMemorySurface(const ::basegfx::B2ISize& rSize) { if(isDisposed()) - return sal::systools::COMReference<IDirect3DSurface9>(nullptr); + return {}; // please note that D3DFMT_X8R8G8B8 is the only format we're // able to choose here, since GetDC() doesn't support any diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 8fe1f3920c1e..2a120bc29a9f 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -67,7 +67,7 @@ OConnection::OConnection(ODriver* _pDriver) nullptr, ADOS::IID_ADOCONNECTION_21, ADOS::GetKeyStr(), - reinterpret_cast<void**>(&m_aAdoConnection)); + IID_PPV_ARGS_Helper(&m_aAdoConnection)); if( !FAILED( hr ) ) { diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 74abd185353f..7f13b61415fd 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -256,7 +256,7 @@ void WpADOCommand::Create() nullptr, ADOS::IID_ADOCOMMAND_21, ADOS::GetKeyStr(), - reinterpret_cast<void**>(&pCommand)); + IID_PPV_ARGS_Helper(&pCommand)); if( !FAILED( hr ) ) pInterface = std::move(pCommand); @@ -642,7 +642,7 @@ bool WpADOProperty::PutAttributes(sal_Int32 _nDefSize) nullptr, ADOS::IID_ADORECORDSET_21, ADOS::GetKeyStr(), - reinterpret_cast<void**>(&pRec)); + IID_PPV_ARGS_Helper(&pRec)); if( !FAILED( hr ) ) pInterface = std::move(pRec); diff --git a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx index 3ce7c2dd23e1..303e0a65ac49 100644 --- a/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx @@ -70,7 +70,7 @@ public: { const HRESULT hr(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, __uuidof(ID2D1Factory), nullptr, - reinterpret_cast<void**>(&mpD2DFactory))); + IID_PPV_ARGS_Helper(&mpD2DFactory))); if (!SUCCEEDED(hr)) mpD2DFactory.clear(); commit b801ea3788f92afb4cffa254a012386bfa2fa423 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Jan 24 18:11:06 2026 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Jan 24 16:24:41 2026 +0100 Fix Windows build C:/lo/core/editeng/qa/unit/core-ttest.cxx(2447): error C2672: 'CppUnit::assertEquals': no matching overloaded function found Change-Id: I9ff0a59fc3ee6de00ba3a54442f66feb66a9d25e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198042 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 1f3e9c7adfce..93aea9a83149 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -2444,7 +2444,7 @@ void Test::testTdf157037PasteTextAutoDirection() aEditEngine.InsertText(xData, OUString(), rDoc.GetEndPaM(), /*paste special*/ true); // Check that the paste worked - CPPUNIT_ASSERT_EQUAL(29, rDoc.GetTextLen()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(29), rDoc.GetTextLen()); CPPUNIT_ASSERT_EQUAL(u"Example"_ustr, rDoc.GetParaAsString(sal_Int32(0))); CPPUNIT_ASSERT_EQUAL(u"مثال"_ustr, rDoc.GetParaAsString(sal_Int32(1))); CPPUNIT_ASSERT_EQUAL(u"Example"_ustr, rDoc.GetParaAsString(sal_Int32(2)));
