diff options
| author | Mathias Supp <mathias.supp@vector.com> | 2014-02-25 04:04:48 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-25 11:31:20 +0100 |
| commit | 450cb7831f077df43582de15631de3886888e9e0 (patch) | |
| tree | b45f01dfef195dbdff8cde1735fdc9e5af970a59 /sw | |
| parent | 26b06662ebc3e5d664400bc95c39d6220de03136 (diff) | |
add parameter to supress dialog
With the new parameter you can now supress the dialog for document
compare in writer.
Change-Id: I984ee75552e5c006332331510df5d437b687903f
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/uibase/uiview/view2.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx index b7d865e4b6c8..52212a3dc44f 100644 --- a/sw/source/core/uibase/uiview/view2.cxx +++ b/sw/source/core/uibase/uiview/view2.cxx @@ -732,6 +732,7 @@ void SwView::Execute(SfxRequest &rReq) sal_Int16 nVersion = 0; bool bHasFileName = false; m_pViewImpl->SetParam( 0 ); + bool bNoAcceptDialog = false; if( pArgs ) { @@ -747,6 +748,10 @@ void SwView::Execute(SfxRequest &rReq) nVersion = ((const SfxInt16Item *)pItem)->GetValue(); m_pViewImpl->SetParam( nVersion ); } + if( SFX_ITEM_SET == pArgs->GetItemState( SID_NO_ACCEPT_DIALOG, sal_False, &pItem )) + { + bNoAcceptDialog = ((const SfxBoolItem *)pItem)->GetValue(); + } } m_pViewImpl->InitRequest( rReq ); @@ -756,7 +761,7 @@ void SwView::Execute(SfxRequest &rReq) { rReq.SetReturnValue( SfxInt32Item( nSlot, nFound )); - if (nFound > 0) // show Redline browser + if (nFound > 0 && !bNoAcceptDialog) // show Redline browser { SfxViewFrame* pVFrame = GetViewFrame(); pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT); |