svn commit: r1803941 - in /openoffice/branches/AOO414/main: comphelper/source/container/embeddedobjectcontainer.cxx sfx2/source/appl/linkmgr2.cxx

[jim]

Author: jim
Date: Thu Aug  3 02:22:58 2017
New Revision: 1803941

URL: http://svn.apache.org/viewvc?rev=1803941&view=rev
Log:
No previews

Modified:
    
openoffice/branches/AOO414/main/comphelper/source/container/embeddedobjectcontainer.cxx
    openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx

Modified: 
openoffice/branches/AOO414/main/comphelper/source/container/embeddedobjectcontainer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/comphelper/source/container/embeddedobjectcontainer.cxx?rev=1803941&r1=1803940&r2=1803941&view=diff
==============================================================================
--- 
openoffice/branches/AOO414/main/comphelper/source/container/embeddedobjectcontainer.cxx
 (original)
+++ 
openoffice/branches/AOO414/main/comphelper/source/container/embeddedobjectcontainer.cxx
 Thu Aug  3 02:22:58 2017
@@ -127,7 +127,7 @@ EmbeddedObjectContainer::EmbeddedObjectC
     pImpl = new EmbedImpl;
     pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
     pImpl->mbOwnsStorage = true;
-    pImpl->mbUserAllowsLinkUpdate = true;
+    pImpl->mbUserAllowsLinkUpdate = false;
     pImpl->mpTempObjectContainer = 0;
 }
 
@@ -136,7 +136,7 @@ EmbeddedObjectContainer::EmbeddedObjectC
     pImpl = new EmbedImpl;
     pImpl->mxStorage = rStor;
     pImpl->mbOwnsStorage = false;
-    pImpl->mbUserAllowsLinkUpdate = true;
+    pImpl->mbUserAllowsLinkUpdate = false;
     pImpl->mpTempObjectContainer = 0;
 }
 
@@ -145,7 +145,7 @@ EmbeddedObjectContainer::EmbeddedObjectC
     pImpl = new EmbedImpl;
     pImpl->mxStorage = rStor;
     pImpl->mbOwnsStorage = false;
-    pImpl->mbUserAllowsLinkUpdate = true;
+    pImpl->mbUserAllowsLinkUpdate = false;
     pImpl->mpTempObjectContainer = 0;
     pImpl->m_xModel = xModel;
 }

Modified: openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx?rev=1803941&r1=1803940&r2=1803941&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx (original)
+++ openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx Thu Aug  3 
02:22:58 2017
@@ -309,27 +309,27 @@ void LinkManager::UpdateAllLinks(
                if( USHRT_MAX == nFndPos )
                        continue;                                       // war 
noch nicht vorhanden!
 
-               // Graphic-Links noch nicht updaten
+               // do not update graphic links yet
                if( !pLink->IsVisible() ||
                        ( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == 
pLink->GetObjType() ))
                        continue;
 
                if( bAskUpdate )
                {
-            int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( 
STR_QUERY_UPDATE_LINKS ) ).Execute();
-                       if( RET_YES != nRet )
-            {
-                SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
+            int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId( 
STR_QUERY_UPDATE_LINKS ) ).Execute();
+            SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
 
-                if(pShell)
-                {
-                    comphelper::EmbeddedObjectContainer& 
rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
-                    rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);
-                }
+            if(pShell)
+            {
+                comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer 
= pShell->getEmbeddedObjectContainer();
+                rEmbeddedObjectContainer.setUserAllowsLinkUpdate(RET_YES == 
nRet);
+            }
 
-                               return ;                // es soll nichts 
geupdatet werden
+                   if (RET_YES != nRet)
+                       {
+                               return;         // nothing should be updated
             }
-                       bAskUpdate = sal_False;         // einmal reicht
+                       bAskUpdate = sal_False;         // one time is OK
                }
 
                pLink->Update();