From da6682c1cf339cb711a6ba2d28673978d42e446a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>

Date: Tue, 13 Sep 2016 12:32:04 +0100

Subject: [PATCH] disable generation of ole previews in ODF format until after

 load

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

so the user update links dialog can control their generation

SdrEmbedObjectLink becomes exposed to calc so it can

detect if the link dialog needs to be used to update

ole links.

Reviewed-on: https://gerrit.libreoffice.org/28879

Reviewed-by: Caolán McNamara <caolanm@redhat.com>

Tested-by: Caolán McNamara <caolanm@redhat.com>

(cherry picked from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3)

detangle gadzillion checks into something readable

no logic change intended

(cherry picked from commit fad9786b06d188ba6e354620f57176f3d94a6637)

+ partial merge of

commit c09b3e32372537be739182b02ae83a96386d1e1c

Author: Noel Grandin <noel@peralex.com>

Date:   Tue Mar 8 13:13:59 2016 +0200

    loplugin:constantparam in sw

for bool bUI is always true in UpdateLinks

Unmodified default SdrOle2Obj size is 101x101

svx/source/unodraw/unoshape.cxx

sets a css::awt::Size maSize to 100, 100

svx/source/unodraw/unopage.cxx

increases that by 1, 1

awt::Size aSize = xShape->getSize();

aSize.Width += 1;

aSize.Height += 1;

to call SdrObjFactory::MakeNewObject with 101, 101

so default size is 101x101 (getWidth() vs GetWidth() confusion ?)

Reviewed-on: https://gerrit.libreoffice.org/28895

Reviewed-by: Caolán McNamara <caolanm@redhat.com>

Tested-by: Caolán McNamara <caolanm@redhat.com>

(cherry picked from commit 7f0a219c9ad38ae33b51ff69d545f69659691c1e)

b6af93afc1f80b7fc36239c96d5e0a71fcbcb789

4d4375dff64d7b8e236d1a24322e749e04ee530f

Reviewed-on: https://gerrit.libreoffice.org/28930

Tested-by: Jenkins <ci@libreoffice.org>

Reviewed-by: Michael Stahl <mstahl@redhat.com>

Reviewed-by: Eike Rathke <erack@redhat.com>

Tested-by: Eike Rathke <erack@redhat.com>

(cherry picked from commit 2ff4c68b63c4842ec85a21287317096b6ca8e66e)

Change-Id: Id1dd7ea17342140eab9307d546528747e3a98090

---

 embeddedobj/source/commonembedding/visobj.cxx      |  6 +-

 include/svx/svdoole2.hxx                           | 16 ++++

 sc/inc/documentlinkmgr.hxx                         |  5 +-

 sc/source/ui/docshell/docsh.cxx                    |  7 +-

 sc/source/ui/docshell/docsh4.cxx                   | 12 ++-

 sc/source/ui/docshell/documentlinkmgr.cxx          | 26 ++++++-

 sc/source/ui/view/tabvwsh4.cxx                     |  2 +-

 sd/source/core/drawdoc.cxx                         |  6 ++

 sd/source/ui/docshell/docshel4.cxx                 |  5 +-

 svx/source/svdraw/svdoole2.cxx                     | 20 -----

 svx/source/unodraw/unoshap4.cxx                    |  4 +-

 sw/inc/IDocumentLinksAdministration.hxx            |  2 +-

 .../doc/DocumentLinksAdministrationManager.cxx     | 85 ++++++++++++----------

 .../inc/DocumentLinksAdministrationManager.hxx     |  2 +-

 sw/source/filter/basflt/shellio.cxx                |  2 +-

 sw/source/uibase/app/docsh.cxx                     |  2 +-

 sw/source/uibase/app/docshini.cxx                  |  3 +

 17 files changed, 131 insertions(+), 74 deletions(-)

diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx

index fea7c3a2cf0a..3ee85851af9f 100644

--- a/embeddedobj/source/commonembedding/visobj.cxx

+++ b/embeddedobj/source/commonembedding/visobj.cxx

@@ -174,7 +174,11 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe

     bool bBackToLoaded = false;

     if ( m_nObjectState == embed::EmbedStates::LOADED )

     {

-        changeState( embed::EmbedStates::RUNNING );

+        awt::Size aOrigSize = getVisualAreaSize(nAspect);

+        changeState(embed::EmbedStates::RUNNING);

+        awt::Size aNewSize = getVisualAreaSize(nAspect);

+        if (aOrigSize.Width != aNewSize.Width || aOrigSize.Height != aNewSize.Height)

+            setVisualAreaSize(nAspect, aOrigSize);

         // the links should be switched back to loaded state for now to avoid locking problems

         bBackToLoaded = m_bIsLink;

diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx

index f14646b20428..7f47ebff607b 100644

--- a/include/svx/svdoole2.hxx

+++ b/include/svx/svdoole2.hxx

@@ -22,6 +22,7 @@

 #include <svx/svdorect.hxx>

 #include <svx/svxdllapi.h>

+#include <sfx2/linkmgr.hxx>

 #include <com/sun/star/uno/Reference.h>

@@ -179,6 +180,21 @@ public:

     virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE;

 };

+class SVX_DLLPUBLIC SdrEmbedObjectLink : public sfx2::SvBaseLink

+{

+    SdrOle2Obj*         pObj;

+

+public:

+    explicit            SdrEmbedObjectLink(SdrOle2Obj* pObj);

+    virtual             ~SdrEmbedObjectLink();

+

+    virtual void        Closed() override;

+    virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(

+        const OUString& rMimeType, const css::uno::Any & rValue ) override;

+

+    bool                Connect() { return GetRealObject() != nullptr; }

+};

+

 #endif // INCLUDED_SVX_SVDOOLE2_HXX

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx

index 0af5cf896c63..cc42410ca3dc 100644

--- a/sc/inc/documentlinkmgr.hxx

+++ b/sc/inc/documentlinkmgr.hxx

@@ -53,14 +53,17 @@ public:

     bool idleCheckLinks();

     bool hasDdeLinks() const;

+    bool hasDdeOrOleLinks() const;

-    bool updateDdeLinks( vcl::Window* pWin );

+    bool updateDdeOrOleLinks(vcl::Window* pWin);

     bool updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem );

     size_t getDdeLinkCount() const;

     void disconnectDdeLinks();

+private:

+    bool hasDdeOrOleLinks(bool bDde, bool bOle) const;

 };

 }

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx

index d0c083625465..25dab86e5ca0 100644

--- a/sc/source/ui/docshell/docsh.cxx

+++ b/sc/source/ui/docshell/docsh.cxx

@@ -561,9 +561,12 @@ bool ScDocShell::Load( SfxMedium& rMedium )

     GetUndoManager()->Clear();

-    bool bRet = SfxObjectShell::Load( rMedium );

-    if( bRet )

+    bool bRet = SfxObjectShell::Load(rMedium);

+    if (bRet)

     {

+        comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = getEmbeddedObjectContainer();

+        rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);

+

         if (GetMedium())

         {

             SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false);

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx

index 969c678e4ce1..9fcf549c8920 100644

--- a/sc/source/ui/docshell/docsh4.cxx

+++ b/sc/source/ui/docshell/docsh4.cxx

@@ -29,6 +29,7 @@ using namespace ::com::sun::star;

 #include "scitems.hxx"

 #include <sfx2/fcontnr.hxx>

+#include <sfx2/linkmgr.hxx>

 #include <sfx2/objface.hxx>

 #include <sfx2/docfile.hxx>

 #include <svtools/ehdl.hxx>

@@ -42,6 +43,7 @@ using namespace ::com::sun::star;

 #include <svx/drawitem.hxx>

 #include <svx/fmshell.hxx>

 #include <svtools/xwindowitem.hxx>

+#include <svx/svdoole2.hxx>

 #include <sfx2/passwd.hxx>

 #include <sfx2/filedlghelper.hxx>

 #include <sfx2/dispatch.hxx>

@@ -407,6 +409,9 @@ void ScDocShell::Execute( SfxRequest& rReq )

             break;

         case SID_UPDATETABLINKS:

             {

+                comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = getEmbeddedObjectContainer();

+                rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);

+

                 ScDocument& rDoc = GetDocument();

                 ScLkUpdMode nSet = rDoc.GetLinkMode();

@@ -450,9 +455,9 @@ void ScDocShell::Execute( SfxRequest& rReq )

                     ReloadTabLinks();

                     aDocument.UpdateExternalRefLinks(GetActiveDialogParent());

-                    bool bAny = aDocument.GetDocLinkManager().updateDdeLinks(GetActiveDialogParent());

+                    bool bAnyDde = aDocument.GetDocLinkManager().updateDdeOrOleLinks(GetActiveDialogParent());

-                    if (bAny)

+                    if (bAnyDde)

                     {

                         //  Formeln berechnen und painten wie im TrackTimeHdl

                         aDocument.TrackFormulas();

@@ -468,7 +473,10 @@ void ScDocShell::Execute( SfxRequest& rReq )

                     rReq.Done();

                 }

                 else

+                {

+                    rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);

                     rReq.Ignore();

+                }

             }

             break;

diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx

index 42745eb3f344..8e5a5c3a02bb 100644

--- a/sc/source/ui/docshell/documentlinkmgr.cxx

+++ b/sc/source/ui/docshell/documentlinkmgr.cxx

@@ -23,7 +23,7 @@

 #include <sc.hrc>

 #include <scresid.hxx>

-#include <sfx2/linkmgr.hxx>

+#include <svx/svdoole2.hxx>

 #include <vcl/layout.hxx>

 #include <boost/noncopyable.hpp>

@@ -115,6 +115,16 @@ bool DocumentLinkManager::idleCheckLinks()

 bool DocumentLinkManager::hasDdeLinks() const

 {

+    return hasDdeOrOleLinks(true, false);

+}

+

+bool DocumentLinkManager::hasDdeOrOleLinks() const

+{

+    return hasDdeOrOleLinks(true, true);

+}

+

+bool DocumentLinkManager::hasDdeOrOleLinks(bool bDde, bool bOle) const

+{

     if (!mpImpl->mpLinkManager)

         return false;

@@ -122,14 +132,16 @@ bool DocumentLinkManager::hasDdeLinks() const

     for (size_t i = 0, n = rLinks.size(); i < n; ++i)

     {

         sfx2::SvBaseLink* pBase = *rLinks[i];

-        if (dynamic_cast<ScDdeLink*>(pBase))

+        if (bDde && dynamic_cast<ScDdeLink*>(pBase))

+            return true;

+        if (bOle && dynamic_cast<SdrEmbedObjectLink*>(pBase))

             return true;

     }

     return false;

 }

-bool DocumentLinkManager::updateDdeLinks( vcl::Window* pWin )

+bool DocumentLinkManager::updateDdeOrOleLinks( vcl::Window* pWin )

 {

     if (!mpImpl->mpLinkManager)

         return false;

@@ -143,6 +155,14 @@ bool DocumentLinkManager::updateDdeLinks( vcl::Window* pWin )

     for (size_t i = 0, n = rLinks.size(); i < n; ++i)

     {

         sfx2::SvBaseLink* pBase = *rLinks[i];

+

+        SdrEmbedObjectLink* pOleLink = dynamic_cast<SdrEmbedObjectLink*>(pBase);

+        if (pOleLink)

+        {

+            pOleLink->Update();

+            continue;

+        }

+

         ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>(pBase);

         if (!pDdeLink)

             continue;

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx

index 64a6e9f0f063..ff3a5a1d94f1 100644

--- a/sc/source/ui/view/tabvwsh4.cxx

+++ b/sc/source/ui/view/tabvwsh4.cxx

@@ -1584,7 +1584,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode )

             if (!bLink)

             {

                 const sc::DocumentLinkManager& rMgr = rDoc.GetDocLinkManager();

-                if (rMgr.hasDdeLinks() || rDoc.HasAreaLinks())

+                if (rMgr.hasDdeOrOleLinks() || rDoc.HasAreaLinks())

                     bLink = true;

             }

             if (bLink)

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx

index f820fabaab81..6b5673f66592 100644

--- a/sd/source/core/drawdoc.cxx

+++ b/sd/source/core/drawdoc.cxx

@@ -694,6 +694,12 @@ void SdDrawDocument::UpdateAllLinks()

     {

         pDocLockedInsertingLinks = this; // lock inserting links. only links in this document should by resolved

+        if (mpDocSh)

+        {

+            comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = mpDocSh->getEmbeddedObjectContainer();

+            rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);

+        }

+

         pLinkManager->UpdateAllLinks();  // query box: update all links?

         if( pDocLockedInsertingLinks == this )

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx

index bed2fd7b4e97..b56f46e717f9 100644

--- a/sd/source/ui/docshell/docshel4.cxx

+++ b/sd/source/ui/docshell/docshel4.cxx

@@ -285,8 +285,11 @@ bool DrawDocShell::Load( SfxMedium& rMedium )

     }

     bRet = SfxObjectShell::Load( rMedium );

-    if( bRet )

+    if (bRet)

     {

+        comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = getEmbeddedObjectContainer();

+        rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);

+

         bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );

     }

diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx

index 403646b6f10e..8985a3bb8a60 100644

--- a/svx/source/svdraw/svdoole2.cxx

+++ b/svx/source/svdraw/svdoole2.cxx

@@ -58,7 +58,6 @@

 #include <comphelper/classids.hxx>

 #include <sot/formats.hxx>

-#include <sfx2/linkmgr.hxx>

 #include <svtools/transfer.hxx>

 #include <cppuhelper/implbase5.hxx>

@@ -588,25 +587,6 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow >

     m_xWindow = _xWindow;

 }

-

-

-class SdrEmbedObjectLink : public sfx2::SvBaseLink

-{

-    SdrOle2Obj*         pObj;

-

-public:

-                        SdrEmbedObjectLink(SdrOle2Obj* pObj);

-    virtual             ~SdrEmbedObjectLink();

-

-    virtual void        Closed() SAL_OVERRIDE;

-    virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(

-        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;

-

-    bool                Connect() { return GetRealObject() != NULL; }

-};

-

-

-

 SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):

     ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ),

     pObj(pObject)

diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx

index 9b9d7500b162..002f69e35dec 100644

--- a/svx/source/unodraw/unoshap4.cxx

+++ b/svx/source/unodraw/unoshap4.cxx

@@ -416,7 +416,7 @@ bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )

     if( xObj.is() )

     {

         Rectangle aRect = pOle2Obj->GetLogicRect();

-        if ( aRect.GetWidth() == 100 && aRect.GetHeight() == 100 )

+        if ( aRect.GetWidth() == 101 && aRect.GetHeight() == 101 )

         {

             // TODO/LATER: is it possible that this method is used to create an iconified object?

             // default size

@@ -484,7 +484,7 @@ bool SvxOle2Shape::createLink( const OUString& aLinkURL )

     if( xObj.is() )

     {

         Rectangle aRect = pOle2Obj->GetLogicRect();

-        if ( aRect.GetWidth() == 100 && aRect.GetHeight() == 100 )

+        if ( aRect.GetWidth() == 101 && aRect.GetHeight() == 101 )

         {

             // default size

             try

diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx

index 8d4f4c74d47f..e618b111e427 100644

--- a/sw/inc/IDocumentLinksAdministration.hxx

+++ b/sw/inc/IDocumentLinksAdministration.hxx

@@ -46,7 +46,7 @@ using rtl::OUString;

     /** #i42634# Moved common code of SwReader::Read() and

         SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():

     */

-    virtual void UpdateLinks(bool bUI) = 0;

+    virtual void UpdateLinks() = 0;

     /** SS fuers Linken von Dokumentteilen  / ?? for linking of parts of documents.

     */

diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx

index 989a85240f58..882050b52f45 100644

--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx

+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx

@@ -199,47 +199,58 @@ const sfx2::LinkManager& DocumentLinksAdministrationManager::GetLinkManager() co

 // #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks()

 // to new SwDoc::UpdateLinks():

-void DocumentLinksAdministrationManager::UpdateLinks( bool bUI )

+void DocumentLinksAdministrationManager::UpdateLinks()

 {

-    SfxObjectCreateMode eMode;

-    sal_uInt16 nLinkMode = m_rDoc.GetDocumentSettingManager().getLinkUpdateMode( true );

-    if ( m_rDoc.GetDocShell()) {

-        sal_uInt16 nUpdateDocMode = m_rDoc.GetDocShell()->GetUpdateDocMode();

-        if( (nLinkMode != NEVER ||  document::UpdateDocMode::FULL_UPDATE == nUpdateDocMode) &&

-            !GetLinkManager().GetLinks().empty() &&

-            SfxObjectCreateMode::INTERNAL !=

-                        ( eMode = m_rDoc.GetDocShell()->GetCreateMode()) &&

-            SfxObjectCreateMode::ORGANIZER != eMode &&

-            SfxObjectCreateMode::PREVIEW != eMode &&

-            !m_rDoc.GetDocShell()->IsPreview() )

+    if (!m_rDoc.GetDocShell())

+        return;

+    SfxObjectCreateMode eMode = m_rDoc.GetDocShell()->GetCreateMode();

+    if (eMode == SfxObjectCreateMode::INTERNAL)

+        return;

+    if (eMode == SfxObjectCreateMode::ORGANIZER)

+        return;

+    if (eMode == SfxObjectCreateMode::PREVIEW)

+        return;

+    if (m_rDoc.GetDocShell()->IsPreview())

+        return;

+    if (GetLinkManager().GetLinks().empty())

+        return;

+    sal_uInt16 nLinkMode = m_rDoc.GetDocumentSettingManager().getLinkUpdateMode(true);

+    sal_uInt16 nUpdateDocMode = m_rDoc.GetDocShell()->GetUpdateDocMode();

+    if (nLinkMode == NEVER && nUpdateDocMode != document::UpdateDocMode::FULL_UPDATE)

+        return;

+

+    bool bAskUpdate = nLinkMode == MANUAL;

+    bool bUpdate = true;

+    switch(nUpdateDocMode)

+    {

+        case document::UpdateDocMode::NO_UPDATE:   bUpdate = false;break;

+        case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = false; break;

+        case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = true; break;

+    }

+    if (nLinkMode == AUTOMATIC && !bAskUpdate)

+    {

+        SfxMedium * medium = m_rDoc.GetDocShell()->GetMedium();

+        if (!SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks(

+                medium == nullptr ? OUString() : medium->GetName()))

         {

-            bool bAskUpdate = nLinkMode == MANUAL;

-            bool bUpdate = true;

-            switch(nUpdateDocMode)

-            {

-                case document::UpdateDocMode::NO_UPDATE:   bUpdate = false;break;

-                case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = false; break;

-                case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = true; break;

-            }

-            if (nLinkMode == AUTOMATIC && !bAskUpdate)

-            {

-                SfxMedium * medium = m_rDoc.GetDocShell()->GetMedium();

-                if (!SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks(

-                        medium == nullptr ? OUString() : medium->GetName()))

-                {

-                    bAskUpdate = true;

-                }

-            }

-            if( bUpdate && (bUI || !bAskUpdate) )

-            {

-                SfxMedium* pMedium = m_rDoc.GetDocShell()->GetMedium();

-                SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0;

-                vcl::Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0;

-

-                GetLinkManager().UpdateAllLinks( bAskUpdate, true, false, pDlgParent );

-            }

+            bAskUpdate = true;

         }

     }

+    comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = m_rDoc.GetDocShell()->getEmbeddedObjectContainer();

+    if (bUpdate)

+    {

+        rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);

+

+        SfxMedium* pMedium = m_rDoc.GetDocShell()->GetMedium();

+        SfxFrame* pFrame = pMedium ? pMedium->GetLoadTargetFrame() : nullptr;

+        vcl::Window* pDlgParent = pFrame ? &pFrame->GetWindow() : nullptr;

+

+        GetLinkManager().UpdateAllLinks( bAskUpdate, true, false, pDlgParent );

+    }

+    else

+    {

+        rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);

+    }

 }

 bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const OUString& rMimeType,

diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx

index 79eb9adf3b96..712cb7942b74 100644

--- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx

+++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx

@@ -47,7 +47,7 @@ public:

     const sfx2::LinkManager& GetLinkManager() const SAL_OVERRIDE;

-    void UpdateLinks(bool bUI) SAL_OVERRIDE;

+    void UpdateLinks() override;

     bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const SAL_OVERRIDE;

diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx

index d42b0642a52c..b111e80d73cc 100644

--- a/sw/source/filter/basflt/shellio.cxx

+++ b/sw/source/filter/basflt/shellio.cxx

@@ -364,7 +364,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )

         // #i42634# Moved common code of SwReader::Read() and

         // SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():

     // ATM still with Update

-        pDoc->getIDocumentLinksAdministration().UpdateLinks( true );

+        pDoc->getIDocumentLinksAdministration().UpdateLinks();

         // not insert: set the redline mode read from settings.xml

         eOld = static_cast<RedlineMode_t>(

diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx

index 6655f045539e..dd307248832e 100644

--- a/sw/source/uibase/app/docsh.cxx

+++ b/sw/source/uibase/app/docsh.cxx

@@ -1179,7 +1179,7 @@ void SwDocShell::CalcLayoutForOLEObjects()

 // read by the binary filter:

 void SwDocShell::UpdateLinks()

 {

-    GetDoc()->getIDocumentLinksAdministration().UpdateLinks(true);

+    GetDoc()->getIDocumentLinksAdministration().UpdateLinks();

     // #i50703# Update footnote numbers

     SwTextFootnote::SetUniqueSeqRefNo( *GetDoc() );

     SwNodeIndex aTmp( GetDoc()->GetNodes() );

diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx

index fca4e2e44657..faefa968d26c 100644

--- a/sw/source/uibase/app/docshini.cxx

+++ b/sw/source/uibase/app/docshini.cxx

@@ -486,6 +486,9 @@ bool  SwDocShell::Load( SfxMedium& rMedium )

     bool bRet = false;

     if( SfxObjectShell::Load( rMedium ))

     {

+        comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = getEmbeddedObjectContainer();

+        rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);

+

         SAL_INFO( "sw.ui", "after SfxInPlaceObject::Load" );

         if (m_pDoc)              // for last version!!

             RemoveLink();       // release the existing

-- 

2.12.0