include/sfx2/sfx.hrc | 2 --
sfx2/source/doc/objxtor.cxx | 4 ----
svx/source/form/fmshell.cxx | 3 ---
sw/source/ui/app/docsh2.cxx | 2 +-
4 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 46f48148d3569153ef20f90df3f0ea9e95944565
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 14 08:23:52 2014 +0100
RET_NEWTASK is apparently unused (since around 2000)
Change-Id: I3c0804d35c5ff7a00ec7169d0ab387f4b63d65d3
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 7135148..6529c5a 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 befa7ae..3a02be1 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 30b0a23..c897ed5 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 99544d2..6ae5687 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() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
