incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1200011 - in /incubator/ooo/trunk/main: readlicense_oo/ readlicense_oo/docs/ readlicense_oo/docs/readme/ readlicense_oo/prj/ svtools/source/contnr/ svtools/source/svhtml/ svtools/source/svrtf/ toolkit/source/awt/ tools/ tools/bootstrp/ too...
Date Wed, 09 Nov 2011 22:30:57 GMT
Author: pfg
Date: Wed Nov  9 22:30:56 2011
New Revision: 1200011

URL: http://svn.apache.org/viewvc?rev=1200011&view=rev
Log:
i118582: OS/2 port - pyuno, readlicense, svtools, toolkit and tools build patches by Yuri
Dario.

Modified:
    incubator/ooo/trunk/main/readlicense_oo/docs/readme.dtd
    incubator/ooo/trunk/main/readlicense_oo/docs/readme/eval.xsl
    incubator/ooo/trunk/main/readlicense_oo/makefile.mk
    incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
    incubator/ooo/trunk/main/svtools/source/contnr/svtreebx.cxx
    incubator/ooo/trunk/main/svtools/source/svhtml/htmlkywd.cxx
    incubator/ooo/trunk/main/svtools/source/svrtf/rtfkeywd.cxx
    incubator/ooo/trunk/main/toolkit/source/awt/vclxdialog.cxx
    incubator/ooo/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
    incubator/ooo/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
    incubator/ooo/trunk/main/toolkit/source/awt/vclxtopwindow.cxx
    incubator/ooo/trunk/main/toolkit/source/awt/vclxwindow1.cxx
    incubator/ooo/trunk/main/tools/Library_tl.mk
    incubator/ooo/trunk/main/tools/bootstrp/rscdep.cxx
    incubator/ooo/trunk/main/tools/os2/source/dll/toolsdll.cxx
    incubator/ooo/trunk/main/tools/source/datetime/tdate.cxx
    incubator/ooo/trunk/main/tools/source/datetime/ttime.cxx
    incubator/ooo/trunk/main/tools/source/fsys/os2.cxx
    incubator/ooo/trunk/main/tools/source/fsys/os2.hxx
    incubator/ooo/trunk/main/tools/source/generic/toolsin.cxx

Modified: incubator/ooo/trunk/main/readlicense_oo/docs/readme.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/docs/readme.dtd?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/docs/readme.dtd (original)
+++ incubator/ooo/trunk/main/readlicense_oo/docs/readme.dtd Wed Nov  9 22:30:56 2011
@@ -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
+>

Modified: incubator/ooo/trunk/main/readlicense_oo/docs/readme/eval.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/docs/readme/eval.xsl?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/docs/readme/eval.xsl (original)
+++ incubator/ooo/trunk/main/readlicense_oo/docs/readme/eval.xsl Wed Nov  9 22:30:56 2011
@@ -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>

Modified: incubator/ooo/trunk/main/readlicense_oo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/makefile.mk?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/makefile.mk (original)
+++ incubator/ooo/trunk/main/readlicense_oo/makefile.mk Wed Nov  9 22:30:56 2011
@@ -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

Modified: incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/prj/d.lst?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/prj/d.lst (original)
+++ incubator/ooo/trunk/main/readlicense_oo/prj/d.lst Wed Nov  9 22:30:56 2011
@@ -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
 

Modified: incubator/ooo/trunk/main/svtools/source/contnr/svtreebx.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/contnr/svtreebx.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/contnr/svtreebx.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/contnr/svtreebx.cxx Wed Nov  9 22:30:56 2011
@@ -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();

Modified: incubator/ooo/trunk/main/svtools/source/svhtml/htmlkywd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/svhtml/htmlkywd.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/svhtml/htmlkywd.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/svhtml/htmlkywd.cxx Wed Nov  9 22:30:56 2011
@@ -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;

Modified: incubator/ooo/trunk/main/svtools/source/svrtf/rtfkeywd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/svrtf/rtfkeywd.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/svrtf/rtfkeywd.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/svrtf/rtfkeywd.cxx Wed Nov  9 22:30:56 2011
@@ -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;

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxdialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxdialog.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxdialog.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxdialog.cxx Wed Nov  9 22:30:56 2011
@@ -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>

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx Wed Nov  9 22:30:56
2011
@@ -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>

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxtoolkit.cxx Wed Nov  9 22:30:56 2011
@@ -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>

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxtopwindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxtopwindow.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxtopwindow.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxtopwindow.cxx Wed Nov  9 22:30:56 2011
@@ -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>

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxwindow1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxwindow1.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxwindow1.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxwindow1.cxx Wed Nov  9 22:30:56 2011
@@ -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>

Modified: incubator/ooo/trunk/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/Library_tl.mk?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/Library_tl.mk (original)
+++ incubator/ooo/trunk/main/tools/Library_tl.mk Wed Nov  9 22:30:56 2011
@@ -126,6 +126,12 @@ $(eval $(call gb_Library_add_exception_o
 ))
 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) \

Modified: incubator/ooo/trunk/main/tools/bootstrp/rscdep.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/bootstrp/rscdep.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/bootstrp/rscdep.cxx (original)
+++ incubator/ooo/trunk/main/tools/bootstrp/rscdep.cxx Wed Nov  9 22:30:56 2011
@@ -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
 

Modified: incubator/ooo/trunk/main/tools/os2/source/dll/toolsdll.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/os2/source/dll/toolsdll.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/os2/source/dll/toolsdll.cxx (original)
+++ incubator/ooo/trunk/main/tools/os2/source/dll/toolsdll.cxx Wed Nov  9 22:30:56 2011
@@ -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]);
 }

Modified: incubator/ooo/trunk/main/tools/source/datetime/tdate.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/source/datetime/tdate.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/source/datetime/tdate.cxx (original)
+++ incubator/ooo/trunk/main/tools/source/datetime/tdate.cxx Wed Nov  9 22:30:56 2011
@@ -142,7 +142,7 @@ static void DaysToDate( long nDays,
 Date::Date()
 {
 #if defined( OS2 )
-	DATETIME aDateTime;
+	PM_DATETIME aDateTime;
 	DosGetDateTime( &aDateTime );
 
 	// Datum zusammenbauen

Modified: incubator/ooo/trunk/main/tools/source/datetime/ttime.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/source/datetime/ttime.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/source/datetime/ttime.cxx (original)
+++ incubator/ooo/trunk/main/tools/source/datetime/ttime.cxx Wed Nov  9 22:30:56 2011
@@ -96,7 +96,7 @@ static Time Sec100ToTime( sal_Int32 nSec
 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

Modified: incubator/ooo/trunk/main/tools/source/fsys/os2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/source/fsys/os2.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/source/fsys/os2.cxx (original)
+++ incubator/ooo/trunk/main/tools/source/fsys/os2.cxx Wed Nov  9 22:30:56 2011
@@ -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 ) co
 *************************************************************************/
 
 #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& r
     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 ByteStri
 }
 
 #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( co
 |*
 *************************************************************************/
 
-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( FSysPath
 	}
 	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 
 
 //=========================================================================
 
-void FSysEnableSysErrorBox( BOOL bEnable )
+void FSysEnableSysErrorBox( sal_Bool bEnable )
 {
     DosError( bEnable ? 0 : FERR_DISABLEHARDERR );
 }

Modified: incubator/ooo/trunk/main/tools/source/fsys/os2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/source/fsys/os2.hxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/source/fsys/os2.hxx (original)
+++ incubator/ooo/trunk/main/tools/source/fsys/os2.hxx Wed Nov  9 22:30:56 2011
@@ -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 );

Modified: incubator/ooo/trunk/main/tools/source/generic/toolsin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/source/generic/toolsin.cxx?rev=1200011&r1=1200010&r2=1200011&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/source/generic/toolsin.cxx (original)
+++ incubator/ooo/trunk/main/tools/source/generic/toolsin.cxx Wed Nov  9 22:30:56 2011
@@ -85,7 +85,7 @@ void GlobalDeInitTools()
 #if defined WNT
 	ImpDeInitWinTools();
 #endif
-#ifdef OS2
+#ifdef OS2_YD_REMOVEME
 	ImpDeInitOS2Tools();
 #endif
 }



Mime
View raw message