Author: ydario
Date: Tue Mar 27 15:15:48 2012
New Revision: 1305868
URL: http://svn.apache.org/viewvc?rev=1305868&view=rev
Log:
i119097: remove OS/2 exception handling and menu hilite code due to incorrect
licensing (code will be reworked soon).
Removed:
incubator/ooo/trunk/main/sal/osl/os2/debug.c
incubator/ooo/trunk/main/sal/osl/os2/except.c
incubator/ooo/trunk/main/sal/osl/os2/helpers/
incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h
Modified:
incubator/ooo/trunk/main/sal/osl/os2/makefile.mk
incubator/ooo/trunk/main/sal/osl/os2/process.c
incubator/ooo/trunk/main/sal/osl/os2/salinit.cxx
incubator/ooo/trunk/main/vcl/source/window/menu.cxx
Modified: incubator/ooo/trunk/main/sal/osl/os2/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/makefile.mk?rev=1305868&r1=1305867&r2=1305868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/makefile.mk (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/makefile.mk Tue Mar 27 15:15:48 2012
@@ -72,8 +72,6 @@ SLOFILES= $(SLO)$/conditn.obj \
$(SLO)$/file_url.obj \
$(SLO)$/file_error_transl.obj \
$(SLO)$/file_path_helper.obj \
- $(SLO)$/debug.obj \
- $(SLO)$/except.obj \
$(SLO)$/debug_printf.obj \
$(SLO)$/salinit.obj
@@ -101,8 +99,6 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/file_url.obj \
$(OBJ)$/file_error_transl.obj \
$(OBJ)$/file_path_helper.obj \
- $(OBJ)$/debug.obj \
- $(OBJ)$/except.obj \
$(OBJ)$/debug_printf.obj \
$(OBJ)$/salinit.obj
Modified: incubator/ooo/trunk/main/sal/osl/os2/process.c
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/process.c?rev=1305868&r1=1305867&r2=1305868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/process.c (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/process.c Tue Mar 27 15:15:48 2012
@@ -44,7 +44,6 @@
// for exception logging
#include <stdio.h>
#include <setjmp.h>
-#include "helpers/except.h"
#define MAX_ARGS 255
Modified: incubator/ooo/trunk/main/sal/osl/os2/salinit.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/salinit.cxx?rev=1305868&r1=1305867&r2=1305868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/salinit.cxx (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/salinit.cxx Tue Mar 27 15:15:48 2012
@@ -35,7 +35,6 @@
#include <stdio.h>
#include <string.h>
#include <setjmp.h>
-#include "helpers/except.h"
extern "C" {
@@ -80,13 +79,15 @@ static FILE* APIENTRY _oslExceptOpenLogF
/*----------------------------------------------------------------------------*/
+#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
static EXCEPTSTRUCT g_excptstruct = {0};
+#endif
void SAL_CALL sal_detail_initialize(int argc, char ** argv)
{
APIRET rc = -1;
-#if OSL_DEBUG_LEVEL == 0
+#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE);
g_excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;
@@ -108,7 +109,7 @@ void SAL_CALL sal_detail_deinitialize()
{
APIRET rc = -1;
-#if OSL_DEBUG_LEVEL == 0
+#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
rc =
DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
#endif
}
Modified: incubator/ooo/trunk/main/vcl/source/window/menu.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/menu.cxx?rev=1305868&r1=1305867&r2=1305868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/menu.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/menu.cxx Tue Mar 27 15:15:48 2012
@@ -101,12 +101,14 @@ DBG_NAME( Menu )
#ifdef OS2
#include "svsys.h"
-#include "os2/xwphook.h"
// return sal_True if hilite should be executed: left mouse button down
// or xwp mouse hook enabled
static sal_Bool ImplHilite( const MouseEvent& rMEvt )
{
+#if 1 // until hilite code reworked
+ return sal_True;
+#else
static sal_Bool init = sal_False;
static HOOKCONFIG hc;
@@ -124,6 +126,7 @@ static sal_Bool ImplHilite( const MouseE
return sal_True;
// return xwp flag
return hc.fSlidingMenus;
+#endif
}
#endif
