diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-04 14:59:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-04 16:43:32 +0100 |
| commit | e7c0f8711f95895b501c869959fe07b93d0a1e80 (patch) | |
| tree | fd0a224329e5c3ac03be5b46482255e0be0c408e /sfx2 | |
| parent | ba5093e723bdaf30a94f598c89d733bfc220ec7b (diff) | |
"2" as arg for PrepareClose is never checked for
The 2 for PrepareClose came in with 38db42605a5b72efd55a43eff81fbc517fe0424b
"#89423#: added SID_CLOSEDOC, SID_BACKTOWEBTOP, SID_LOGOUT in PluginMenu" and
was checked with if( SfxApplication::IsPlugin() == sal_False || bUI == 2 ) in
sfx2/source/doc/objxtor.cxx and then that was removed with
367568c891771d20bb8f8b3b579857f51c0e9016 "#132394#: remove superfluous code"
Change-Id: Ib273c88b4365ea6b261c7e52bbe1876aa796dc17
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index a80a91a9f776..50e71ce377d3 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -286,7 +286,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( !pFrame || !pFrame->GetWindow().IsReallyVisible() ) continue; - if ( pObjSh->PrepareClose(2) ) + if (pObjSh->PrepareClose(true)) pObjSh->SetModified( false ); else return; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 085b69746ab7..f01f199ed281 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -855,7 +855,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // Cancelled by the user? - if ( !PrepareClose( 2 ) ) + if (!PrepareClose(true)) { rReq.SetReturnValue( SfxBoolItem(0, false) ); rReq.Done(); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a8fae9eac8cf..0d00015943e7 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -558,8 +558,8 @@ struct BoolEnv_Impl bool SfxObjectShell::PrepareClose ( - sal_Bool bUI // sal_True: Dialog and so on is allowed - // sal_False: silent-mode + bool bUI // true: Dialog and so on is allowed + // false: silent-mode ) { if( pImp->bInPrepareClose || pImp->bPreparedForClose ) |