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

[Tamás Zolnai]

 xmloff/source/text/txtimp.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c7c5a96ee3ca0fe06933b35e04983b6fef01b5f6
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed May 17 15:59:06 2017 +0200

    Use is() method for checkin reference validity
    
    Change-Id: Ib294a2555a8512d1ca31cf1edc92659b9d7638ed

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4d5543bbddbd..53bb6b70bced 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1116,11 +1116,11 @@ bool XMLTextImportHelper::IsDuplicateFrame(const OUString& sName, sal_Int32 nX,
     if (HasFrameByName(sName))
     {
         uno::Reference<beans::XPropertySet> xOtherFrame;
-        if(m_xImpl->m_xTextFrames && m_xImpl->m_xTextFrames->hasByName(sName))
+        if(m_xImpl->m_xTextFrames.is() && m_xImpl->m_xTextFrames->hasByName(sName))
             xOtherFrame.set(m_xImpl->m_xTextFrames->getByName(sName), uno::UNO_QUERY);
-        else if(m_xImpl->m_xGraphics && m_xImpl->m_xGraphics->hasByName(sName))
+        else if(m_xImpl->m_xGraphics.is() && m_xImpl->m_xGraphics->hasByName(sName))
             xOtherFrame.set(m_xImpl->m_xGraphics->getByName(sName), uno::UNO_QUERY);
-        else if (m_xImpl->m_xObjects && m_xImpl->m_xObjects->hasByName(sName))
+        else if (m_xImpl->m_xObjects.is() && m_xImpl->m_xObjects->hasByName(sName))
             xOtherFrame.set(m_xImpl->m_xObjects->getByName(sName), uno::UNO_QUERY);
 
         Reference< XPropertySetInfo > xPropSetInfo = xOtherFrame->getPropertySetInfo();