diff options
| author | Armin Le Grand <alg@apache.org> | 2014-08-07 09:59:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-09 14:13:08 +0100 |
| commit | d005acae3aa315921f2c331612131626c470bd22 (patch) | |
| tree | af56821361fa3207f147ddf393b90ad98945cc85 /sfx2 | |
| parent | bb8540a3b4fe0798669a1d355695c97d86ef58a0 (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
Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
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 501ec5457d00..c5e38888f4cc 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -329,7 +329,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 } |