core.git: 2 commits - embeddedobj/source

[Mike Kaganski (via logerrit)]

 embeddedobj/source/msole/olecomponent.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 957552bee41c282f0016cadd296f036556d7d14a
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Mar 5 18:59:59 2024 +0600
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Mar 6 15:21:31 2024 +0100

    Drop some reinterpret_casts
    
    Change-Id: I5bcfe37adbf1f142950a1a2679f22333c711735e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164456
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index f660963deb3c..2bc0263343e9 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -587,7 +587,7 @@ bool OleComponent::InitializeObject_Impl()
 
 namespace
 {
-    HRESULT OleLoadSeh(LPSTORAGE pIStorage, LPVOID* ppObj)
+    HRESULT OleLoadSeh(LPSTORAGE pIStorage, IUnknown** ppObj)
     {
         HRESULT hr = E_FAIL;
         // tdf#119039: there is a nasty bug in OleLoad, that may call an 
unpaired
@@ -601,7 +601,7 @@ namespace
             pIStorage->AddRef();
 
         __try {
-            hr = OleLoad(pIStorage, IID_IUnknown, nullptr, ppObj);
+            hr = OleLoad(pIStorage, IID_IUnknown, nullptr, 
IID_PPV_ARGS_Helper(ppObj));
         } __except( EXCEPTION_EXECUTE_HANDLER ) {
             hr = E_FAIL;
         }
@@ -626,7 +626,7 @@ void OleComponent::LoadEmbeddedObject( const OUString& 
aTempURL )
     if ( FAILED( hr ) || !m_pNativeImpl->m_pIStorage )
         throw io::IOException(); // TODO: transport error code?
 
-    hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, 
reinterpret_cast<void**>(&m_pNativeImpl->m_pObj));
+    hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, &m_pNativeImpl->m_pObj);
     if ( FAILED( hr ) || !m_pNativeImpl->m_pObj )
     {
         throw uno::RuntimeException();
@@ -857,7 +857,7 @@ void OleComponent::InitEmbeddedCopyOfLink( 
rtl::Reference<OleComponent> const &
                 {
                     hr = pObjectStorage->CopyTo( 0, nullptr, nullptr, 
m_pNativeImpl->m_pIStorage );
                     if ( SUCCEEDED( hr ) )
-                        hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, 
reinterpret_cast<void**>(&m_pNativeImpl->m_pObj));
+                        hr = OleLoadSeh(m_pNativeImpl->m_pIStorage, 
&m_pNativeImpl->m_pObj);
                 }
             }
         }
commit fcfffd2d938d21be76553d6dad38d85a7db80361
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Mar 5 18:58:56 2024 +0600
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Mar 6 15:21:24 2024 +0100

    Check the correct member
    
    It's m_pViewObject2 that will be dereferenced below.
    
    Change-Id: Ic3696953f013099ee2595a08428ba793c81b6b9c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164455
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index a38f59550c5e..f660963deb3c 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1122,7 +1122,7 @@ awt::Size OleComponent::GetExtent( sal_Int64 nAspect )
 
 awt::Size OleComponent::GetCachedExtent( sal_Int64 nAspect )
 {
-    if ( !m_pNativeImpl->m_pOleObject )
+    if (!m_pNativeImpl->m_pViewObject2)
         throw embed::WrongStateException(); // TODO: the object is in wrong 
state
 
     DWORD nMSAspect = static_cast<DWORD>(nAspect); // first 32 bits are for MS 
aspects