diff options
-rw-r--r-- | include/sfx2/sfx.hrc | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmshell.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/app/docsh2.cxx | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 713514848377..6529c5af6781 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -287,8 +287,6 @@ #define HID_INTERFACE_SFXHELP_VIEWSH 24 -#define RET_NEWTASK 200 - #endif // #ifndef _SFX_HRC // ******************************************************************* EOF diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index befa7aef21ce..3a02be14c515 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -651,10 +651,6 @@ sal_uInt16 SfxObjectShell::PrepareClose else if ( RET_CANCEL == nRet ) // Cancelled return sal_False; - else if ( RET_NEWTASK == nRet ) - { - return RET_NEWTASK; - } } pImp->bPreparedForClose = sal_True; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 30b0a238241e..c897ed5af603 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -287,9 +287,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/) case RET_CANCEL: return sal_False; - - case RET_NEWTASK: - return RET_NEWTASK; } if ( bModified ) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 99544d28ecd6..6ae5687b553e 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -307,7 +307,7 @@ sal_uInt16 SwDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) { sal_uInt16 nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing ); - if( sal_True == nRet ) //has to be queried against TRUE! (RET_NEWTASK) + if( sal_True == nRet ) EndListening( *this ); if( pDoc && IsInPrepareClose() ) |