[Libreoffice-commits] core.git: embeddedobj/source

Mike Kaganski mike.kaganski at collabora.com
Thu Jan 4 20:59:07 UTC 2018


 embeddedobj/source/msole/olevisual.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit d86d3caf9853e930eb686b63309a7cc6c29cc0d2
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Thu Jan 4 14:11:05 2018 +0100

    Remove redundant control flow branch
    
    Change-Id: I5f63f2a7ad6eb6bf85b21b6936a1488ce13ccc93
    Reviewed-on: https://gerrit.libreoffice.org/47394
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index a9faa3a83eeb..820e39c2f7f0 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -345,12 +345,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
         SetVisReplInStream( m_xCachedVisualRepresentation.is() );
     }
 
-    if ( m_xCachedVisualRepresentation.is() )
-    {
-        return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation );
-    }
 #ifdef _WIN32
-    else if ( m_pOleComponent )
+    if ( !m_xCachedVisualRepresentation.is() && m_pOleComponent )
     {
         try
         {


More information about the Libreoffice-commits mailing list