No previews

git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1803941 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 3, 2017 · cf914f8 · cf914f8
1 parent 3350dc6
commit cf914f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/main/comphelper/source/container/embeddedobjectcontainer.cxx b/main/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -127,7 +127,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
     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::EmbeddedObjectContainer( const uno::Reference < embed::
     pImpl = new EmbedImpl;
     pImpl->mxStorage = rStor;
     pImpl->mbOwnsStorage = false;
-    pImpl->mbUserAllowsLinkUpdate = true;
+    pImpl->mbUserAllowsLinkUpdate = false;
     pImpl->mpTempObjectContainer = 0;
 }
 
@@ -145,7 +145,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed::
     pImpl = new EmbedImpl;
     pImpl->mxStorage = rStor;
     pImpl->mbOwnsStorage = false;
-    pImpl->mbUserAllowsLinkUpdate = true;
+    pImpl->mbUserAllowsLinkUpdate = false;
     pImpl->mpTempObjectContainer = 0;
     pImpl->m_xModel = xModel;
 }

diff --git a/main/sfx2/source/appl/linkmgr2.cxx b/main/sfx2/source/appl/linkmgr2.cxx
@@ -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();