summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xreadlicense_oo/docs/readme.dtd6
-rw-r--r--readlicense_oo/docs/readme/eval.xsl3
-rwxr-xr-xreadlicense_oo/makefile.mk3
-rw-r--r--readlicense_oo/prj/d.lst7
-rw-r--r--svtools/source/contnr/svtreebx.cxx3
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx9
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx3
-rw-r--r--toolkit/source/awt/vclxdialog.cxx2
-rw-r--r--toolkit/source/awt/vclxsystemdependentwindow.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
-rw-r--r--toolkit/source/awt/vclxtopwindow.cxx2
-rw-r--r--toolkit/source/awt/vclxwindow1.cxx2
-rw-r--r--tools/Library_tl.mk6
-rw-r--r--tools/bootstrp/rscdep.cxx2
-rw-r--r--tools/os2/source/dll/toolsdll.cxx8
-rw-r--r--tools/source/datetime/tdate.cxx2
-rw-r--r--tools/source/datetime/ttime.cxx4
-rw-r--r--tools/source/fsys/os2.cxx34
-rw-r--r--tools/source/fsys/os2.hxx2
-rw-r--r--tools/source/generic/toolsin.cxx2
20 files changed, 55 insertions, 49 deletions
diff --git a/readlicense_oo/docs/readme.dtd b/readlicense_oo/docs/readme.dtd
index f893d540503b..ad7c85558086 100755
--- a/readlicense_oo/docs/readme.dtd
+++ b/readlicense_oo/docs/readme.dtd
@@ -11,8 +11,8 @@
<!ELEMENT Paragraph (Text | List)*>
<!ATTLIST Paragraph
id CDATA #REQUIRED
- gui (all | UNX | WNT) "all"
- os (none | all | SOLARIS | LINUX | WNT | MACOSX) "all"
+ gui (all |OS2 | UNX | WNT) "all"
+ os (none | all | OS2 | SOLARIS | LINUX | WNT | MACOSX) "all"
cpuname (all | SPARC | INTEL | POWERPC) "all"
com (all | C50 | C52 | GCC | MSC) "all"
localized (true | false) "true"
@@ -30,4 +30,4 @@
<!ELEMENT List (Text | Paragraph)+>
<!ATTLIST List
Enum (true | false) "false"
-> \ No newline at end of file
+>
diff --git a/readlicense_oo/docs/readme/eval.xsl b/readlicense_oo/docs/readme/eval.xsl
index 613e61d673f9..ad1cfaa9c799 100644
--- a/readlicense_oo/docs/readme/eval.xsl
+++ b/readlicense_oo/docs/readme/eval.xsl
@@ -21,7 +21,7 @@
<body>
<table border='1' style='border-collapse:collapse;' cellpadding='5'>
<tr>
- <th>attribs</th><th class="wnt">WNT</th><th class="mac">MAC</th><th class="soli">SOLI</th><th class="solx">SOLX</th><th class="unx">UNX</th><th>none</th><th>all</th><th>Content</th>
+ <th>attribs</th><th class="wnt">WNT</th><th class="os2">OS2</th><th class="mac">MAC</th><th class="soli">SOLI</th><th class="solx">SOLX</th><th class="unx">UNX</th><th>none</th><th>all</th><th>Content</th>
</tr>
<xsl:apply-templates />
</table>
@@ -42,6 +42,7 @@
<xsl:if test="@os">os=<xsl:value-of select="@os"/></xsl:if><xsl:text> </xsl:text><xsl:if test="@gui">gui=<xsl:value-of select="@gui"/></xsl:if>
</td>
<th class="wnt"><xsl:if test="@os='WNT' or @gui='WNT'">WNT</xsl:if></th>
+ <th class="os2"><xsl:if test="@os='OS2' or @gui='WNT'">OS2</xsl:if></th>
<th class="mac"><xsl:if test="@os='MACOSX'">MAC</xsl:if></th>
<th class="soli"><xsl:if test="@os='SOLARIS' and @cpuname='INTEL'">SOLI</xsl:if></th>
<th class="solx"><xsl:if test="@os='SOLARIS' and @cpuname='SPARC'">SOLX</xsl:if></th>
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index bb6eff9cbde7..abd7bc8989af 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -9,6 +9,9 @@ TARGET=source
.IF "$(GUI)"=="WNT"
SYSLICBASE=license.txt license.html license.rtf
SYSLICDEST=$(MISC)$/license$/wnt
+.ELIF "$(GUI)"=="OS2"
+SYSLICBASE=license.txt license.html license.rtf
+SYSLICDEST=$(MISC)$/license$/os2
.ELSE # "$(GUI)"=="WNT"
SYSLICBASE=LICENSE LICENSE.html
SYSLICDEST=$(MISC)$/license$/unx
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 4c0ab675d6b1..390186b17f95 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -13,12 +13,17 @@ dos: echo =====================================================================
..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license\os2\license*.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license\os2\license*.html %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license\os2\license*.rtf %_DEST%\bin%_EXT%\osl
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
..\%__SRC%\misc\license\unx\LICENSE_en-US %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
+..\%__SRC%\misc\license\os2\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license\os2\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
# RTF only for Windows?
# Why? It comes from cws_src680_langsupporter.
@@ -30,6 +35,8 @@ dos: echo =====================================================================
..\%__SRC%\misc\WNT\readme_*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\WNT\readme_*.html %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\OS2\readme_*.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\OS2\readme_*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index db60dd231e1a..83defe03a84f 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -1508,9 +1508,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/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index e1e739ef19b8..6f35d5ff58eb 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -202,9 +202,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;
@@ -557,9 +554,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;
@@ -1018,9 +1012,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 03282313b6e2..41b54cc00c6e 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1186,9 +1186,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/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index e09debd24328..89e5031d379c 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.cxx
@@ -37,6 +37,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
+#elif defined ( OS2 )
+#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 8535a96c71fa..121a7f5945fb 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -39,6 +39,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
+#elif defined ( OS2 )
+#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 064fd6c48ddf..812d3bdd00d1 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -54,6 +54,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
+#elif defined ( OS2 )
+#include <svpm.h>
#elif (defined QUARTZ)
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index b9a6452e15fd..0c2b885e5b09 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -30,6 +30,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
+#elif defined ( OS2 )
+#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 24695ed8f3cd..ef29b3e7ba54 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -36,6 +36,8 @@
#include <tools/prewin.h>
#include <windows.h>
#include <tools/postwin.h>
+#elif defined ( OS2 )
+#include <svpm.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 4e676f2c3436..69143cc274a1 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -126,6 +126,12 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
+ifeq ($(GUI),OS2)
+$(eval $(call gb_Library_add_exception_objects,tl,\
+ tools/os2/source/dll/toolsdll \
+))
+endif
+
ifeq ($(SYSTEM_ZLIB),YES)
$(eval $(call gb_Library_set_cxxflags,tl,\
$$(CXXFLAGS) \
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index b879573831ac..e728187b4a9d 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx"
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
#include <unistd.h>
#endif
diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx
index 1898b8c5b6fe..0c7fb977a0f1 100644
--- a/tools/os2/source/dll/toolsdll.cxx
+++ b/tools/os2/source/dll/toolsdll.cxx
@@ -21,13 +21,7 @@
-#ifndef _SHL_HXX
#include <tools/shl.hxx>
-#endif
-
-#ifndef _DLL_HXX
-#include <dll.hxx>
-#endif
// =======================================================================
@@ -35,7 +29,7 @@ static void* aAppData[SHL_COUNT];
// -----------------------------------------------------------------------
-void** GetAppData( USHORT nSharedLib )
+void** GetAppData( sal_uInt16 nSharedLib )
{
return &(aAppData[nSharedLib]);
}
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index cc227246bc4f..7ba1dbf4687c 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -142,7 +142,7 @@ static void DaysToDate( long nDays,
Date::Date()
{
#if defined( OS2 )
- DATETIME aDateTime;
+ PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Datum zusammenbauen
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index b2a896937cc1..fde7f16b8bde 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -96,7 +96,7 @@ static Time Sec100ToTime( sal_Int32 nSec100 )
Time::Time()
{
#if defined( OS2 )
- DATETIME aDateTime;
+ PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Zeit zusammenbauen
@@ -316,7 +316,7 @@ Time Time::GetUTCOffset()
{
#if defined( OS2 )
#undef timezone
- DATETIME aDateTime;
+ PM_DATETIME aDateTime;
DosGetDateTime( &aDateTime );
// Zeit zusammenbauen
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index 5a4c71cb59fb..96bac5088c71 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.cxx
@@ -49,8 +49,8 @@ DECLARE_LIST( FSysSortList, FSysSort* );
DECLARE_LIST( FileStatList, FileStat* );
static char sCaseMap[256];
-static BOOL bCaseMap = FALSE;
-static BOOL bDriveMap = FALSE;
+static sal_Bool bCaseMap = FALSE;
+static sal_Bool bDriveMap = FALSE;
struct DriveMapItem
{
@@ -64,7 +64,7 @@ void CreateDriveMapImpl();
static DriveMapItem aDriveMap[26];
-static BOOL bLastCaseSensitive = FALSE;
+static sal_Bool bLastCaseSensitive = FALSE;
//====================================================================
@@ -146,7 +146,7 @@ char* volumeid( const char* pPfad )
|*
*************************************************************************/
-BOOL DirEntry::ToAbs()
+sal_Bool DirEntry::ToAbs()
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
@@ -207,7 +207,7 @@ String DirEntry::GetVolume() const
|*
*************************************************************************/
-BOOL DirEntry::SetCWD( BOOL bSloppy ) const
+sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
@@ -242,7 +242,7 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
*************************************************************************/
#if 0 // YD see dirent.cxx
-BOOL createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
+sal_Bool createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
FSysError DirEntry::MoveTo( const DirEntry& rDest ) const
{
@@ -450,7 +450,7 @@ struct _FSYS_FSQBUFFER
UCHAR sBuf[256];
};
-BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
+sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bAccessRemovableDevice )
{
nSize = 0;
FSysPathStyle eStyle = FSYS_STYLE_UNKNOWN;
@@ -604,7 +604,7 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
return TRUE;
}
-BOOL IsRedirectable_Impl( const ByteString &rPath )
+sal_Bool IsRedirectable_Impl( const ByteString &rPath )
{
if ( rPath.Len() >= 3 && ':' == rPath.GetBuffer()[1] )
{
@@ -616,7 +616,7 @@ BOOL IsRedirectable_Impl( const ByteString &rPath )
}
#if 0
-BOOL IsRedirectable_Impl( const String &rPath )
+sal_Bool IsRedirectable_Impl( const String &rPath )
{
if ( rPath.Len() >= 3 && ':' == rPath.GetStr()[1] )
{
@@ -643,7 +643,7 @@ const char* TempDirImpl( char *pBuf )
{
PSZ pVar;
USHORT nRet;
- BOOL bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
+ sal_Bool bAppendTemp = FALSE; // mu\s noch \\temp angeh"angt werden
// Erstmal sehen, ob TEMP oder TMP gesetzt sind
nRet = DosScanEnv( (PSZ)"TEMP", &pVar );
@@ -659,7 +659,7 @@ const char* TempDirImpl( char *pBuf )
// falls das geklappt hat, und ein Backslash dranhaengt,
// oder falls es bisher nicht geklappt hat,
// muessen wir nachher einen Backslash entfernen
- BOOL bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
+ sal_Bool bRemoveBS = nRet || *(pVar+strlen(pVar)-1) == '\\';
// Keine temp-Variable gefunden, dann gehen wir mal auf die Suche
// nach dem System-Laufwerk
@@ -790,7 +790,7 @@ void CreateDriveMapImpl()
DosError(FERR_DISABLEHARDERR);
// determine number of floppy-drives
- BYTE nFloppies;
+ PM_BYTE nFloppies;
nRet = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
// reset the map
@@ -812,7 +812,7 @@ void CreateDriveMapImpl()
for ( nDrive = 2; nDrive < 26; ++nDrive )
{
// open drive
- BOOL bFixed;
+ sal_Bool bFixed;
HFILE nDevHandle;
char pDriveName[3] = "#:";
pDriveName[0] = nDrive+'a';
@@ -826,7 +826,7 @@ void CreateDriveMapImpl()
if ( !nRet )
{
// removeable?
- BYTE nDriveId = nDrive;
+ PM_BYTE nDriveId = nDrive;
ULONG nParaOutLen, nDataOutLen;
nRet = DosDevIOCtl(nDevHandle, 8, 0x20,
&nDriveId, sizeof(nDriveId), &nParaOutLen,
@@ -932,7 +932,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String &rDevice )
|*
*************************************************************************/
-BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
+sal_Bool DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
{
if (eFormatter==FSYS_STYLE_HOST)
{
@@ -947,7 +947,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const
}
else
{
- BOOL isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
+ sal_Bool isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv
switch ( eFormatter )
{
case FSYS_STYLE_MAC:
@@ -1003,7 +1003,7 @@ ErrCode FileStat::QueryDiskSpace( const String &rPath,
//=========================================================================
-void FSysEnableSysErrorBox( BOOL bEnable )
+void FSysEnableSysErrorBox( sal_Bool bEnable )
{
DosError( bEnable ? 0 : FERR_DISABLEHARDERR );
}
diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx
index c9f0df8d97ac..9b6476e5dc66 100644
--- a/tools/source/fsys/os2.hxx
+++ b/tools/source/fsys/os2.hxx
@@ -59,7 +59,7 @@ String ToLowerImpl( const String& );
#define START_DRV 'a'
-inline BOOL DRIVE_EXISTS( char c )
+inline PM_BOOL DRIVE_EXISTS( char c )
{
ULONG nCur, nMap;
APIRET nRet = DosQueryCurrentDisk( &nCur, &nMap );
diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx
index 18dc42d100a9..0f8ba2d9b977 100644
--- a/tools/source/generic/toolsin.cxx
+++ b/tools/source/generic/toolsin.cxx
@@ -85,7 +85,7 @@ void GlobalDeInitTools()
#if defined WNT
ImpDeInitWinTools();
#endif
-#ifdef OS2
+#ifdef OS2_YD_REMOVEME
ImpDeInitOS2Tools();
#endif
}
generated by cgit (git 2.34.1) at 2025-03-13 13:14:23 +0000