Kaydet (Commit) 450cb783 authored tarafından Mathias Supp's avatar Mathias Supp Kaydeden (comit) Markus Mohrhard

add parameter to supress dialog

With the new parameter you can now supress the dialog for document
compare in writer.

Change-Id: I984ee75552e5c006332331510df5d437b687903f
üst 26b06662
...@@ -264,6 +264,7 @@ ...@@ -264,6 +264,7 @@
#define SID_MAIL_SENDDOCASFORMAT (SID_SFX_START + 1707) #define SID_MAIL_SENDDOCASFORMAT (SID_SFX_START + 1707)
#define SID_MAIL_SENDDOCASMS (SID_SFX_START + 1708) #define SID_MAIL_SENDDOCASMS (SID_SFX_START + 1708)
#define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709) #define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709)
#define SID_NO_ACCEPT_DIALOG (SID_SFX_START + 1710)
#define SID_NOAUTOSAVE (SID_SFX_START + 1711) #define SID_NOAUTOSAVE (SID_SFX_START + 1711)
#define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712) #define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712)
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713) #define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
...@@ -285,6 +286,7 @@ ...@@ -285,6 +286,7 @@
// SID_SFX_free_START (SID_SFX_START + 1728) // SID_SFX_free_START (SID_SFX_START + 1728)
// SID_SFX_free_END (SID_SFX_START + 3999) // SID_SFX_free_END (SID_SFX_START + 3999)
#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
// FREE, was SID_VIEW_ZOOM_MODE // FREE, was SID_VIEW_ZOOM_MODE
// FREE, was SID_VIEW_POS_SIZE // FREE, was SID_VIEW_POS_SIZE
...@@ -753,7 +755,6 @@ ...@@ -753,7 +755,6 @@
#define SC_VIEW_START (SID_SC_START) #define SC_VIEW_START (SID_SC_START)
#endif #endif
#define FID_CHG_RECORD (EDIT_MENU_START + 18) #define FID_CHG_RECORD (EDIT_MENU_START + 18)
//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
#define SID_CHG_PROTECT (SC_VIEW_START + 84) #define SID_CHG_PROTECT (SC_VIEW_START + 84)
// eof ------------------------------------------------------------------------ // eof ------------------------------------------------------------------------
......
...@@ -1071,7 +1071,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS ...@@ -1071,7 +1071,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION) (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION, SfxBoolItem NoAcceptDialog SID_NO_ACCEPT_DIALOG)
[ [
/* flags: */ /* flags: */
AutoUpdate = FALSE, AutoUpdate = FALSE,
...@@ -4302,9 +4302,6 @@ SfxObjectItem Open SID_OPENDOC ...@@ -4302,9 +4302,6 @@ SfxObjectItem Open SID_OPENDOC
RecordPerSet; RecordPerSet;
Asynchron; Asynchron;
/* status: */
SlotType = SfxStringItem
/* config: */ /* config: */
AccelConfig = TRUE, AccelConfig = TRUE,
MenuConfig = TRUE, MenuConfig = TRUE,
......
...@@ -732,6 +732,7 @@ void SwView::Execute(SfxRequest &rReq) ...@@ -732,6 +732,7 @@ void SwView::Execute(SfxRequest &rReq)
sal_Int16 nVersion = 0; sal_Int16 nVersion = 0;
bool bHasFileName = false; bool bHasFileName = false;
m_pViewImpl->SetParam( 0 ); m_pViewImpl->SetParam( 0 );
bool bNoAcceptDialog = false;
if( pArgs ) if( pArgs )
{ {
...@@ -747,6 +748,10 @@ void SwView::Execute(SfxRequest &rReq) ...@@ -747,6 +748,10 @@ void SwView::Execute(SfxRequest &rReq)
nVersion = ((const SfxInt16Item *)pItem)->GetValue(); nVersion = ((const SfxInt16Item *)pItem)->GetValue();
m_pViewImpl->SetParam( nVersion ); 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 ); m_pViewImpl->InitRequest( rReq );
...@@ -756,7 +761,7 @@ void SwView::Execute(SfxRequest &rReq) ...@@ -756,7 +761,7 @@ void SwView::Execute(SfxRequest &rReq)
{ {
rReq.SetReturnValue( SfxInt32Item( nSlot, nFound )); rReq.SetReturnValue( SfxInt32Item( nSlot, nFound ));
if (nFound > 0) // show Redline browser if (nFound > 0 && !bNoAcceptDialog) // show Redline browser
{ {
SfxViewFrame* pVFrame = GetViewFrame(); SfxViewFrame* pVFrame = GetViewFrame();
pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT); pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment