incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1200700 [1/2] - in /incubator/ooo/trunk/main/vcl: ./ inc/ inc/os2/ inc/vcl/ os2/inc/ os2/source/app/ os2/source/gdi/ os2/source/src/ os2/source/window/ source/window/ workben/
Date Fri, 11 Nov 2011 02:37:06 GMT
Author: pfg
Date: Fri Nov 11 02:37:05 2011
New Revision: 1200700

URL: http://svn.apache.org/viewvc?rev=1200700&view=rev
Log:
i118582: OS/2 port - vcl build fixes - by ydario

Added:
    incubator/ooo/trunk/main/vcl/inc/os2/
      - copied from r1200685, incubator/ooo/trunk/main/vcl/os2/inc/
    incubator/ooo/trunk/main/vcl/os2/source/window/salmenu.cxx
Removed:
    incubator/ooo/trunk/main/vcl/os2/inc/
Modified:
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/Module_vcl.mk
    incubator/ooo/trunk/main/vcl/WinResTarget_vcl.mk
    incubator/ooo/trunk/main/vcl/inc/os2/salbmp.h
    incubator/ooo/trunk/main/vcl/inc/os2/saldata.hxx
    incubator/ooo/trunk/main/vcl/inc/os2/salframe.h
    incubator/ooo/trunk/main/vcl/inc/os2/salgdi.h
    incubator/ooo/trunk/main/vcl/inc/os2/salinst.h
    incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h
    incubator/ooo/trunk/main/vcl/inc/os2/salobj.h
    incubator/ooo/trunk/main/vcl/inc/os2/salprn.h
    incubator/ooo/trunk/main/vcl/inc/os2/salsys.h
    incubator/ooo/trunk/main/vcl/inc/os2/saltimer.h
    incubator/ooo/trunk/main/vcl/inc/os2/salvd.h
    incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h
    incubator/ooo/trunk/main/vcl/inc/sft.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/sysdata.hxx
    incubator/ooo/trunk/main/vcl/os2/source/app/salinfo.cxx
    incubator/ooo/trunk/main/vcl/os2/source/app/salinst.cxx
    incubator/ooo/trunk/main/vcl/os2/source/app/sallang.cxx
    incubator/ooo/trunk/main/vcl/os2/source/app/salshl.cxx
    incubator/ooo/trunk/main/vcl/os2/source/app/saltimer.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/os2layout.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salbmp.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi2.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi3.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salprn.cxx
    incubator/ooo/trunk/main/vcl/os2/source/gdi/salvd.cxx
    incubator/ooo/trunk/main/vcl/os2/source/src/salsrc.rc
    incubator/ooo/trunk/main/vcl/os2/source/window/salframe.cxx
    incubator/ooo/trunk/main/vcl/os2/source/window/salobj.cxx
    incubator/ooo/trunk/main/vcl/source/window/menu.cxx
    incubator/ooo/trunk/main/vcl/workben/makefile.mk
    incubator/ooo/trunk/main/vcl/workben/svdem.cxx

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Fri Nov 11 02:37:05 2011
@@ -87,6 +87,18 @@ $(eval $(call gb_Library_add_linked_libs
 ))
 endif
 
+ifeq ($(GUIBASE),os2)
+# YD FIXME this is not working... needs ldflags hack...
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    ft2lib \
+))
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    -lft2lib \
+))
+
+endif
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CXXFLAGS) \
@@ -232,6 +244,35 @@ $(eval $(call gb_Library_add_nativeres,v
 
 endif
 
+ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/os2/source/app/salinfo \
+    vcl/os2/source/app/salinst \
+    vcl/os2/source/app/sallang \
+    vcl/os2/source/app/salshl \
+    vcl/os2/source/app/saltimer \
+    vcl/os2/source/gdi/salbmp \
+    vcl/os2/source/gdi/salgdi \
+    vcl/os2/source/gdi/salgdi2 \
+    vcl/os2/source/gdi/salgdi3 \
+    vcl/os2/source/gdi/salprn \
+    vcl/os2/source/gdi/salvd \
+    vcl/os2/source/gdi/os2layout \
+    vcl/os2/source/window/salframe \
+    vcl/os2/source/window/salmenu \
+    vcl/os2/source/window/salobj \
+))
+
+ifeq ($(gb_DEBUGLEVEL),2)
+$(eval $(call gb_Library_add_cobjects,vcl,\
+    vcl/os2/source/app/printf \
+))
+endif
+
+$(eval $(call gb_Library_add_nativeres,vcl,src))
+
+endif
+
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/app/dbggui \
     vcl/source/app/dndhelp \

Modified: incubator/ooo/trunk/main/vcl/Module_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Module_vcl.mk?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Module_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Module_vcl.mk Fri Nov 11 02:37:05 2011
@@ -71,4 +71,10 @@ $(eval $(call gb_Module_add_targets,vcl,
 ))
 endif
 
+ifeq ($(GUIBASE),os2)
+$(eval $(call gb_Module_add_targets,vcl,\
+    WinResTarget_vcl \
+))
+endif
+
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/trunk/main/vcl/WinResTarget_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/WinResTarget_vcl.mk?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/WinResTarget_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/WinResTarget_vcl.mk Fri Nov 11 02:37:05 2011
@@ -32,6 +32,8 @@ $(eval $(call gb_WinResTarget_set_includ
         -I$(SRCDIR)/vcl/inc \
 ))
 
+ifeq ($(OS),WNT)
+
 $(eval $(call gb_WinResTarget_add_file,vcl/src,\
 	vcl/win/source/src/salsrc \
 ))
@@ -121,3 +123,16 @@ $(eval $(call gb_WinResTarget_add_depend
     vcl/win/source/src/movebw.cur \
     vcl/win/source/src/refhand.cur \
 ))
+
+else
+
+$(eval $(call gb_WinResTarget_add_file,vcl/src,\
+	vcl/os2/source/src/salsrc \
+))
+
+$(eval $(call gb_WinResTarget_set_include,vcl/src,\
+        $$(INCLUDE) \
+        -I$(SRCDIR)/vcl/os2/source/src \
+))
+
+endif

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salbmp.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salbmp.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salbmp.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salbmp.h Fri Nov 11 02:37:05 2011
@@ -29,8 +29,7 @@
 #define _SV_SALBMP_H
 
 #include <tools/gen.hxx>
-#include <vcl/sv.h>
-#include <vcl/salbmp.hxx>
+#include <salbmp.hxx>
 
 // --------------
 // - SalBitmap    -
@@ -64,10 +63,10 @@ public:
 
     static HANDLE       ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal );
 	static HANDLE		ImplCreateDIB4FromDIB1( HANDLE hDIB1 );
-    static HANDLE       ImplCopyDIBOrDDB( HANDLE hHdl, BOOL bDIB );
+    static HANDLE       ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB );
     static USHORT       ImplGetDIBColorCount( HANDLE hDIB );
-    static void         ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
-                                             const Size& rSizePixel, BOOL bRLE4 );
+    static void         ImplDecodeRLEBuffer( const PM_BYTE* pSrcBuf, PM_BYTE* pDstBuf,
+                                             const Size& rSizePixel, bool bRLE4 );
 
     //BOOL                Create( HANDLE hBitmap, BOOL bDIB, BOOL bCopyHandle );
 	

Modified: incubator/ooo/trunk/main/vcl/inc/os2/saldata.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/saldata.hxx?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/saldata.hxx (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/saldata.hxx Fri Nov 11 02:37:05 2011
@@ -24,9 +24,8 @@
 #ifndef _SV_SALDATA_HXX
 #define _SV_SALDATA_HXX
 
-#include <vcl/sv.h>
-#include <vcl/svdata.hxx>
-#include <vcl/salwtype.hxx>
+#include <svdata.hxx>
+#include <salwtype.hxx>
 
 class Os2SalInstance;
 class Os2SalFrame;
@@ -107,7 +106,7 @@ struct SalData
 	ULONG					mnNextTimerTime;
 	ULONG					mnLastEventTime;
 	ULONG					mnTimerId;			// os2 timer id
-	BOOL      				mbInTimerProc;			// timer event is currently being dispatched
+	PM_BOOL      				mbInTimerProc;			// timer event is currently being dispatched
 	//SALTIMERPROC				mpTimerProc;			// timer callback proc
 	HWND					mhWantLeaveMsg; 		// window handle, that want a MOUSELEAVE message
 	AutoTimer*				mpMouseLeaveTimer;		// Timer for MouseLeave Test
@@ -118,10 +117,10 @@ struct SalData
 	ULONG					mnAppThreadId;			// Id from Applikation-Thread
 	ULONG					mnFontMetricCount;		// number of entries in the font list
 	PFONTMETRICS				mpFontMetrics;			// cached font list
-	BOOL					mbObjClassInit; 		// Ist SALOBJECTCLASS initialised
+	PM_BOOL					mbObjClassInit; 		// Ist SALOBJECTCLASS initialised
 #ifdef ENABLE_IME
 	SalIMEData* 				mpIMEData;				// SalIME-Data
-	BOOL					mbIMEInit;				// SalIME-Data-Init
+	PM_BOOL					mbIMEInit;				// SalIME-Data-Init
 #endif
 
     SalIcon*                mpFirstIcon;            // icon cache, points to first icon, NULL if none
@@ -149,7 +148,7 @@ struct SalShlData
 
 extern SalShlData aSalShlData;
 
-BOOL SalImplHandleProcessMenu( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nMP2 );
+PM_BOOL SalImplHandleProcessMenu( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nMP2 );
 
 // --------------------------------------------
 // - SALSHL.CXX - for accessing DLL resources -
@@ -157,7 +156,7 @@ BOOL SalImplHandleProcessMenu( HWND hWnd
 
 HPOINTER ImplLoadSalCursor( int nId );
 HBITMAP ImplLoadSalBitmap( int nId );
-BOOL ImplLoadSalIcon( int nId, HPOINTER& rIcon);
+sal_Bool ImplLoadSalIcon( int nId, HPOINTER& rIcon);
 
 // SALGDI.CXX
 void ImplInitSalGDI();
@@ -172,7 +171,7 @@ void ImplSalYieldMutexAcquireWithWait();
 ULONG ImplSalReleaseYieldMutex();
 void ImplSalAcquireYieldMutex( ULONG nCount );
 ULONG GetCurrentThreadId();
-BOOL ImplSalYieldMutexTryToAcquire();
+sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salframe.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salframe.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salframe.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salframe.h Fri Nov 11 02:37:05 2011
@@ -28,10 +28,8 @@
 #ifndef _SV_SALFRAME_H
 #define _SV_SALFRAME_H
 
-#include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salframe.hxx>
-
+#include <salframe.hxx>
 
 #ifndef PM_BIDI_INCLUDED
 #include <pmbidi.h>
@@ -75,28 +73,28 @@ public:
 	long					mnWidth;				// Window-Witdth
 	long					mnHeight;				// Window-Height
 	SWP 					maFullScreenRect;		// WindowRect befor FullScreenMode
-	BOOL					mbGraphics; 			// is Graphics used
-	BOOL					mbAllwayOnTop;			// Allways on top modus
-	BOOL					mbVisible;				// Visible Show/Hide-Status
-	BOOL					mbMinHide;				// hide called from OS2
-	BOOL					mbHandleIME;			// TRUE: Wir handeln die IME-Messages
-	BOOL					mbConversionMode;		// TRUE: Wir befinden uns im Conversion-Modus
-	BOOL					mbCandidateMode;		// TRUE: Wir befinden uns im Candidate-Modus
-    BOOL                    mbCaption;              // has window a caption
-    BOOL                    mbBorder;               // has window a border
-    BOOL                    mbFixBorder;            // has window a fixed border
-    BOOL                    mbSizeBorder;           // has window a sizeable border
-    BOOL                    mbNoIcon;               // is an window without an icon
-    BOOL                    mbFloatWin;             // is a FloatingWindow
-    BOOL                    mbFullScreen;           // TRUE: in full screen mode
-    BOOL                    mbPresentation;         // TRUE: Presentation Mode running
-    BOOL                    mbInShow;               // innerhalb eines Show-Aufrufs
-    BOOL                    mbRestoreMaximize;      // Restore-Maximize
-    BOOL                    mbInMoveMsg;            // Move-Message wird verarbeitet
-    BOOL                    mbInSizeMsg;            // Size-Message wird verarbeitet
-    BOOL                    mbFullScreenToolWin;    // WS_EX_TOOLWINDOW reset in FullScreenMode
-    BOOL                    mbDefPos;               // default-position
-    BOOL                    mbOverwriteState;       // TRUE: WindowState darf umgesetzt werden
+	sal_Bool					mbGraphics; 			// is Graphics used
+	sal_Bool					mbAllwayOnTop;			// Allways on top modus
+	sal_Bool					mbVisible;				// Visible Show/Hide-Status
+	sal_Bool					mbMinHide;				// hide called from OS2
+	sal_Bool					mbHandleIME;			// TRUE: Wir handeln die IME-Messages
+	sal_Bool					mbConversionMode;		// TRUE: Wir befinden uns im Conversion-Modus
+	sal_Bool					mbCandidateMode;		// TRUE: Wir befinden uns im Candidate-Modus
+    sal_Bool                    mbCaption;              // has window a caption
+    sal_Bool                    mbBorder;               // has window a border
+    sal_Bool                    mbFixBorder;            // has window a fixed border
+    sal_Bool                    mbSizeBorder;           // has window a sizeable border
+    sal_Bool                    mbNoIcon;               // is an window without an icon
+    sal_Bool                    mbFloatWin;             // is a FloatingWindow
+    sal_Bool                    mbFullScreen;           // TRUE: in full screen mode
+    sal_Bool                    mbPresentation;         // TRUE: Presentation Mode running
+    sal_Bool                    mbInShow;               // innerhalb eines Show-Aufrufs
+    sal_Bool                    mbRestoreMaximize;      // Restore-Maximize
+    sal_Bool                    mbInMoveMsg;            // Move-Message wird verarbeitet
+    sal_Bool                    mbInSizeMsg;            // Size-Message wird verarbeitet
+    sal_Bool                    mbFullScreenToolWin;    // WS_EX_TOOLWINDOW reset in FullScreenMode
+    sal_Bool                    mbDefPos;               // default-position
+    sal_Bool                    mbOverwriteState;       // TRUE: WindowState darf umgesetzt werden
 
     int                     mnMinWidth;             // min. client width in pixeln
     int                     mnMinHeight;            // min. client height in pixeln
@@ -104,7 +102,7 @@ public:
     int                     mnMaxHeight;            // max. client height in pixeln
     static ULONG            mnInputLang;            // current Input Language
     KHAND                   mnKeyboardHandle;       // current unicode keyboard
-    static BOOL             mbInReparent;           // TRUE: ignore focus lost and gain due to reparenting
+    static sal_Bool             mbInReparent;           // TRUE: ignore focus lost and gain due to reparenting
 
 private:
     Os2SalFrame*			mpParentFrame;			// parent frame pointer
@@ -115,14 +113,14 @@ public:
 
     virtual SalGraphics*		GetGraphics();
     virtual void				ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL				PostEvent( void* pData );
+    virtual sal_Bool				PostEvent( void* pData );
     virtual void				SetTitle( const XubString& rTitle );
     virtual void				SetIcon( USHORT nIcon );
     virtual void                                SetMenu( SalMenu* pSalMenu );
     virtual void                                DrawMenuBar();
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void				Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void				Enable( BOOL bEnable );
+    virtual void				Show( sal_Bool bVisible, sal_Bool bNoActivate = FALSE );
+    virtual void				Enable( sal_Bool bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
     virtual void				SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
@@ -131,13 +129,13 @@ public:
     virtual void				GetWorkArea( Rectangle& rRect );
     virtual SalFrame*			GetParent() const;
     virtual void				SetWindowState( const SalFrameState* pState );
-    virtual BOOL				GetWindowState( SalFrameState* pState );
-    virtual void				ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void				StartPresentation( BOOL bStart );
-    virtual void				SetAlwaysOnTop( BOOL bOnTop );
+    virtual sal_Bool				GetWindowState( SalFrameState* pState );
+    virtual void				ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay );
+    virtual void				StartPresentation( sal_Bool bStart );
+    virtual void				SetAlwaysOnTop( sal_Bool bOnTop );
     virtual void				ToTop( USHORT nFlags );
     virtual void				SetPointer( PointerStyle ePointerStyle );
-    virtual void				CaptureMouse( BOOL bMouse );
+    virtual void				CaptureMouse( sal_Bool bMouse );
     virtual void				SetPointerPos( long nX, long nY );
     virtual void				Flush();
     virtual void				Sync();
@@ -145,7 +143,7 @@ public:
     virtual void				EndExtTextInput( USHORT nFlags );
     virtual String				GetKeyName( USHORT nKeyCode );
     virtual String				GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
-    virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+    virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
     virtual LanguageType		GetInputLanguage();
     virtual SalBitmap*			SnapShot();
     virtual void				UpdateSettings( AllSettings& rSettings );

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salgdi.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salgdi.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salgdi.h Fri Nov 11 02:37:05 2011
@@ -28,11 +28,10 @@
 #ifndef _SV_SALGDI_H
 #define _SV_SALGDI_H
 
-#include <vcl/sv.h>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
 
 #include <hash_set>
 
@@ -54,7 +53,7 @@ class ImplOs2FontData : public ImplFontD
 public:
                             ImplOs2FontData( PFONTMETRICS,
                                 int nFontHeight,
-                                BYTE nPitchAndFamily  );
+                                PM_BYTE nPitchAndFamily  );
                             ~ImplOs2FontData();
 
     virtual ImplFontData*   Clone() const;
@@ -67,14 +66,22 @@ public:
 
     PFONTMETRICS            GetFontMetrics() const          { return pFontMetric; }
     USHORT                  GetCharSet() const          { return meOs2CharSet; }
-    BYTE                    GetPitchAndFamily() const   { return mnPitchAndFamily; }
+    PM_BYTE                    GetPitchAndFamily() const   { return mnPitchAndFamily; }
     bool                    IsGlyphApiDisabled() const  { return mbDisableGlyphApi; }
     bool                    SupportsKorean() const      { return mbHasKoreanRange; }
     bool                    SupportsCJK() const         { return mbHasCJKSupport; }
+    bool                    SupportsArabic() const      { return mbHasArabicSupport; }
     bool                    AliasSymbolsHigh() const    { return mbAliasSymbolsHigh; }
     bool                    AliasSymbolsLow() const     { return mbAliasSymbolsLow; }
 
-    const ImplFontCharMap*  GetImplFontCharMap() const;
+    const ImplFontCharMap*        GetImplFontCharMap() const;
+    const Ucs2SIntMap* GetEncodingVector() const { return mpEncodingVector; }
+    void SetEncodingVector( const Ucs2SIntMap* pNewVec ) const
+    {
+        if( mpEncodingVector )
+            delete mpEncodingVector;
+        mpEncodingVector = pNewVec;
+    }
 
 private:
     sal_IntPtr              mnId;
@@ -82,13 +89,15 @@ private:
     mutable bool                    mbHasKoreanRange;
     mutable bool                    mbHasCJKSupport;
 
-    mutable const ImplFontCharMap*  mpUnicodeMap;
+    mutable bool                    mbHasArabicSupport;
+    mutable ImplFontCharMap*        mpUnicodeMap;
+    mutable const Ucs2SIntMap*      mpEncodingVector;
 
     // TODO: get rid of the members below needed to work with the Win9x non-unicode API
-    BYTE*                   mpFontCharSets;     // all Charsets for the current font (used on W98 for kerning)
-    BYTE                    mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried
+    PM_BYTE*                   mpFontCharSets;     // all Charsets for the current font (used on W98 for kerning)
+    PM_BYTE                    mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried
     USHORT                  meOs2CharSet;
-    BYTE                    mnPitchAndFamily;
+    PM_BYTE                    mnPitchAndFamily;
     bool                    mbAliasSymbolsHigh;
     bool                    mbAliasSymbolsLow;
     PFONTMETRICS            pFontMetric;
@@ -128,19 +137,19 @@ public:
 	PFONTMETRICS			mpFontMetrics;		// cached font list
 	LONG					mnOrientationX; 	// X-Font orientation
 	LONG					mnOrientationY; 	// Y-Font orientation
-	BOOL					mbLine; 			// draw lines
-	BOOL					mbFill; 			// fill areas
-	BOOL					mbPrinter;			// is Printer
-	BOOL					mbVirDev;			// is VirDev
-	BOOL					mbWindow;			// is Window
-	BOOL					mbScreen;			// is Screen compatible
+	sal_Bool					mbLine; 			// draw lines
+	sal_Bool					mbFill; 			// fill areas
+	sal_Bool					mbPrinter;			// is Printer
+	sal_Bool					mbVirDev;			// is VirDev
+	sal_Bool					mbWindow;			// is Window
+	sal_Bool					mbScreen;			// is Screen compatible
 	bool					mbXORMode;			// _every_ output with RasterOp XOR
 	ULONG					mhFonts[ MAX_FALLBACK ];        // Font + Fallbacks
 	const ImplOs2FontData*			mpOs2FontData[ MAX_FALLBACK ];  // pointer to the most recent font face
 	ImplOs2FontEntry*			mpOs2FontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance
 	ULONG					mhDefFont;			// DefaultFont
 	float					mfFontScale;			// allows metrics emulation of huge font sizes
-	BOOL					mbFontKernInit; 	// FALSE: FontKerns must be queried
+	sal_Bool					mbFontKernInit; 	// FALSE: FontKerns must be queried
 	KERNINGPAIRS*				mpFontKernPairs;	// Kerning Pairs of the current Font
 	ULONG					mnFontKernPairCount;// Number of Kerning Pairs of the current Font
 
@@ -151,6 +160,7 @@ public:
     virtual ~Os2SalGraphics();
 
 protected:
+    virtual bool        setClipRegion( const Region& );
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void		drawPixel( long nX, long nY );
     virtual void		drawPixel( long nX, long nY, SalColor nSalColor );
@@ -161,9 +171,9 @@ protected:
     virtual void		drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
-    virtual sal_Bool	drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool	drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
-    virtual sal_Bool	drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
+    virtual sal_Bool	drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+    virtual sal_Bool	drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void		copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
@@ -190,19 +200,19 @@ protected:
     virtual void		invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
     virtual void		invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual sal_Bool		drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
 #if 0
     // native widget rendering methods that require mirroring
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
-                                              const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+                                              const Point& aPos, sal_Bool& rIsInside );
+    virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            rtl::OUString aCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                rtl::OUString aCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, rtl::OUString aCaption,
                                                 Region &rNativeBoundingRegion, Region &rNativeContentRegion );
 #endif
@@ -224,7 +234,6 @@ public:
 
     // set the clip region to empty
     virtual void			ResetClipRegion();
-    virtual bool            setClipRegion( const Region& );
 
     // set the line color to transparent (= don't draw lines)
     virtual void			SetLineColor();
@@ -246,12 +255,12 @@ public:
     // set the font
     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
     // get the current font's etrics
-    virtual void			GetFontMetric( ImplFontMetricData* );
+    virtual void			GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
     virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
-    virtual ImplFontCharMap* GetImplFontCharMap() const;
+    virtual const ImplFontCharMap* GetImplFontCharMap() const;
     // graphics must fill supplied font list
     virtual void			GetDevFontList( ImplDevFontList* );
     // graphics should call ImplAddDevFontSubstitute on supplied
@@ -270,7 +279,7 @@ public:
     //             rInfo: additional outgoing information
     // implementation note: encoding 0 with glyph id 0 should be added implicitly
     // as "undefined character"
-    virtual BOOL			CreateFontSubset( const rtl::OUString& rToFile,
+    virtual sal_Bool			CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData* pFont,
                                               long* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -294,7 +303,7 @@ public:
     //             pWidths: the widths of all glyphs from char code 0 to 255
     //                      pWidths MUST support at least 256 members;
     //             rInfo: additional outgoing information
-    //             pDataLen: out parameter, contains the byte length of the returned buffer
+    //             pDataLen: out parameter, contains the PM_BYTE length of the returned buffer
     virtual const void*	GetEmbedFontData( const ImplFontData*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
@@ -308,15 +317,15 @@ public:
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
 
-    virtual BOOL                    GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual sal_Bool                    GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual sal_Bool                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void					 DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
 
     // Query the platform layer for control support
-    virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart );
+    virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
 
     virtual SystemGraphicsData GetGraphicsData() const;
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
@@ -330,7 +339,7 @@ void ImplSalDeInitGraphics( Os2SalGraphi
 // - Defines -
 // -----------
 
-#define RGBCOLOR(r,g,b) 	((ULONG)(((BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(BYTE)(r))<<16)))
+#define RGBCOLOR(r,g,b) 	((ULONG)(((PM_BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(PM_BYTE)(r))<<16)))
 #define TY( y ) 			(mnHeight-(y)-1)
 
 // offset for lcid field, used for fallback font selection

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salinst.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salinst.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salinst.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salinst.h Fri Nov 11 02:37:05 2011
@@ -28,8 +28,7 @@
 #ifndef _SV_SALINST_H
 #define _SV_SALINST_H
 
-#include <vcl/sv.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
 
 namespace vos { class OMutex; }
 
@@ -62,7 +61,7 @@ public:
     virtual SalFrame*      	CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
     virtual SalFrame*      	CreateFrame( SalFrame* pParent, ULONG nStyle );
     virtual void			DestroyFrame( SalFrame* pFrame );
-    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual SalObject*		CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = TRUE );
     virtual void			DestroyObject( SalObject* pObject );
     virtual SalVirtualDevice*	CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
@@ -86,8 +85,13 @@ public:
     virtual ULONG				ReleaseYieldMutex();
     virtual void				AcquireYieldMutex( ULONG nCount );
     virtual bool                CheckYieldMutex();
+
     virtual void				Yield( bool, bool );
     virtual bool				AnyInput( USHORT nType );
+    virtual SalMenu*			CreateMenu( sal_Bool bMenuBar, Menu* );
+    virtual void				DestroyMenu( SalMenu* );
+    virtual SalMenuItem*			CreateMenuItem( const SalItemParams* pItemData );
+    virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     virtual void				AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
@@ -95,6 +99,6 @@ public:
 
 SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSalFrameStyle );
 SalObject* ImplSalCreateObject( Os2SalInstance* pInst, Os2SalFrame* pParent );
-void ImplSalStartTimer( ULONG nMS, BOOL bMutex = FALSE );
+void ImplSalStartTimer( ULONG nMS, sal_Bool bMutex = FALSE );
 
 #endif // _SV_SALINST_H

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salmenu.h Fri Nov 11 02:37:05 2011
@@ -28,10 +28,8 @@
 #ifndef _SV_SALMENU_H
 #define _SV_SALMENU_H
 
-#include <vcl/sv.h>
 #include <vcl/bitmap.hxx>
-#include <vcl/salmenu.hxx>
-
+#include <salmenu.hxx>
 
 class Os2SalMenu : public SalMenu
 {
@@ -39,15 +37,15 @@ public:
 	Os2SalMenu() {}
 	virtual ~Os2SalMenu();
 
-    virtual BOOL VisibleMenuBar();  // must return TRUE to actually DISPLAY native menu bars
+    virtual sal_Bool VisibleMenuBar();  // must return TRUE to actually DISPLAY native menu bars
                             // otherwise only menu messages are processed (eg, OLE on Windows)
 
     virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
     virtual void RemoveItem( unsigned nPos );
     virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
     virtual void SetFrame( const SalFrame* pFrame );
-    virtual void CheckItem( unsigned nPos, BOOL bCheck );
-    virtual void EnableItem( unsigned nPos, BOOL bEnable );
+    virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
+    virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
     virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText );
     virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
     virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName );

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salobj.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salobj.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salobj.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salobj.h Fri Nov 11 02:37:05 2011
@@ -28,8 +28,7 @@
 #ifndef _SV_SALOBJ_H
 #define _SV_SALOBJ_H
 
-#include <vcl/sv.h>
-#include <vcl/salobj.hxx>
+#include <salobj.hxx>
 
 // -----------------
 // - SalObjectData -
@@ -58,8 +57,8 @@ public:
 	virtual void					UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
 	virtual void					EndSetClipRegion();
 	virtual void					SetPosSize( long nX, long nY, long nWidth, long nHeight );
-	virtual void					Show( BOOL bVisible );
-	virtual void					Enable( BOOL nEnable );
+	virtual void					Show( sal_Bool bVisible );
+	virtual void					Enable( sal_Bool nEnable );
 	virtual void					GrabFocus();
 	virtual void					SetBackground();
 	virtual void					SetBackground( SalColor nSalColor );

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salprn.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salprn.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salprn.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salprn.h Fri Nov 11 02:37:05 2011
@@ -28,8 +28,7 @@
 #ifndef _SV_SALPRN_H
 #define _SV_SALPRN_H
 
-#include <vcl/sv.h>
-#include <vcl/salprn.hxx>
+#include <salprn.hxx>
 
 class SalGraphics;
 class SalInfoPrinter;
@@ -59,8 +58,8 @@ public:
 	USHORT					mnFormCount;			// PaperForm-Count
 	PIMPLTRAYINFO*			mpTrayArray;			// PaperTray-Names
 	USHORT					mnTrayCount;			// PaperTray-Count
-	BOOL					mbDJPSupported; 		// is driver DJP enabled
-	BOOL					mbGraphics; 			// is Graphics used
+	sal_Bool					mbDJPSupported; 		// is driver DJP enabled
+	sal_Bool					mbGraphics; 			// is Graphics used
 
 public:
     Os2SalInfoPrinter();
@@ -68,9 +67,9 @@ public:
 
 	virtual SalGraphics*			GetGraphics();
 	virtual void					ReleaseGraphics( SalGraphics* pGraphics );
-	virtual BOOL					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-	virtual BOOL					SetPrinterData( ImplJobSetup* pSetupData );
-	virtual BOOL					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+	virtual sal_Bool					Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+	virtual sal_Bool					SetPrinterData( ImplJobSetup* pSetupData );
+	virtual sal_Bool					SetData( ULONG nFlags, ImplJobSetup* pSetupData );
 	virtual void					GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
@@ -94,9 +93,9 @@ public:
 	HDC 					mhDC;					// printer hdc
 	HPS 					mhPS;					// printer hps
 	ULONG					mnError;				// Error Code
-	BOOL					mbFirstPage;			// IsFirstPage
-	BOOL					mbAbort;				// JobAborted
-	BOOL					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
+	sal_Bool					mbFirstPage;			// IsFirstPage
+	sal_Bool					mbAbort;				// JobAborted
+	sal_Bool					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
 	char					maCommentBuf[33];		// Comment
 	char					maCopyBuf[10];			// Kopien
 };
@@ -114,32 +113,32 @@ public:
 	HDC 					mhDC;					// printer hdc
 	HPS 					mhPS;					// printer hps
 	ULONG					mnError;				// Error Code
-	BOOL					mbFirstPage;			// IsFirstPage
-	BOOL					mbAbort;				// JobAborted
-	BOOL					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
+	sal_Bool					mbFirstPage;			// IsFirstPage
+	sal_Bool					mbAbort;				// JobAborted
+	sal_Bool					mbPrintDJPSupported;	// is driver PrintDJP enabled (DEVESC_NEWFRAME_WPROP)
 	char					maCommentBuf[33];		// Comment
 	char					maCopyBuf[16];			// Kopien
 	//HDC 					mhDC;					// printer hdc
 	//ULONG					mnError;				// Error Code
 	//ULONG					mnCopies;				// Kopien
-	//BOOL					mbCollate;				// Sortierte Kopien
-	//BOOL					mbAbort;				// Job Aborted
+	//sal_Bool					mbCollate;				// Sortierte Kopien
+	//sal_Bool					mbAbort;				// Job Aborted
 
 public:
     Os2SalPrinter();
     virtual ~Os2SalPrinter();
 
-	virtual BOOL					StartJob( const XubString* pFileName,
+	virtual sal_Bool					StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
                                               ULONG nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-	virtual BOOL					EndJob();
-	virtual BOOL					AbortJob();
-	virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-	virtual BOOL					EndPage();
+	virtual sal_Bool					EndJob();
+	virtual sal_Bool					AbortJob();
+	virtual SalGraphics*			StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData );
+	virtual sal_Bool					EndPage();
 	virtual ULONG					GetErrorCode();
 };
 

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salsys.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salsys.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salsys.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salsys.h Fri Nov 11 02:37:05 2011
@@ -28,8 +28,7 @@
 #ifndef _SV_SALSYS_H
 #define _SV_SALSYS_H
 
-#include <vcl/salsys.hxx>
-#include <vcl/sv.h>
+#include <salsys.hxx>
 
 class SalFrame;
 

Modified: incubator/ooo/trunk/main/vcl/inc/os2/saltimer.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/saltimer.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/saltimer.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/saltimer.h Fri Nov 11 02:37:05 2011
@@ -28,7 +28,7 @@
 #ifndef _SV_SALTIMER_H
 #define _SV_SALTIMER_H
 
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
 
 class Os2SalTimer : public SalTimer
 {

Modified: incubator/ooo/trunk/main/vcl/inc/os2/salvd.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/salvd.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/salvd.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/salvd.h Fri Nov 11 02:37:05 2011
@@ -28,8 +28,7 @@
 #ifndef _SV_SALVD_H
 #define _SV_SALVD_H
 
-#include <vcl/sv.h>
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
 
 class Os2SalGraphics;
 
@@ -47,14 +46,14 @@ public:
 	HBITMAP 				mhDefBmp;				// Default Bitmap
 	Os2SalGraphics*			mpGraphics; 			// current VirDev graphics
 	USHORT					mnBitCount; 			// BitCount (0 or 1)
-	BOOL					mbGraphics; 			// is Graphics used
+	sal_Bool					mbGraphics; 			// is Graphics used
 
     Os2SalVirtualDevice();
     virtual ~Os2SalVirtualDevice();
 
     virtual SalGraphics*			GetGraphics();
     virtual void					ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    SetSize( long nNewDX, long nNewDY );
+    virtual sal_Bool                    SetSize( long nNewDX, long nNewDY );
     virtual void				    GetSize( long& rWidth, long& rHeight );
 };
 

Modified: incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h?rev=1200700&r1=1200685&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/os2/xwphook.h Fri Nov 11 02:37:05 2011
@@ -8,14 +8,9 @@
 
 /*
  *      Copyright (C) 1999-2002 Ulrich M”ller.
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, in version 2 as it comes in the COPYING
- *      file of the XWorkplace main distribution.
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ *      This file is part of the "XWorkplace helpers" source package.
+ *
+ *      2009-06-15 published under LGPL3 with Ulrich Mller permission.
  */
 
 #ifndef XWPHOOK_HEADER_INCLUDED
@@ -79,7 +74,7 @@
 
     typedef struct _PAGERCONFIG
     {
-        BYTE        cDesktopsX,
+        PM_BYTE     cDesktopsX,
                     cDesktopsY,
                 // no. of virtual Desktops (x and y)
                     bStartX,
@@ -236,7 +231,7 @@
                                             // bottom in order not to break binary
                                             // compatibility
 
-        BYTE            bMonitorDrives[30];     // array of 1-byte BOOLs; if any of these
+        PM_BYTE         bMonitorDrives[30];     // array of 1-byte BOOLs; if any of these
                 // is "1", the corresponding drive letter
                 // will be monitored for media change
                 // (index 1 = A, index 2 = B, index 3 = C, ...).
@@ -492,7 +487,7 @@
         USHORT  usAction;
                         // The action (relative to the plugin) defined for
                         // this event.
-        BYTE    abSetup[16];
+        PM_BYTE abSetup[16];
                         // A private area possibly refining the action.
     } MOUSEMAPPING, *PMOUSEMAPPING;
 

Modified: incubator/ooo/trunk/main/vcl/inc/sft.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/sft.hxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/sft.hxx (original)
+++ incubator/ooo/trunk/main/vcl/inc/sft.hxx Fri Nov 11 02:37:05 2011
@@ -109,7 +109,7 @@ namespace vcl
     };
 
 /** Value of the width member of the TTGlobalFontInfo struct */
-#ifndef OS2
+#ifndef FWIDTH_DONT_CARE // OS2
     enum WidthClass {
         FWIDTH_ULTRA_CONDENSED = 1,         /**< 50% of normal                      */
         FWIDTH_EXTRA_CONDENSED = 2,         /**< 62.5% of normal                    */
@@ -121,7 +121,7 @@ namespace vcl
         FWIDTH_EXTRA_EXPANDED = 8,          /**< 150% of normal                     */
         FWIDTH_ULTRA_EXPANDED = 9           /**< 200% of normal                     */
     };
-#endif // OS2
+#endif // FWIDTH_DONT_CARE
 #endif /* FW_THIN */
 
 /** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */

Modified: incubator/ooo/trunk/main/vcl/inc/vcl/sysdata.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/vcl/sysdata.hxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/vcl/sysdata.hxx (original)
+++ incubator/ooo/trunk/main/vcl/inc/vcl/sysdata.hxx Fri Nov 11 02:37:05 2011
@@ -159,6 +159,8 @@ struct SystemFontData
 	unsigned long	nSize;			// size in bytes of this structure
 #if defined( WNT )
     HFONT           hFont;          // native font object
+#elif defined( OS2 )
+    ULONG           hFont;          // native font object
 #elif defined( QUARTZ )             
     void*           aATSUFontID;    // native font object
 #elif defined( UNX )

Modified: incubator/ooo/trunk/main/vcl/os2/source/app/salinfo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/app/salinfo.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/app/salinfo.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/app/salinfo.cxx Fri Nov 11 02:37:05 2011
@@ -26,19 +26,20 @@
 #define INCL_GPI
 #include <svpm.h>
 
-#include <tools/string.hxx>
-#include <salsys.h>
-#include <salframe.h>
-#include <salinst.h>
-#include "saldata.hxx"
-#include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
-#include <rtl/ustrbuf.hxx>
+#include "svsys.h"
+#include "rtl/ustrbuf.hxx"
+
+#include "tools/debug.hxx"
+#include "tools/string.hxx"
+
 #include "vcl/window.hxx"
 
-#ifndef _SV_SALGTYPE_HXX
-//#include <salgtype.hxx>
-#endif
+#include "os2/salsys.h"
+#include "os2/salframe.h"
+#include "os2/salinst.h"
+#include "os2/saldata.hxx"
+
+#include "svdata.hxx"
 
 #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
 

Modified: incubator/ooo/trunk/main/vcl/os2/source/app/salinst.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/app/salinst.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/app/salinst.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/app/salinst.cxx Fri Nov 11 02:37:05 2011
@@ -37,16 +37,16 @@
 #include <tools/debug.hxx>
 
 #ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
+#include <os2/salids.hrc>
 #endif
 #include <vcl/apptypes.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
-#include <saltimer.h>
-#include <salbmp.h>
-#include <vcl/salimestatus.hxx>
+#include <os2/saldata.hxx>
+#include <os2/salinst.h>
+#include <os2/salframe.h>
+#include <os2/salobj.h>
+#include <os2/saltimer.h>
+#include <os2/salbmp.h>
+#include <salimestatus.hxx>
 #include <vcl/timer.hxx>
 #include <tools/solarmutex.hxx>
 
@@ -196,7 +196,7 @@ void ImplSalYieldMutexAcquireWithWait()
     {
         // Wenn wir den Mutex nicht bekommen, muessen wir solange
         // warten, bis wir Ihn bekommen
-        BOOL bAcquire = FALSE;
+        sal_Bool bAcquire = FALSE;
         do
         {
             if ( pInst->mpSalYieldMutex->tryToAcquire() )
@@ -229,7 +229,7 @@ void ImplSalYieldMutexAcquireWithWait()
 
 // -----------------------------------------------------------------------
 
-BOOL ImplSalYieldMutexTryToAcquire()
+sal_Bool ImplSalYieldMutexTryToAcquire()
 {
     Os2SalInstance* pInst = GetSalData()->mpFirstInstance;
     if ( pInst )
@@ -529,7 +529,7 @@ void Os2SalInstance::AcquireYieldMutex( 
 
 // -----------------------------------------------------------------------
 
-static void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents )
+static void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents )
 {
 	QMSG			aMsg;
 	bool bWasMsg = false, bOneEvent = false;
@@ -782,7 +782,7 @@ void Os2SalInstance::DestroyFrame( SalFr
 
 SalObject* Os2SalInstance::CreateObject( SalFrame* pParent,
                                          SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows
-                                         BOOL /*bShow*/ ) 
+                                         sal_Bool /*bShow*/ ) 
 {
 	// Um auf Main-Thread umzuschalten
 	return (SalObject*)WinSendMsg( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (MPARAM)pParent );
@@ -854,4 +854,3 @@ SalSession* Os2SalInstance::CreateSalSes
 {
     return NULL;
 }
-

Modified: incubator/ooo/trunk/main/vcl/os2/source/app/sallang.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/app/sallang.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/app/sallang.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/app/sallang.cxx Fri Nov 11 02:37:05 2011
@@ -22,7 +22,7 @@
 
 
 #ifndef _SALLANG_HXX
-#include <sallang.hxx>
+#include <os2/sallang.hxx>
 #endif
 
 // =======================================================================

Modified: incubator/ooo/trunk/main/vcl/os2/source/app/salshl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/app/salshl.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/app/salshl.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/app/salshl.cxx Fri Nov 11 02:37:05 2011
@@ -24,7 +24,7 @@
 #include <svpm.h>
 
 #define _SV_SALSHL_CXX
-#include <saldata.hxx>
+#include <os2/saldata.hxx>
 #include <tools/debug.hxx>
 
 // =======================================================================
@@ -74,7 +74,7 @@ HPOINTER ImplLoadSalCursor( int nId )
 
 // -----------------------------------------------------------------------
 
-BOOL ImplLoadSalIcon( int nId, HPOINTER& rIcon)
+sal_Bool ImplLoadSalIcon( int nId, HPOINTER& rIcon)
 {
 	DBG_ASSERT( aSalShlData.mhMod, "no DLL instance handle" );
 

Modified: incubator/ooo/trunk/main/vcl/os2/source/app/saltimer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/app/saltimer.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/app/saltimer.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/app/saltimer.cxx Fri Nov 11 02:37:05 2011
@@ -24,9 +24,9 @@
 #include <svpm.h>
 
 #define _SV_SALTIMER_CXX
-#include <saldata.hxx>
-#include <saltimer.h>
-#include <salinst.h>
+#include <os2/saldata.hxx>
+#include <os2/saltimer.h>
+#include <os2/salinst.h>
 
 // =======================================================================
 
@@ -36,7 +36,7 @@
 
 // =======================================================================
 
-void ImplSalStartTimer( ULONG nMS, BOOL bMutex )
+void ImplSalStartTimer( ULONG nMS, sal_Bool bMutex )
 {
 	SalData*	pSalData = GetSalData();
 

Modified: incubator/ooo/trunk/main/vcl/os2/source/gdi/os2layout.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/gdi/os2layout.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/gdi/os2layout.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/gdi/os2layout.cxx Fri Nov 11 02:37:05 2011
@@ -21,16 +21,27 @@
 
 
 
-#include <tools/svwin.h>
+#define INCL_GPI
+#define INCL_DOS
+#include <svpm.h>
 
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
-#include <salgdi.h>
-#include <saldata.hxx>
-#include <vcl/sallayout.hxx>
+#include "tools/svwin.h"
+
+#include "vcl/svapp.hxx"
+
+#include "os2/salgdi.h"
+#include "os2/saldata.hxx"
+
+// for GetMirroredChar
+#include "sft.hxx"
+#include "sallayout.hxx"
+
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
+#include "sallayout.hxx"
 
 #ifndef __H_FT2LIB
-#include <wingdi.h>
+#include <os2/wingdi.h>
 #include <ft2lib.h>
 #endif
 
@@ -41,9 +52,6 @@
     #include <algorithm>
 #endif // GCP_KERN_HACK
 
-// for GetMirroredChar
-#include <vcl/svapp.hxx>
-
 #include <hash_map>
 typedef std::hash_map<int,int> IntMap;
 
@@ -120,7 +128,7 @@ protected:
 class Os2SalLayout : public Os2Layout
 {
 public:
-                    Os2SalLayout( HPS, BYTE nCharSet, const ImplOs2FontData&, ImplOs2FontEntry& );
+                    Os2SalLayout( HPS, PM_BYTE nCharSet, const ImplOs2FontData&, ImplOs2FontEntry& );
     virtual         ~Os2SalLayout();
 
     virtual bool    LayoutText( ImplLayoutArgs& );
@@ -159,7 +167,7 @@ private:
     bool            mbDisableGlyphs;
 
     int             mnNotdefWidth;
-    BYTE            mnCharSet;
+    PM_BYTE            mnCharSet;
 
 };
 
@@ -172,7 +180,7 @@ Os2Layout::Os2Layout( HPS hPS, const Imp
     mrOs2FontData( rWFD ),
     mrOs2FontEntry( rWFE )
 {
-	BOOL fSuccess;
+	sal_Bool fSuccess;
 	fSuccess = Ft2QueryLogicalFont( mhPS, LCID_BASE, NULL, &mhFont, sizeof(FATTRS));
 }
 
@@ -186,7 +194,7 @@ void Os2Layout::InitFont() const
 
 // =======================================================================
 
-Os2SalLayout::Os2SalLayout( HPS hPS, BYTE nCharSet,
+Os2SalLayout::Os2SalLayout( HPS hPS, PM_BYTE nCharSet,
     const ImplOs2FontData& rOs2FontData, ImplOs2FontEntry& rOs2FontEntry )
 :   Os2Layout( hPS, rOs2FontData, rOs2FontEntry ),
     mnGlyphCount( 0 ),
@@ -957,7 +965,7 @@ SalLayout* Os2SalGraphics::GetTextLayout
         }
 #endif // GCP_KERN_HACK
 
-        //BYTE eCharSet = ANSI_CHARSET;
+        //PM_BYTE eCharSet = ANSI_CHARSET;
         //if( mpLogFont )
         //    eCharSet = mpLogFont->lfCharSet;
         pLayout = new Os2SalLayout( mhPS, 0, rFontFace, rFontInstance );

Modified: incubator/ooo/trunk/main/vcl/os2/source/gdi/salbmp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/gdi/salbmp.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/gdi/salbmp.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/gdi/salbmp.cxx Fri Nov 11 02:37:05 2011
@@ -26,14 +26,14 @@
 #define _SV_SALBMP_CXX
 #include <rtl/alloc.h>
 #include <vcl/salbtype.hxx>
-#include <salgdi.h>
-#include <saldata.hxx>
-#include <salbmp.h>
+#include <os2/salgdi.h>
+#include <os2/saldata.hxx>
+#include <os2/salbmp.h>
 #include <vcl/bitmap.hxx> // for BitmapSystemData
 #include <string.h>
 
 #ifndef __H_FT2LIB
-#include <wingdi.h>
+#include <os2/wingdi.h>
 #include <ft2lib.h>
 #endif
 
@@ -41,12 +41,12 @@
 // - Inlines -
 // -----------
 
-inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex )
+inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const PM_BYTE cIndex )
 {
-    BYTE& rByte = pScanline[ nX >> 1 ];
+	PM_BYTE rByte = pScanline[ nX >> 1 ];
 
-    ( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( cIndex & 0x0f ) ) :
-                 ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) );
+	( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( cIndex & 0x0f ) ) :
+				 ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) );
 }
 
 // -------------
@@ -72,7 +72,7 @@ Os2SalBitmap::~Os2SalBitmap()
 
 bool Os2SalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = TRUE;
 
     if( bDIB )
         mhDIB = (HANDLE) ( bCopyHandle ? ImplCopyDIBOrDDB( hBitmap, TRUE ) : hBitmap );
@@ -397,7 +397,7 @@ HANDLE Os2SalBitmap::ImplCreateDIB4FromD
     PBYTE               pDIB4 = (PBYTE) rtl_allocateZeroMemory( nSize4 );
     PBITMAPINFO2        pBI4 = (PBITMAPINFO2) pDIB4;
     PBITMAPINFOHEADER2  pBIH4 = (PBITMAPINFOHEADER2) pBI4;
-    BYTE                aMap[ 4 ] = { 0x00, 0x01, 0x10, 0x11 };
+    PM_BYTE                aMap[ 4 ] = { 0x00, 0x01, 0x10, 0x11 };
 
     memset( pBIH4, 0, sizeof( BITMAPINFOHEADER2 ) );
     pBIH4->cbFix = sizeof( BITMAPINFOHEADER2 );
@@ -431,7 +431,7 @@ HANDLE Os2SalBitmap::ImplCreateDIB4FromD
 
 // ------------------------------------------------------------------
 
-HANDLE Os2SalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, BOOL bDIB )
+HANDLE Os2SalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
 {
     HANDLE hCopy = 0;
 
@@ -442,8 +442,8 @@ HANDLE Os2SalBitmap::ImplCopyDIBOrDDB( H
                             + ImplGetDIBColorCount( hHdl ) * sizeof( RGB2 ) +
                             ( pBIH->cbImage ? pBIH->cbImage : AlignedWidth4Bytes( pBIH->cx * pBIH->cBitCount ) );
 
-        BYTE* pCopy = (BYTE*)rtl_allocateZeroMemory( nSize );
-        memcpy( pCopy, (BYTE*) hHdl, nSize );
+        PM_BYTE* pCopy = (PM_BYTE*)rtl_allocateZeroMemory( nSize );
+        memcpy( pCopy, (PM_BYTE*) hHdl, nSize );
         hCopy = (HANDLE) pCopy;
     }
     else if( hHdl )
@@ -537,8 +537,8 @@ BitmapBuffer* Os2SalBitmap::AcquireBuffe
                 PBITMAPINFOHEADER2    pNewBIH = (PBITMAPINFOHEADER2) pNewBI;
                 const USHORT        nColorCount = ImplGetDIBColorCount( hNewDIB );
                 const ULONG            nOffset = *(ULONG*) pBI + nColorCount * sizeof( RGB2 );
-                BYTE*                pOldBits = (BYTE*) pBI + nOffset;
-                BYTE*                pNewBits = (BYTE*) pNewBI + nOffset;
+                PM_BYTE*                pOldBits = (PM_BYTE*) pBI + nOffset;
+                PM_BYTE*                pNewBits = (PM_BYTE*) pNewBI + nOffset;
 
                 memcpy( pNewBI, pBI, nOffset );
                 pNewBIH->ulCompression = 0;
@@ -580,10 +580,10 @@ BitmapBuffer* Os2SalBitmap::AcquireBuffe
                     if( nPalCount )
                     	memcpy( pBuffer->maPalette.ImplGetColorBuffer(), pBI->argbColor, nPalCount * sizeof( RGB2 ) );
 
-                    pBuffer->mpBits = (BYTE*) pBI + *(ULONG*) pBI + nPalCount * sizeof( RGB2 );
+                    pBuffer->mpBits = (sal_uInt8*) pBI + *(ULONG*) pBI + nPalCount * sizeof( RGB2 );
                 }
                 else
-                    pBuffer->mpBits = (BYTE*) pBI + *(ULONG*) pBI;
+                    pBuffer->mpBits = (sal_uInt8*) pBI + *(ULONG*) pBI;
             }
             else
             {
@@ -627,8 +627,8 @@ void Os2SalBitmap::ReleaseBuffer( Bitmap
 
 // ------------------------------------------------------------------
 
-void Os2SalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
-                                     const Size& rSizePixel, BOOL bRLE4 )
+void Os2SalBitmap::ImplDecodeRLEBuffer( const PM_BYTE* pSrcBuf, PM_BYTE* pDstBuf,
+                                     const Size& rSizePixel, bool bRLE4 )
 {
     HPBYTE    pRLE = (HPBYTE) pSrcBuf;
     HPBYTE    pDIB = (HPBYTE) pDstBuf;
@@ -639,8 +639,8 @@ void Os2SalBitmap::ImplDecodeRLEBuffer( 
     ULONG    nRunByte;
     ULONG    nX = 0;
     ULONG    i;
-    BYTE    cTmp;
-    BOOL    bEndDecoding = FALSE;
+    PM_BYTE    cTmp;
+    sal_Bool    bEndDecoding = FALSE;
 
     if( pRLE && pDIB )
     {

Modified: incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi.cxx Fri Nov 11 02:37:05 2011
@@ -26,18 +26,19 @@
 
 #define _SV_SALGDI_CXX
 #include <tools/debug.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
+#include <os2/saldata.hxx>
+#include <os2/salgdi.h>
 #include <tools/debug.hxx>
-#include <salframe.h>
+#include <os2/salframe.h>
 #include <tools/poly.hxx>
 #ifndef _RTL_STRINGBUF_HXX
 #include <rtl/strbuf.hxx>
 #endif
-#include "vcl/region.h"
+
+#include <region.h>
 
 #ifndef __H_FT2LIB
-#include <wingdi.h>
+#include <os2/wingdi.h>
 #include <ft2lib.h>
 #endif
 
@@ -670,14 +671,14 @@ bool Os2SalGraphics::drawPolyLine(
 
 // -----------------------------------------------------------------------
 
-sal_Bool Os2SalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool Os2SalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     return sal_False;
 }
@@ -685,7 +686,7 @@ sal_Bool Os2SalGraphics::drawPolygonBezi
 // -----------------------------------------------------------------------
 
 sal_Bool Os2SalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints,
-                                             const SalPoint* const* pPtAry, const BYTE* const* pFlgAry )
+                                             const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry )
 {
     return sal_False;
 }
@@ -694,10 +695,10 @@ sal_Bool Os2SalGraphics::drawPolyPolygon
 
 // MAXIMUM BUFSIZE EQ 0xFFFF
 #define POSTSCRIPT_BUFSIZE			0x4000
-// we only try to get the BoundingBox in the first 4096 bytes
+// we only try to get the BoundingBox in the first 4096 PM_BYTEs
 #define POSTSCRIPT_BOUNDINGSEARCH	0x1000
 
-static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
+static PM_BYTE* ImplSearchEntry( PM_BYTE* pSource, PM_BYTE* pDest, ULONG nComp, ULONG nSize )
 {
 	while ( nComp-- >= nSize )
 	{
@@ -715,10 +716,10 @@ static BYTE* ImplSearchEntry( BYTE* pSou
 }
 
 
-static BOOL ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
+static PM_BOOL ImplGetBoundingBox( double* nNumb, PM_BYTE* pSource, ULONG nSize )
 {
-	BOOL	bRetValue = FALSE;
-	BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 );
+	PM_BOOL	bRetValue = FALSE;
+	PM_BYTE* pDest = ImplSearchEntry( pSource, (PM_BYTE*)"%%BoundingBox:", nSize, 14 );
 	if ( pDest )
 	{
 		nNumb[0] = nNumb[1] = nNumb[2] = nNumb[3] = 0;
@@ -726,21 +727,21 @@ static BOOL ImplGetBoundingBox( double* 
 
 		int nSizeLeft = nSize - ( pDest - pSource );
 		if ( nSizeLeft > 100 )
-			nSizeLeft = 100;	// only 100 bytes following the bounding box will be checked
+			nSizeLeft = 100;	// only 100 PM_BYTEs following the bounding box will be checked
 
 		int i;
 		for ( i = 0; ( i < 4 ) && nSizeLeft; i++ )
 		{
 			int 	nDivision = 1;
-			BOOL	bDivision = FALSE;
-			BOOL	bNegative = FALSE;
-			BOOL	bValid = TRUE;
+			PM_BOOL	bDivision = FALSE;
+			PM_BOOL	bNegative = FALSE;
+			PM_BOOL	bValid = TRUE;
 
 			while ( ( --nSizeLeft ) && ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) pDest++;
-			BYTE nByte = *pDest;
-			while ( nSizeLeft && ( nByte != ' ' ) && ( nByte != 0x9 ) && ( nByte != 0xd ) && ( nByte != 0xa ) )
+			PM_BYTE nPM_BYTE = *pDest;
+			while ( nSizeLeft && ( nPM_BYTE != ' ' ) && ( nPM_BYTE != 0x9 ) && ( nPM_BYTE != 0xd ) && ( nPM_BYTE != 0xa ) )
 			{
-				switch ( nByte )
+				switch ( nPM_BYTE )
 				{
 					case '.' :
 						if ( bDivision )
@@ -752,19 +753,19 @@ static BOOL ImplGetBoundingBox( double* 
 						bNegative = TRUE;
 						break;
 					default :
-						if ( ( nByte < '0' ) || ( nByte > '9' ) )
+						if ( ( nPM_BYTE < '0' ) || ( nPM_BYTE > '9' ) )
 							nSizeLeft = 1; 	// error parsing the bounding box values
 						else if ( bValid )
 						{
 							if ( bDivision )
 								nDivision*=10;
 							nNumb[i] *= 10;
-							nNumb[i] += nByte - '0';
+							nNumb[i] += nPM_BYTE - '0';
 						}
 						break;
 				}
 				nSizeLeft--;
-				nByte = *(++pDest);
+				nPM_BYTE = *(++pDest);
 			}
 			if ( bNegative )
 				nNumb[i] = -nNumb[i];
@@ -778,13 +779,13 @@ static BOOL ImplGetBoundingBox( double* 
 }
 
 #if 0
-static void ImplWriteDouble( BYTE** pBuf, double nNumber )
+static void ImplWriteDouble( PM_BYTE** pBuf, double nNumber )
 {
 //	*pBuf += sprintf( (char*)*pBuf, "%f", nNumber );
 
 	if ( nNumber < 0 )
 	{
-		*(*pBuf)++ = (BYTE)'-';
+		*(*pBuf)++ = (PM_BYTE)'-';
 		nNumber = -nNumber;
 	}
 	ULONG nTemp = (ULONG)nNumber;
@@ -797,7 +798,7 @@ static void ImplWriteDouble( BYTE** pBuf
 	nTemp = (ULONG)( ( nNumber - nTemp ) * 100000 );
 	if ( nTemp )
 	{
-		*(*pBuf)++ = (BYTE)'.';
+		*(*pBuf)++ = (PM_BYTE)'.';
 		const String aNumber2( nTemp );
 
 		ULONG nLen = aNumber2.Len();
@@ -805,7 +806,7 @@ static void ImplWriteDouble( BYTE** pBuf
 		{
 			for ( n = 0; n < ( 5 - nLen ); n++ )
 			{
-				*(*pBuf)++ = (BYTE)'0';
+				*(*pBuf)++ = (PM_BYTE)'0';
 			}
 		}
 		for ( USHORT n = 0; n < nLen; n++ )
@@ -817,27 +818,27 @@ static void ImplWriteDouble( BYTE** pBuf
 }
 #endif 
 
-inline void ImplWriteString( BYTE** pBuf, const char* sString )
+inline void ImplWriteString( PM_BYTE** pBuf, const char* sString )
 {
 	strcpy( (char*)*pBuf, sString );
 	*pBuf += strlen( sString );
 }
 
-BOOL Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize )
+sal_Bool Os2SalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize )
 {
 	if ( !mbPrinter )
 		return FALSE;
 
-	BOOL	bRet  = FALSE;
+	PM_BOOL	bRet  = FALSE;
 	LONG	nLong = 0;
 	if ( !(DevQueryCaps( mhDC, CAPS_TECHNOLOGY, 1, &nLong ) &&
 		   (CAPS_TECH_POSTSCRIPT == nLong)) )
 		return FALSE;
 
-	BYTE*	pBuf = new BYTE[ POSTSCRIPT_BUFSIZE ];
+	PM_BYTE*	pBuf = new PM_BYTE[ POSTSCRIPT_BUFSIZE ];
 	double	nBoundingBox[4];
 
-	if ( pBuf && ImplGetBoundingBox( nBoundingBox, (BYTE*)pPtr, nSize ) )
+	if ( pBuf && ImplGetBoundingBox( nBoundingBox, (PM_BYTE*)pPtr, nSize ) )
 	{
 		LONG pOS2DXAry[4];		  // hack -> print always 2 white space
 		POINTL aPt;
@@ -932,7 +933,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
 				*((USHORT*)aBuf.getStr()) = (USHORT)( aBuf.getLength() - 2 );
 				//Escape ( mhDC, nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 );
 				DevEscape( mhDC, DEVESC_RAWDATA, aBuf.getLength(),
-						(PBYTE)aBuf.getStr(), 0, NULL );
+						(PM_BYTE*)aBuf.getStr(), 0, NULL );
 		
 		double dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] );
 		double dM22 = - ( nHeight / (nBoundingBox[1] - nBoundingBox[3] ) );
@@ -951,9 +952,9 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
                              "%%BeginDocument:\n" );
 				*((USHORT*)aBuf.getStr()) = (USHORT)( aBuf.getLength() - 2 );
 				DevEscape( mhDC, DEVESC_RAWDATA, aBuf.getLength(),
-						(PBYTE)aBuf.getStr(), 0, NULL );
+						(PM_BYTE*)aBuf.getStr(), 0, NULL );
 #if 0
-		BYTE* pTemp = pBuf;
+		PM_BYTE* pTemp = pBuf;
 		ImplWriteString( &pTemp, "save\n[ " );
 		ImplWriteDouble( &pTemp, dM11 );
 		ImplWriteDouble( &pTemp, 0 );
@@ -964,11 +965,11 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
 		ImplWriteString( &pTemp, "] concat /showpage {} def\n" );
 
 		if ( DevEscape( mhDC, DEVESC_RAWDATA, pTemp - pBuf,
-			(PBYTE)pBuf, 0, NULL ) == DEV_OK )
+			(PM_BYTE*)pBuf, 0, NULL ) == DEV_OK )
 #endif //
 		{
-			UINT32 nToDo = nSize;
-			UINT32 nDoNow;
+			sal_uInt32 nToDo = nSize;
+			sal_uInt32 nDoNow;
 			bRet = TRUE;
 			while( nToDo && bRet )
 			{
@@ -976,7 +977,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
 				if ( nToDo < nDoNow )
 					nDoNow = nToDo;
 
-				if ( DevEscape( mhDC, DEVESC_RAWDATA, nDoNow, (PBYTE)pPtr + nSize - nToDo,
+				if ( DevEscape( mhDC, DEVESC_RAWDATA, nDoNow, (PM_BYTE*)pPtr + nSize - nToDo,
 				   0, NULL ) == -1 )
 					bRet = FALSE;
 				nToDo -= nDoNow;
@@ -985,7 +986,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
 			if ( bRet )
 			{
 				strcpy ( (char*)pBuf, "\nrestore\n" );
-				if ( DevEscape( mhDC, DEVESC_RAWDATA, 9, (PBYTE)pBuf,
+				if ( DevEscape( mhDC, DEVESC_RAWDATA, 9, (PM_BYTE*)pBuf,
 					0, NULL ) == DEV_OK ) bRet = TRUE;
 			}
 			
@@ -999,7 +1000,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
                              "b4_Inc_state_salWin restore\n\n" );
 				*((USHORT*)aBuf.getStr()) = (USHORT)( aBuf.getLength() - 2 );
 				DevEscape( mhDC, DEVESC_RAWDATA, aBuf.getLength(),
-						(PBYTE)aBuf.getStr(), 0, NULL );
+						(PM_BYTE*)aBuf.getStr(), 0, NULL );
 				bRet = TRUE;
 			
 		}
@@ -1014,7 +1015,7 @@ BOOL Os2SalGraphics::drawEPS( long nX, l
  *  Returns TRUE if the platform supports native
  *  drawing of the control defined by nPart
  */
-BOOL Os2SalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
+sal_Bool Os2SalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
 {
 	return( FALSE );
 }

Modified: incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi2.cxx?rev=1200700&r1=1200699&r2=1200700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi2.cxx (original)
+++ incubator/ooo/trunk/main/vcl/os2/source/gdi/salgdi2.cxx Fri Nov 11 02:37:05 2011
@@ -25,28 +25,21 @@
 #include <svpm.h>
 
 #define _SV_SALGDI2_CXX
-#include <salbmp.h>
-#include <saldata.hxx>
+#include <os2/salbmp.h>
+#include <os2/saldata.hxx>
 #ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
+#include <os2/salids.hrc>
 #endif
-#include <salgdi.h>
-#include <salvd.h>
+#include <os2/salgdi.h>
+#include <os2/salvd.h>
 #include <vcl/salbtype.hxx>
 
 #ifndef __H_FT2LIB
-#include <wingdi.h>
+#include <os2/wingdi.h>
 #include <ft2lib.h>
 #endif
 
-BOOL bFastTransparent = FALSE;
-
-// -----------
-// - Defines -
-// -----------
-
-#define RGBCOLOR( r, g, b ) ((ULONG)(((BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(BYTE)(r))<<16)))
-#define TY( y ) 			(mnHeight-(y)-1)
+PM_BOOL bFastTransparent = FALSE;
 
 // ---------------
 // - SalGraphics -
@@ -283,15 +276,15 @@ void Os2SalGraphics::copyArea( long nDes
 
 void ImplDrawBitmap( HPS hPS, long nScreenHeight,
 					 const SalTwoRect* pPosAry, const Os2SalBitmap& rSalBitmap,
-					 BOOL bPrinter, int nDrawMode )
+					 PM_BOOL bPrinter, int nDrawMode )
 {
 	if( hPS )
 	{
 		HANDLE		hDrawDIB;
 		HBITMAP 	hDrawDDB = rSalBitmap.ImplGethDDB();
 		Os2SalBitmap*	pTmpSalBmp = NULL;
-		BOOL		bPrintDDB = ( bPrinter && hDrawDDB );
-		BOOL		bDrawDDB1 = ( ( rSalBitmap.GetBitCount() == 1 ) && hDrawDDB );
+		PM_BOOL		bPrintDDB = ( bPrinter && hDrawDDB );
+		PM_BOOL		bDrawDDB1 = ( ( rSalBitmap.GetBitCount() == 1 ) && hDrawDDB );
 
 		if( bPrintDDB || bDrawDDB1 )
 		{
@@ -310,7 +303,7 @@ void ImplDrawBitmap( HPS hPS, long nScre
 			BITMAPINFOHEADER2*	pBIH = (BITMAPINFOHEADER2*) pBI;
 			const long			nHeight = pBIH->cy;
 			long				nInfoSize = *(ULONG*) pBI + rSalBitmap.ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGB2 );
-			BYTE*				pBits = (BYTE*) pBI + nInfoSize;
+			PM_BYTE*				pBits = (PM_BYTE*) pBI + nInfoSize;
 
 			pts[0].x = pPosAry->mnDestX;
 			pts[0].y = nScreenHeight - pPosAry->mnDestY - pPosAry->mnDestHeight;
@@ -338,12 +331,12 @@ void ImplDrawBitmap( HPS hPS, long nScre
 				pBI = (BITMAPINFO2*) hSubst;
 				pBIH = (BITMAPINFOHEADER2*) pBI;
 				nInfoSize = *(ULONG*) pBI + rSalBitmap.ImplGetDIBColorCount( hSubst ) * sizeof( RGB2 );
-				pBits = (BYTE*) pBI + nInfoSize;
+				pBits = (PM_BYTE*) pBI + nInfoSize;
 			}
 
 			if( bPrinter )
 			{
-				BYTE* pDummy;
+				PM_BYTE* pDummy;
 
 				// expand 8Bit-DIB's to 24Bit-DIB's, because some printer drivers
 				// have problems to print these DIB's (strange)
@@ -356,7 +349,7 @@ void ImplDrawBitmap( HPS hPS, long nScre
 					const long			nNewImageSize = nHeight * nWidthAl24;
 					BITMAPINFOHEADER2*	pNewInfo;
 
-					pDummy = new BYTE[ sizeof( BITMAPINFO2 ) + nNewImageSize ];
+					pDummy = new PM_BYTE[ sizeof( BITMAPINFO2 ) + nNewImageSize ];
 					memset( pDummy, 0, sizeof( BITMAPINFO2 ) );
 
 					pNewInfo = (BITMAPINFOHEADER2*) pDummy;
@@ -368,13 +361,13 @@ void ImplDrawBitmap( HPS hPS, long nScre
 					pNewInfo->ulCompression = BCA_UNCOMP;
 					pNewInfo->cbImage = nNewImageSize;
 
-					BYTE* pBitsSrc = (BYTE*) pBIH + nInfoSize;
-					BYTE* pBitsDst = pDummy + sizeof( BITMAPINFO2 );
+					PM_BYTE* pBitsSrc = (PM_BYTE*) pBIH + nInfoSize;
+					PM_BYTE* pBitsDst = pDummy + sizeof( BITMAPINFO2 );
 
 					for( long nY = 0UL; nY < nHeight; nY++ )
 					{
-						BYTE* pSrcLine = pBitsSrc + nY * nWidthAl8;
-						BYTE* pDstLine = pBitsDst + nY * nWidthAl24;
+						PM_BYTE* pSrcLine = pBitsSrc + nY * nWidthAl8;
+						PM_BYTE* pDstLine = pBitsDst + nY * nWidthAl24;
 
 						for( long nX = 0UL; nX < nWidth; nX++ )
 						{
@@ -393,7 +386,7 @@ void ImplDrawBitmap( HPS hPS, long nScre
 					const long nImageSize = ( pBIH->cbImage ? pBIH->cbImage : ( pBIH->cy * AlignedWidth4Bytes( pBIH->cx * pBIH->cBitCount ) ) );
 					const long nTotalSize = nInfoSize + nImageSize;
 
-					pDummy = new BYTE[ nTotalSize ];
+					pDummy = new PM_BYTE[ nTotalSize ];
 					memcpy( pDummy, pBI, nTotalSize );
 				}
 
@@ -666,7 +659,7 @@ SalColor Os2SalGraphics::getPixel( long 
 	POINTL	  aPt = { nX, TY( nY ) };
 	LONG	nColor = Ft2QueryPel( mhPS, &aPt );
 
-	return MAKE_SALCOLOR( (BYTE) ( nColor >> 16 ), (BYTE) ( nColor >> 8 ), (BYTE) nColor );
+	return MAKE_SALCOLOR( (PM_BYTE) ( nColor >> 16 ), (PM_BYTE) ( nColor >> 8 ), (PM_BYTE) nColor );
 }
 
 // -----------------------------------------------------------------------



Mime
View raw message