diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-11-03 14:55:19 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-11-05 10:46:31 +0100 |
| commit | bce042ca83c7cb5cc3e3bdc07c50b60e6a1ed659 (patch) | |
| tree | 3a3446c04e2f743401f8019b326c921a4f093b0f /sfx2/source | |
| parent | 9c248f9265747351f32bf52d608a91393bfdf1e2 (diff) | |
CMIS: added confirmation dialog for cancel checkout
Change-Id: I12317bd8c91756c7960f04d2fad38dd509840932
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/app.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/app.src | 7 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 5cbfd7fed9a8..fb322cbf3251 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -112,6 +112,7 @@ #define RID_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186) #define RID_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187) +#define RID_QUERY_CANCELCHECKOUT (RID_SFX_APP_START + 188) #define RID_XMLSEC_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190) diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 6eae48d2f327..d1dcccd11c9f 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -432,6 +432,13 @@ QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN Message [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ; }; +QueryBox RID_QUERY_CANCELCHECKOUT +{ + Buttons = WB_YES_NO ; + DefButton = WB_DEF_YES ; + Message [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ; +}; + InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT { Message [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 116f97608c5f..490a72bf54b1 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -951,7 +951,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } case SID_CANCELCHECKOUT: { - CancelCheckOut( ); + if ( QueryBox( NULL, SfxResId( RID_QUERY_CANCELCHECKOUT ) ).Execute( ) == RET_YES ) + { + CancelCheckOut( ); + } break; } case SID_CHECKIN: |