diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 17:00:45 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 17:00:45 +0300 |
commit | 27266b10b8aaa9e2f559de7e6c36249c329105f4 (patch) | |
tree | 81419fa86b4fbfbdb77d24a6d883816c1a37d12e | |
parent | replace res/commandimagelist with cmd in toolkit (diff) | |
download | core-27266b10b8aaa9e2f559de7e6c36249c329105f4.tar.gz core-27266b10b8aaa9e2f559de7e6c36249c329105f4.zip |
Drop OS2
44 files changed, 29 insertions, 357 deletions
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 9ed3c77381b0..dd4fa54f3354 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -31,7 +31,7 @@ #include <deque> -#if defined( OS2 ) || defined( UNX ) +#if defined( UNX ) #include <wchar.h> #endif #include <osl/mutex.hxx> diff --git a/dtrans/util/makefile.mk b/dtrans/util/makefile.mk index 8df69bbf1d36..850f2910fbf7 100644 --- a/dtrans/util/makefile.mk +++ b/dtrans/util/makefile.mk @@ -155,27 +155,6 @@ DEF4EXPORTFILE= exports.dxp .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -# --- sysdtrans dll --- - -SHL3TARGET=$(TARGET3) - -SHL3LIBS=$(SLB)$/sysdtrans.lib - -SHL3STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - UClip.lib - -SHL3IMPLIB=i$(SHL3TARGET) - -SHL3DEF= $(MISC)$/$(SHL3TARGET).def -DEF3NAME= $(SHL3TARGET) -DEF3EXPORTFILE= exports.dxp - -.ENDIF # "$(GUI)"=="OS2" .ENDIF # L10N_framework .INCLUDE : target.mk diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index b8e0224a5cd0..ebd1740aa1b3 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -45,9 +45,7 @@ APP1TARGET= rsc APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB) APP1LIBS= $(LB)$/rsctoo.lib APP1OBJS= $(OBJ)$/start.obj -.IF "$(GUI)" != "OS2" APP1STACK=64000 -.ENDIF APP1RPATH=NONE APP2TARGET= rsc2 @@ -58,9 +56,7 @@ APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscrsc.lib \ $(LB)$/rscmis.lib APP2OBJS= $(OBJ)$/gui.obj -.IF "$(GUI)" != "OS2" APP2STACK=64000 -.ENDIF APP2RPATH=NONE # --- Targets ------------------------------------------------------------ diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 532851ffbdea..8a949546ce3a 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -41,12 +41,7 @@ #include <io.h> #include <process.h> -#if defined ( OS2 ) && !defined ( GCC ) -#include <direct.h> -#endif -#if !defined ( OS2 ) #include <dos.h> -#endif #endif // UNX #include <rsctools.hxx> @@ -151,11 +146,7 @@ static sal_Bool CallPrePro( const ByteString& rPrePro, pCmdL = &aRespCmdL; for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ ) { -#ifdef OS2 - fprintf( fRspFile, "%s\n", (const char *)aNewCmdL.GetEntry( i ) ); -#else fprintf( fRspFile, "%s ", (const char *)aNewCmdL.GetEntry( i ) ); -#endif } fclose( fRspFile ); @@ -171,7 +162,7 @@ static sal_Bool CallPrePro( const ByteString& rPrePro, } } -#if defined UNX || defined OS2 +#if defined UNX nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); @@ -238,28 +229,16 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, { } else -#ifdef OS2 - fprintf( fRspFile, "%s\n", -#else fprintf( fRspFile, "%s ", -#endif (const char *)pCmdLine->GetEntry( i ) ); }; -#ifdef OS2 - fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() ); -#else fprintf( fRspFile, "%s", aSrsName.GetBuffer() ); -#endif for ( size_t i = 0, n = pInputList->size(); i < n; ++i ) { pString = (*pInputList)[ i ]; -#ifdef OS2 - fprintf( fRspFile, "%s\n", pString->GetBuffer() ); -#else fprintf( fRspFile, " %s", pString->GetBuffer() ); -#endif }; fclose( fRspFile ); @@ -281,7 +260,7 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, printf( "\n" ); } -#if defined UNX || defined OS2 +#if defined UNX nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() ); diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 3654330a9035..92887b1c675f 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -168,7 +168,7 @@ void setincdirs() * verwendete knallte es in strcpy() ! */ -#if !defined( WNT ) && ! defined UNX && ! defined OS2 +#if !defined( WNT ) && ! defined UNX extern char *getenv( char *pStr ); /* BP */ #endif char *pIncGetEnv = NULL; /* Pointer auf INCLUDE */ diff --git a/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk index ca62bb37792c..2cec0885ffad 100644 --- a/rsc/source/rscpp/makefile.mk +++ b/rsc/source/rscpp/makefile.mk @@ -61,10 +61,8 @@ OBJFILES= \ LIBSALCPPRT=$(0) APP1TARGET= $(TARGET) APP1LIBS=$(LB)$/$(TARGET).lib -.IF "$(GUI)" != "OS2" APP1STACK=32768 .ENDIF -.ENDIF .IF "$(GUI)"=="UNX" CDEFS+=-Dunix diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 11f4fff7caf1..ec0931607c44 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -36,9 +36,6 @@ #if defined (WNT ) #include <direct.h> #endif -#if defined ( OS2 ) && !defined ( GCC ) -#include <direct.h> -#endif #include <string.h> #include <ctype.h> diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 16e51ebef9e6..c95f212ba976 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4429,8 +4429,6 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding ) default: // default system #if WNT return '\x80'; -#elif OS2 - return '\xD5'; #elif UNX // return '\xA4'; // #56121# 0xA4 waere korrekt fuer iso-8859-15 return '\x80'; // aber Windoze-Code fuer die konvertierten TrueType-Fonts diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index a2cb7191cd17..3f6ffafd0028 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -226,11 +226,7 @@ DdeConnection::~DdeConnection() sal_Bool DdeConnection::IsConnected() { CONVINFO c; -#ifdef OS2 - c.nSize = sizeof( c ); -#else c.cb = sizeof( c ); -#endif if ( DdeQueryConvInfo( pImp->hConv, QID_SYNC, &c ) ) return sal_True; else diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index abf99344cf7c..bf9bb50fde1f 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -29,25 +29,10 @@ #ifndef _DDEIMP_HXX #define _DDEIMP_HXX -#ifdef OS2 - -#include "ddemlos2.h" - -#define WORD sal_uInt16 -#define DWORD sal_uLong -#define LPBYTE sal_uInt8* -#define LPWORD sal_uInt16* -#define LPDWORD sal_uLong* -#define LPCTSTR PCSZ - -#else - #include <windows.h> #include <ddeml.h> #include "ddewrap.hxx" -#endif - #include <tools/string.hxx> #include <tools/shl.hxx> #include <vector> @@ -83,7 +68,7 @@ public: static HDDEDATA CALLBACK InfCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); #else -#if (defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if defined( ICC ) static HDDEDATA CALLBACK CliCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); static HDDEDATA CALLBACK SvrCallback diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index f93d1b653a9f..3c4f7a4fcaa2 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -41,7 +41,7 @@ HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) #else -#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if defined( ICC ) HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) #else diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index df99f4552837..99b8cce0ae71 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -61,7 +61,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) #else -#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if defined( ICC ) HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) @@ -1065,28 +1065,8 @@ String DdeService::Formats() case CF_BITMAP: p = reinterpret_cast<LPCTSTR>(String::CreateFromAscii("BITMAP").GetBuffer()); break; -#ifdef OS2 - case CF_DSPTEXT: - p = String::CreateFromAscii("TEXT").GetBuffer(); - break; - case CF_DSPBITMAP: - p = String::CreateFromAscii("BITMAP").GetBuffer(); - break; - case CF_METAFILE: - p = String::CreateFromAscii("METAFILE").GetBuffer(); - break; - case CF_DSPMETAFILE: - p = String::CreateFromAscii("METAFILE").GetBuffer(); - break; - case CF_PALETTE: - p = String::CreateFromAscii("PALETTE").GetBuffer(); - break; - default: - p= String::CreateFromAscii("PRIVATE").GetBuffer(); -#else default: GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) ); -#endif } s += String( reinterpret_cast<const sal_Unicode*>(p) ); } diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx index fbdfb573edae..5a8cee962e38 100644 --- a/svtools/inc/svtools/fltdefs.hxx +++ b/svtools/inc/svtools/fltdefs.hxx @@ -72,20 +72,10 @@ typedef sal_uInt8* PDIBBYTE; #endif -#if defined ( OS2 ) || defined ( UNX ) +#if defined ( UNX ) void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 ); void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer ); -#ifdef OS2 -#define RGBQUAD RGBQUADOS2 -#define BITMAPFILEHEADER BITMAPFILEHEADEROS2 -#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2 -#define BITMAPINFOHEADER BITMAPINFOHEADEROS2 -#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2 -#define BITMAPINFO BITMAPINFOOS2 -#define PBITMAPINFO PBITMAPINFOOS2 -#endif - typedef struct RGBQUAD { sal_uInt8 rgbBlue; diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index b9e9e11fe608..a9a0c5a2da58 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -45,7 +45,7 @@ #ifdef WNT #define CDECL _cdecl #endif -#if defined(UNX) || defined(OS2) +#if defined(UNX) #define CDECL #endif #ifdef UNX diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index 6fd401533267..41d6a100c1f3 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -547,21 +547,6 @@ void SvIconView::EditItemText( SvLBoxEntry* pEntry, SvLBoxItem* pItem, aRect.Bottom() += 2; // sieht huebscher aus -#ifdef OS2 - -#if OS2_SINGLE_LINE_EDIT - aRect.Left() -= 3; - aRect.Right() += 3; - aRect.Top() -= 3; - aRect.Bottom() += 3; -#else - aRect.Left() -= 10; - aRect.Right() += 10; - aRect.Top() -= 5; - aRect.Bottom() += 5; -#endif - -#endif // OS2 EditText( ((SvLBoxString*)pItem)->GetText(), aRect, rSel, sal_True ); } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 69e9d12ace50..66ff49d003dc 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2094,11 +2094,6 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( !rMEvt.IsLeft() && !rMEvt.IsRight()) return; -#ifdef OS2 - // unter OS/2 kommt zwischen MouseButtonDown und - // MouseButtonUp ein MouseMove - nFlags |= F_IGNORE_NEXT_MOUSEMOVE; -#endif aEditTimer.Stop(); Point aPos( rMEvt.GetPosPixel()); @@ -2181,9 +2176,6 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt) { -#ifdef OS2 - nFlags &= (~F_IGNORE_NEXT_MOUSEMOVE); -#endif if ( !ButtonUpCheckCtrl( rMEvt ) && ( aSelEng.GetSelectionMode() != NO_SELECTION ) ) aSelEng.SelMouseButtonUp( rMEvt ); EndScroll(); @@ -2199,13 +2191,6 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt) void SvImpLBox::MouseMove( const MouseEvent& rMEvt) { -#ifdef OS2 - if( nFlags & F_IGNORE_NEXT_MOUSEMOVE ) - { - nFlags &= (~F_IGNORE_NEXT_MOUSEMOVE); - return; - } -#endif SvLBoxEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); if ( !MouseMoveCheckCtrl( rMEvt, pEntry ) && ( aSelEng.GetSelectionMode() != NO_SELECTION ) ) aSelEng.SelMouseMove( rMEvt ); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index eab15f65647c..3514c7b6a271 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -1636,16 +1636,6 @@ sal_Bool SvImpIconView::KeyInput( const KeyEvent& rKEvt ) } break; -#ifdef OS2 - case KEY_F9: - if( rKEvt.GetKeyCode().IsShift() ) - { - if( pCursor && pView->IsInplaceEditingEnabled() ) - pView->EditEntry( pCursor ); - } - break; -#endif - case KEY_SPACE: if( pCursor ) { @@ -1693,9 +1683,6 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight ) Point aPos( 0, nRealHeight ); aPos.Y() -= nHorSBarHeight; -#ifdef OS2 - aPos.Y()++; -#endif if( aHorSBar.GetPosPixel() != aPos ) aHorSBar.SetPosPixel( aPos ); @@ -1708,11 +1695,6 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight ) aPos.Y()--; #endif -#ifdef OS2 - aPos.Y()--; - aPos.X()++; -#endif - if( aVerSBar.GetPosPixel() != aPos ) aVerSBar.SetPosPixel( aPos ); } @@ -1798,9 +1780,6 @@ void SvImpIconView::AdjustScrollBars() #if defined(WNT) aSize.Height() += 2; #endif -#ifdef OS2 - aSize.Height() += 3; -#endif if( aSize != aVerSBar.GetSizePixel() ) aVerSBar.SetSizePixel( aSize ); aVerSBar.SetVisibleSize( nVisibleHeight ); @@ -1823,11 +1802,6 @@ void SvImpIconView::AdjustScrollBars() #if defined(WNT) aSize.Width()++; #endif -#ifdef OS2 - aSize.Width() += 3; - if( nResult & 0x0001 ) // vertikale Scrollbar ? - aSize.Width()--; -#endif #if defined(WNT) if( nResult & 0x0001 ) // vertikale Scrollbar ? { @@ -1850,18 +1824,11 @@ void SvImpIconView::AdjustScrollBars() aHorSBar.Hide(); } -#ifdef OS2 - nRealWidth++; -#endif aOutputSize.Width() = nRealWidth; #if defined(WNT) if( nResult & 0x0002 ) // hor scrollbar ? nRealHeight++; // weil unterer Rand geclippt wird #endif -#ifdef OS2 - if( nResult & 0x0002 ) // hor scrollbar ? - nRealHeight++; -#endif aOutputSize.Height() = nRealHeight; } @@ -2025,11 +1992,7 @@ void SvImpIconView::PaintEmphasis( const Rectangle& rRect, sal_Bool bSelected, } else { -#ifndef OS2 aNewColor =rStyleSettings.GetFieldColor(); -#else - aNewColor = pOut->GetBackground().GetColor(); -#endif } if( bCursored ) @@ -3712,13 +3675,9 @@ const Size& SvImpIconView::GetItemSize( SvIconView* pIconView, Rectangle SvImpIconView::CalcFocusRect( SvLBoxEntry* pEntry ) { -#if !defined(OS2) SvLBoxString* pStringItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); DBG_ASSERT(pStringItem,"Text not set"); return CalcTextRect( pEntry, pStringItem ); -#else - return CalcBmpRect( pEntry ); -#endif } diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index 12ac258dd31c..08174ca0cd96 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -1287,12 +1287,6 @@ void SvTreeListBox::EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem, aPos += aOrigin; // in Win-Koord umrechnen aSize.Width() -= aOrigin.X(); Rectangle aRect( aPos, aSize ); -#ifdef OS2 - // Platz lassen fuer WB_BORDER - aRect.Left() -= 2; - aRect.Top() -= 3; - aRect.Bottom() += 3; -#endif EditText( pItem->GetText(), aRect, rSelection ); } @@ -1472,9 +1466,6 @@ void SvTreeListBox::ImplInitStyle() GetModel()->SetSortMode( SortNone ); GetModel()->SetCompareHdl( Link() ); } -#ifdef OS2 - nWindowStyle |= WB_VSCROLL; -#endif pImp->SetStyle( nWindowStyle ); pImp->Resize(); Invalidate(); diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index a6ccff12a506..e7bf845a03ea 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -144,7 +144,7 @@ ImpPathDialog::~ImpPathDialog() delete pOkBtn; delete pCancelBtn; delete pNewDirBtn; -# if defined(UNX) || defined(OS2) +# if defined(UNX) delete pHomeBtn; # endif } @@ -207,7 +207,7 @@ void ImpPathDialog::InitControls() nTextWidth = pDlg->GetTextWidth( aNewDirStr )+nExtraWidth; if( nTextWidth > aBtnSiz.Width() ) aBtnSiz.Width() = nTextWidth; -#if defined(UNX) || defined(OS2) +#if defined(UNX) String aHomeDirStr( SvtResId( STR_FILEDLG_HOME ) ); nTextWidth = pDlg->GetTextWidth( aHomeDirStr )+nExtraWidth; if( nTextWidth > aBtnSiz.Width() ) @@ -224,7 +224,7 @@ void ImpPathDialog::InitControls() aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); -#if defined(UNX) || defined(OS2) +#if defined(UNX) aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pHomeBtn, PushButton, WB_DEFBUTTON, aPnt, aBtnSiz, aHomeDirStr, HID_FILEDLG_HOME ); diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 77db9d5698ea..c0c642d7ad88 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -78,23 +78,11 @@ #define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF -#if (defined OS2 && !defined ICC) - -#define IMPORT_FUNCTION_NAME "_GraphicImport" -#define EXPORT_FUNCTION_NAME "_GraphicExport" -#define IMPDLG_FUNCTION_NAME "_DoImportDialog" -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" - -#else - #define IMPORT_FUNCTION_NAME "GraphicImport" #define EXPORT_FUNCTION_NAME "GraphicExport" #define IMPDLG_FUNCTION_NAME "DoImportDialog" #define EXPDLG_FUNCTION_NAME "DoExportDialog" -#endif - - // ----------- // - statics - // ----------- diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 651cc81d9e4f..7d1f47300b69 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -34,9 +34,6 @@ #include <tools/wintypes.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#if defined(OS2) -#include <vcl/sound.hxx> -#endif #include <svtools/ehdl.hxx> #include <svtools/svtdata.hxx> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index da3d4f9a08d9..8a56a3005e1b 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -186,35 +186,6 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { 0, sal_False, 0, 0 } }; -#ifdef OS2 - SvtExtensionResIdMapping_Impl Mappings[] = - { - {"StarWriter 4.0", sal_False,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER}, - {"StarWriter 3.0", sal_False,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER}, - {"StarCalc 4.0", sal_False,STR_DESCRIPTION_SCALC_DOC, IMG_CALC}, - {"StarCalc 3.0", sal_False,STR_DESCRIPTION_SCALC_DOC, IMG_CALC}, - {"StarImpress 4.0", sal_False,STR_DESCRIPTION_SIMPRESS_DOC,IMG_IMPRESS}, - {"StarDraw 4.0", sal_False,STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW}, - {"StarDraw 3.0", sal_False,STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW}, - {"StarChart 3.0", sal_False,STR_DESCRIPTION_SCHART_DOC, IMG_CHART}, - {"StarChart 4.0", sal_False,STR_DESCRIPTION_SCHART_DOC, IMG_CHART}, - {"Bitmap", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP}, - {"AutoCAD", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM}, - {"Gif-File", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF}, - {"JPEG-File", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG}, - {"Metafile ", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM}, - {"Photo-CD ", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD}, - {"Mac Pict", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT}, - {"PCX-File ", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX}, - {"PNG-File", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM}, - {"SV-Metafile", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM}, - {"TIFF-File", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF}, - {"MS-Metafile", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF}, - {"XBM-File", sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP}, - {NULL, 0} - }; -#endif - struct SvtFactory2ExtensionMapping_Impl { const char* _pFactory; diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index 412140f9a3f5..38d3dc3cc377 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -207,9 +207,6 @@ static int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) - _Optlink -#endif HTMLKeyCompare( const void *pFirst, const void *pSecond) { int nRet = 0; @@ -562,9 +559,6 @@ static int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) - _Optlink -#endif HTMLCharNameCompare( const void *pFirst, const void *pSecond) { int nRet = 0; @@ -1023,9 +1017,6 @@ static int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) - _Optlink -#endif HTMLColorNameCompare( const void *pFirst, const void *pSecond) { int nRet = 0; diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 134783a80056..76dccb5a5026 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -1191,9 +1191,6 @@ static int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) -_Optlink -#endif RTFKeyCompare( const void *pFirst, const void *pSecond) { int nRet = 0; diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 7f2721726e9e..7cb667b18528 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -92,11 +92,6 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_Int32)pSysData->hWnd; } -#elif (defined OS2) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 ) - { - aRet <<= (sal_Int32)pSysData->hWnd; - } #elif (defined QUARTZ) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index a8cf619f21bf..c879e4b6bd2c 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -131,8 +131,6 @@ namespace css = ::com::sun::star; #if (defined WNT) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 -#elif (defined OS2) -#define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 #elif (defined QUARTZ) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_MAC #elif (defined UNX) @@ -346,9 +344,6 @@ static int #if defined( WNT ) __cdecl #endif -#if defined( ICC ) && defined( OS2 ) -_Optlink -#endif ComponentInfoCompare( const void* pFirst, const void* pSecond) { return( strcmp( ((ComponentInfo*)pFirst)->pName, @@ -989,8 +984,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.bXEmbedSupport = bXEmbed; #elif defined WNT aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle); - #elif defined OS2 - aParentData.hWnd = (HWND)nWindowHandle; #endif pNewWindow = new WorkWindow( &aParentData ); } @@ -1215,8 +1208,6 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aParentData.bXEmbedSupport = bXEmbed; #elif defined WNT aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle); - #elif defined OS2 - aParentData.hWnd = (HWND)nWindowHandle; #endif SolarMutexGuard aGuard; try diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index abcf616a2a90..8bf3c861c01d 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -104,11 +104,6 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) { aRet <<= (sal_Int32)pSysData->hWnd; } -#elif (defined OS2) - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 ) - { - aRet <<= (sal_Int32)pSysData->hWnd; - } #elif (defined QUARTZ) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 3039e11c3895..6a9c64ba3c95 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -92,7 +92,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) // create system parent data SystemParentData aSysParentData; aSysParentData.nSize = sizeof ( SystemParentData ); -#if defined( WNT ) || defined ( OS2 ) +#if defined( WNT ) aSysParentData.hWnd = (HWND) nHandle; #elif defined( QUARTZ ) aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index d5940d805097..015d8855caad 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -36,7 +36,7 @@ #include <tools/geninfo.hxx> #include "bootstrp/prj.hxx" -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define LIST_DELIMETER ';' #define PATH_DELIMETER '\\' #elif defined UNX diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx index 91636d8dc718..f3420b8ff50e 100644 --- a/tools/inc/tools/inetdef.hxx +++ b/tools/inc/tools/inetdef.hxx @@ -32,8 +32,6 @@ //============================================================================ #if defined WNT #define TOOLS_INETDEF_OS "Win32" -#elif defined OS2 -#define TOOLS_INETDEF_OS "OS/2" #elif defined UNX #if defined AIX #define TOOLS_INETDEF_OS "AIX" diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index 55e649e42d0a..bb65e70e0c54 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -221,8 +221,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define __DLLEXTENSION "mi" #elif defined WNT && defined _MSC_VER && defined X86_64 #define __DLLEXTENSION "mx" -#elif defined OS2 - #define __DLLEXTENSION "go" #elif defined AIX #define __DLLEXTENSION "ap.so" #elif defined SOLARIS && defined SPARC && defined IS_LP64 @@ -310,7 +308,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define LIBRARY_CONCAT4( s1, s2, s3, s4 ) \ s1 s2 s3 s4 -#if defined WNT || defined OS2 +#if defined WNT #define SVLIBRARY( Base ) \ LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" ) #define SVLIBRARYLANG( Base, Lang ) \ diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index e10e7288d1e8..f77d9630d962 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -133,8 +133,6 @@ enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 } #ifdef SAL_W32 #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(1) #endif typedef struct _ByteStringData @@ -146,8 +144,6 @@ typedef struct _ByteStringData #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // -------------- @@ -421,8 +417,6 @@ inline ByteString ByteString::GetQuotedToken( xub_StrLen nToken, const ByteStrin #ifdef SAL_W32 #pragma pack(push, 4) -#elif defined(SAL_OS2) -#pragma pack(1) #endif typedef struct _UniStringData @@ -434,8 +428,6 @@ typedef struct _UniStringData #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // ------------- diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk index d97156c7f66c..129360e70fba 100644 --- a/tools/workben/makefile.mk +++ b/tools/workben/makefile.mk @@ -42,7 +42,7 @@ OBJFILES = \ APP1TARGET = solar APP1OBJS = $(OBJ)$/solar.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "UNX" APP1STDLIBS = $(TOOLSLIB) .ELSE APP1LIBS = $(LB)$/itools.lib @@ -50,7 +50,7 @@ APP1LIBS = $(LB)$/itools.lib APP2TARGET = urltest APP2OBJS = $(OBJ)$/urltest.obj -.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "UNX" APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) .ELSE APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) diff --git a/tools/workben/solar.c b/tools/workben/solar.c index 283234220245..9ebece78ea12 100644 --- a/tools/workben/solar.c +++ b/tools/workben/solar.c @@ -43,7 +43,7 @@ int GetStackAlignment(void); void PrintArgs( int p, ... ); int check( TestFunc func, Type eT, void* p ); -#if defined (UNX) || defined (WNT) || defined (OS2) +#if defined (UNX) || defined (WNT) #ifdef UNX #include <unistd.h> @@ -123,7 +123,7 @@ int GetStackAlignment() -#if defined (UNX) || defined (WNT) || defined (OS2) +#if defined (UNX) || defined (WNT) #ifdef I_STDARG void PrintArgs( int p, ... ) @@ -154,7 +154,7 @@ va_dcl #ifndef USE_FORK_TO_CHECK static jmp_buf check_env; static int bSignal; -#if defined (UNX) || defined (OS2) +#if defined (UNX) void SignalHandler( int sig ) #else void __cdecl SignalHandler( int sig ) diff --git a/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk index b7a195ab0bea..41cd0e5b4190 100644 --- a/ucbhelper/util/makefile.mk +++ b/ucbhelper/util/makefile.mk @@ -42,9 +42,6 @@ LIB1FILES= $(SLB)$/client.lib \ $(SLB)$/provider.lib SHL1TARGET= $(TARGET)$(UCBHELPER_MAJOR)$(COMID) -.IF "$(GUI)" == "OS2" -SHL1TARGET= ucbh$(UCBHELPER_MAJOR) -.ENDIF SHL1STDLIBS = \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 0ba501e976b1..ad4c2518d3f2 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -114,7 +114,6 @@ namespace vcl }; /** Value of the width member of the TTGlobalFontInfo struct */ -#ifndef OS2 enum WidthClass { FWIDTH_ULTRA_CONDENSED = 1, /**< 50% of normal */ FWIDTH_EXTRA_CONDENSED = 2, /**< 62.5% of normal */ @@ -126,7 +125,6 @@ namespace vcl FWIDTH_EXTRA_EXPANDED = 8, /**< 150% of normal */ FWIDTH_ULTRA_EXPANDED = 9 /**< 200% of normal */ }; -#endif // OS2 #endif /* FW_THIN */ /** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */ @@ -290,7 +288,7 @@ namespace vcl * @ingroup sft */ int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/ -#if !defined(WIN32) && !defined(OS2) +#if !defined(WIN32) /** * TrueTypeFont constructor. * Reads the font file and allocates the memory for the structure. diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index a1473d8cbbf0..e25bb482f53c 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -231,7 +231,7 @@ class SalBitmap; struct BitmapSystemData { - #if defined( WNT ) || defined( OS2 ) + #if defined( WNT ) void* pDIB; // device independent byte buffer void* pDDB; // if not NULL then this is actually an HBITMAP #elif defined( QUARTZ ) diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index 199f0ad67cac..cab614841e1d 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -41,7 +41,7 @@ typedef struct CGLayer *CGLayerRef; class NSView; #endif #endif -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) #include <windef.h> #endif @@ -52,7 +52,7 @@ class NSView; struct SystemEnvData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) HWND hWnd; // the window hwnd #elif defined( QUARTZ ) NSView* pView; // the cocoa (NSView *) implementing this object @@ -80,7 +80,7 @@ struct SystemEnvData struct SystemParentData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) HWND hWnd; // the window hwnd #elif defined( QUARTZ ) NSView* pView; // the cocoa (NSView *) implementing this object diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 00fbaaeef3c4..fa484b70f6d0 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -77,7 +77,7 @@ static VCLRegServiceInfo aVCLComponentsArray[] = {"dtransX11", sal_True}, #endif #endif -#if defined(WNT) || defined(OS2) +#if defined(WNT) {"sysdtrans", sal_False}, #endif {"dtrans", sal_False}, @@ -177,7 +177,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte OUString aLibName; -#if defined( WNT) || defined(OS2) +#if defined( WNT) aLibName = OUString::createFromAscii( pModName ); if ( bSUPD ) { diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 4e3f8ceb0cf2..44ac9414534f 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1515,7 +1515,7 @@ static void allocTrueTypeFont( TrueTypeFont** ttf ) /* forward declariotn for the two entry points to use*/ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ); -#if !defined(WIN32) && !defined(OS2) +#if !defined(WIN32) int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf ) { int ret, fd = -1; @@ -1777,7 +1777,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ) void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/ { -#if !defined(WIN32) && !defined(OS2) +#if !defined(WIN32) if( ttf->fname ) munmap((char *) ttf->ptr, ttf->fsize); #endif diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 8f579d59790b..59242e24a473 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -82,8 +82,6 @@ #if defined UNX #define GLYPH_FONT_HEIGHT 128 -#elif defined OS2 -#define GLYPH_FONT_HEIGHT 176 #else #define GLYPH_FONT_HEIGHT 256 #endif diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 6265cc55b46d..4f7b09b0f589 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -102,35 +102,6 @@ DBG_NAME( Menu ) // document closer #define IID_DOCUMENTCLOSE 1 -#ifdef OS2 - -#include <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 ) -{ - static sal_Bool init = sal_False; - static HOOKCONFIG hc; - - // read XWP settings at program startup - if (init == sal_False) { - sal_Bool rc; - sal_uLong cb = sizeof(HOOKCONFIG); - memset(&hc, 0, sizeof(HOOKCONFIG)); - rc = PrfQueryProfileData( HINI_USER, INIAPP_XWPHOOK, INIKEY_HOOK_CONFIG, - &hc, &cb); - init = sal_True; - } - // check mouse left button - if (rMEvt.GetButtons() == MOUSE_LEFT) - return sal_True; - // return xwp flag - return hc.fSlidingMenus; -} - -#endif - static sal_Bool ImplAccelDisabled() { // display of accelerator strings may be suppressed via configuration @@ -4565,10 +4536,6 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt ) if ( rMEvt.IsLeaveWindow() ) { -#ifdef OS2 - if ( ImplHilite(rMEvt) ) - { -#endif // #102461# do not remove highlight if a popup menu is open at this position MenuItemData* pData = pMenu ? pMenu->pItemList->GetDataFromPos( nHighlightedItem ) : NULL; // close popup with some delayed if we leave somewhere else @@ -4577,17 +4544,11 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt ) if( !pActivePopup || (pData && pData->pSubMenu != pActivePopup ) ) ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); -#ifdef OS2 - } -#endif if ( IsScrollMenu() ) ImplScroll( rMEvt.GetPosPixel() ); } else -#ifdef OS2 - if ( ImplHilite(rMEvt) ) -#endif { aSubmenuCloseTimer.Stop(); if( bIgnoreFirstMove ) @@ -5550,9 +5511,6 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt ) sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() ); if ( ( nEntry != ITEMPOS_INVALID ) -#ifdef OS2 - && ( ImplHilite(rMEvt) ) -#endif && ( nEntry != nHighlightedItem ) ) ChangeHighlightItem( nEntry, sal_False ); } diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk index 64ef8309dfe3..8815053829cc 100644 --- a/vcl/test/makefile.mk +++ b/vcl/test/makefile.mk @@ -32,10 +32,6 @@ TARGET=dndtest LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE -.IF "$(GUI)" == "OS2" -TARGETTYPE=GUI -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 713d28a43846..bba023ab779f 100755 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -255,12 +255,6 @@ LINKFLAGSSHL += /ENTRY:LibMain@12 .ENDIF .ENDIF -# --- OS2 ---------------------------------------------------------------- - -.IF "$(GUI)" == "OS2" -STDSHL1 += ft2lib.lib -.ENDIF - # --- UNX ---------------------------------------------------------------- # UNX sal plugins |