commit 368b583b992f2e9cad46c2362c9529a07c36d7a9
author Tamás Zolnai <tamas.zolnai@collabora.com> Wed Aug 09 21:43:09 2017 +0200
committer Tamás Zolnai <tamas.zolnai@collabora.com> Thu Aug 10 02:26:05 2017 +0200
tree 1074851ebde990cafae61f6efd409f29a9eb7376
parent 622347b913dd0aedaec1d0a4658e5dc7801f6bde

Avoid warning in OleHandler

Related to ActiveX controls.

Change-Id: Ief7ee67ca8e4f086a1d5e0400d0eaf3ebc8cdaaf
Reviewed-on: https://gerrit.libreoffice.org/40934
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>

writerfilter/source/dmapper/OLEHandler.cxx

diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 24ec24c..ae1e13a 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -100,6 +101,12 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
        {
            uno::Reference< drawing::XShape > xTempShape;
            rVal.getAny() >>= xTempShape;

            // Control shape is handled on a different code path
            uno::Reference< lang::XServiceInfo > xSInfo( xTempShape, uno::UNO_QUERY_THROW );
            if(xSInfo->supportsService("com.sun.star.drawing.ControlShape"))
                break;

            if( xTempShape.is() )
            {
                m_xShape.set( xTempShape );