[Libreoffice-commits] .: extensions/source
François Tigeot
ftigeot at kemper.freedesktop.org
Fri Apr 29 23:41:59 PDT 2011
extensions/source/nsplugin/source/npshell.cxx | 4 -
extensions/source/oooimprovecore/makefile.mk | 3 -
extensions/source/oooimprovement/errormail.cxx | 6 --
extensions/source/oooimprovement/makefile.mk | 3 -
extensions/source/plugin/base/xplugin.cxx | 2
extensions/source/plugin/inc/plugin/impl.hxx | 2
extensions/source/scanner/makefile.mk | 2
extensions/source/scanner/twain.cxx | 52 -------------------------
extensions/source/scanner/twain.hxx | 6 --
9 files changed, 4 insertions(+), 76 deletions(-)
New commits:
commit 758866b1a40efa9b8f2ebade5cabc203520b8e12
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Sat Apr 30 08:41:06 2011 +0200
Remove OS/2 support
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index d19b7b6..6aaaea6 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -29,10 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
-#ifdef OS2
-#define UNIX
-#endif
-
#ifdef UNIX
#define XP_UNIX 1
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
index f92804d..66ab6cd 100644
--- a/extensions/source/oooimprovecore/makefile.mk
+++ b/extensions/source/oooimprovecore/makefile.mk
@@ -48,9 +48,6 @@ LIB1FILES= \
$(SLB)$/$(TARGET).lib \
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-.IF "$(GUI)"=="OS2"
-SHL1TARGET=oooimpc$(DLLPOSTFIX)
-.ENDIF
SHL1STDLIBS= \
$(COMPHELPERLIB) \
diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx
index 81bf38b..db0e1ed 100644
--- a/extensions/source/oooimprovement/errormail.cxx
+++ b/extensions/source/oooimprovement/errormail.cxx
@@ -35,7 +35,7 @@
#include <rtl/string.hxx>
#include <rtl/strbuf.hxx>
-#if defined(UNIX) || defined(OS2)
+#if defined(UNIX)
#include <sys/utsname.h>
#endif
#ifdef WIN32
@@ -81,14 +81,12 @@ namespace {
return "Win32";
#elif defined UNIX
return "Unix";
- #elif defined OS2
- return "OS/2";
#else
return "Unknown";
#endif
};
-#if defined(UNIX) || defined(OS2)
+#if defined(UNIX)
static const OString getLocale()
{
const char * locale = getenv( "LC_ALL" );
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index 16e3f12..a24707e 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -66,9 +66,6 @@ SHL1STDLIBS= \
$(UNOTOOLSLIB) \
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-.IF "$(GUI)"=="OS2"
-SHL1TARGET= oooimp$(DLLPOSTFIX)
-.ENDIF
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 8712239..19d1d6c 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -546,7 +546,7 @@ void XPlugin_Impl::loadPlugin()
sv[0],
sv[1]
);
-#elif (defined WNT || defined OS2)
+#elif defined WNT
PluginComm* pComm = new PluginComm_Impl( m_aDescription.Mimetype,
m_aDescription.PluginName,
(HWND)pEnvData->hWnd );
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 142f5f9..0ca0125 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -75,8 +75,6 @@
#ifdef WNT
#include <plugin/win/sysplug.hxx>
-#elif defined(OS2)
-#include "plugin/os2/sysplug.hxx"
#elif defined(QUARTZ)
#include "plugin/aqua/sysplug.hxx"
#elif defined(UNX)
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index 32112dd..60d1900 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -46,7 +46,7 @@ SLOFILES+=\
$(SLO)$/scanwin.obj
.ENDIF
-.IF "$(GUI)"=="UNX" || "$(GUI)" =="OS2"
+.IF "$(GUI)"=="UNX"
SLOFILES+=\
$(SLO)$/sane.obj \
$(SLO)$/sanedlg.obj \
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index 7555b48..9f41919 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -35,9 +35,6 @@
#if defined( WNT )
#include <windows.h>
#endif
-#ifdef OS2
-#include <svpm.h>
-#endif // OS2
#include <osl/module.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
@@ -56,9 +53,6 @@
#if defined WNT
#define TWAIN_LIBNAME "TWAIN_32.DLL"
#define TWAIN_FUNCNAME "DSM_Entry"
-#elif defined OS2
-#define TWAIN_LIBNAME "twain"
-#define TWAIN_FUNCNAME "DSM_ENTRY"
#endif
// -----------
@@ -71,18 +65,6 @@ static ImpTwain* pImpTwainInstance = NULL;
// - Procs -
// ---------
-#ifdef OS2
-
- #define PTWAINMSG QMSG*
-
- MRESULT EXPENTRY TwainWndProc( HWND hWnd, ULONG nMsg, MPARAM nParam1, MPARAM nParam2 )
- {
- return (MRESULT) TRUE;
- }
-
-
-#else // OS2
-
#define PTWAINMSG MSG*
// -------------------------------------------------------------------------
@@ -113,8 +95,6 @@ static ImpTwain* pImpTwainInstance = NULL;
}
}
-#endif // OS2
-
// ------------
// - ImpTwain -
// ------------
@@ -142,14 +122,6 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
strcpy( aAppIdent.ProductFamily,"Office");
strcpy( aAppIdent.ProductName, "Office");
-#ifdef OS2
-
- hAB = Sysdepen::GethAB();
- ImplFallback( TWAIN_EVENT_QUIT );
- // hTwainWnd = WinCreateWindow( HWND_DESKTOP, WC_FRAME, "dummy", 0, 0, 0, 0, 0, HWND_DESKTOP, HWND_BOTTOM, 0, 0, 0 );
-
-#else
-
HWND hParentWnd = HWND_DESKTOP;
WNDCLASS aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ),
NULL, NULL, NULL, NULL, "TwainClass" };
@@ -157,8 +129,6 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
RegisterClass( &aWc );
hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, hParentWnd, NULL, aWc.hInstance, 0 );
hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() );
-
-#endif
}
// -----------------------------------------------------------------------------
@@ -269,11 +239,6 @@ void ImpTwain::ImplOpenSource()
if( ( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &aSrcIdent ) == TWRC_SUCCESS ) &&
( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &aSrcIdent ) == TWRC_SUCCESS ) )
{
-#ifdef OS2
-
- // negotiate capabilities
-
-#else
TW_CAPABILITY aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
TW_ONEVALUE* pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
@@ -282,7 +247,6 @@ void ImpTwain::ImplOpenSource()
GlobalUnlock( aCap.hContainer );
PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_CAPABILITY, MSG_SET, &aCap );
GlobalFree( aCap.hContainer );
-#endif
nCurState = 4;
}
@@ -387,11 +351,6 @@ void ImpTwain::ImplXfer()
case( TWRC_XFERDONE ):
{
-#ifdef OS2
-
- // get OS/2-Bitmap
-
-#else // OS2
const ULONG nSize = GlobalSize( (HGLOBAL) hDIB );
char* pBuf = (char*) GlobalLock( (HGLOBAL) hDIB );
@@ -404,7 +363,6 @@ void ImpTwain::ImplXfer()
}
GlobalFree( (HGLOBAL) hDIB );
-#endif // OS2
// set resolution of bitmap if neccessary
if ( ( nXRes != -1 ) && ( nYRes != - 1 ) && ( nWidth != - 1 ) && ( nHeight != - 1 ) )
@@ -506,14 +464,6 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, p )
{
-#ifdef OS2
-
- if( hWndTwain )
- WinDestroyWindow( hWndTwain );
-
- // unset hook
-
-#else
if( hTwainWnd )
DestroyWindow( hTwainWnd );
@@ -521,8 +471,6 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, p )
if( hTwainHook )
UnhookWindowsHookEx( hTwainHook );
-#endif
-
delete this;
pImpTwainInstance = NULL;
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 75ef0ce..031a385 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -75,14 +75,8 @@ public:
sal_Bool ImplHandleMsg( void* pMsg );
-#ifdef OS2
- HAB hAB;
- HWND hTwainWnd;
- long hTwainHook;
-#else
HWND hTwainWnd;
HHOOK hTwainHook;
-#endif
public:
More information about the Libreoffice-commits
mailing list