diff options
| author | Armin Le Grand <alg@apache.org> | 2014-08-07 09:59:26 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-12 07:45:37 -0500 |
| commit | 070f5923eac7a93b64d2f168d91a3983b80a22c0 (patch) | |
| tree | d5d59ff0a53e0a12d89625bd5efa61eae7003746 /sfx2 | |
| parent | ca51beb73336b3a19364df02aab82d56a2a63e74 (diff) | |
Resolves: #i125386# secured user request and changed some bools to bitfield
(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx
(cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)
Conflicts:
include/comphelper/embeddedobjectcontainer.hxx
Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
Reviewed-on: https://gerrit.libreoffice.org/10882
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index e1e460616a57..878479f1ee63 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -328,7 +328,17 @@ void LinkManager::UpdateAllLinks( { int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString() ).Execute(); if( RET_YES != nRet ) - return ; // nothing should be updated + { + SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); + + if(pShell) + { + comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer(); + rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false); + } + + return ; // nothing should be updated + } bAskUpdate = false; // once is enough } |