CWS-TOOLING: integrate CWS os2port04

2008-11-27 13:22:38 +0100 ydario  r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario  r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario  r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario  r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario  r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario  r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario  r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario  r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario  r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario  r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario  r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario  r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario  r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario  r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.

1 files changed, 6 insertions, 6 deletions

diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index 07fdb6c38927..dffb6a412f9b 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.cxx
@@ -107,7 +107,7 @@ inline int ImplOs2FontEntry::GetCachedGlyphWidth( int nCharCode ) const
 class Os2Layout : public SalLayout
 {
 public:
-                        Os2Layout( HDC, ImplOs2FontData&, ImplOs2FontEntry& );
+                        Os2Layout( HDC, const ImplOs2FontData&, ImplOs2FontEntry& );
     virtual void        InitFont() const;
     void                SetFontScale( float f ) { mfFontScale = f; }
     float               GetFontScale() const    { return mfFontScale; }
@@ -118,7 +118,7 @@ protected:
     int                 mnBaseAdv;          // x-offset relative to Layout origin
     float               mfFontScale;        // allows metrics emulation of huge font sizes
 
-    ImplOs2FontData&    mrOs2FontData;
+    const ImplOs2FontData&    mrOs2FontData;
     ImplOs2FontEntry&   mrOs2FontEntry;
 };
 
@@ -127,7 +127,7 @@ protected:
 class Os2SalLayout : public Os2Layout
 {
 public:
-                    Os2SalLayout( HPS, BYTE nCharSet, ImplOs2FontData&, ImplOs2FontEntry& );
+                    Os2SalLayout( HPS, BYTE nCharSet, const ImplOs2FontData&, ImplOs2FontEntry& );
     virtual         ~Os2SalLayout();
 
     virtual bool    LayoutText( ImplLayoutArgs& );
@@ -172,7 +172,7 @@ private:
 
 // =======================================================================
 
-Os2Layout::Os2Layout( HPS hPS, ImplOs2FontData& rWFD, ImplOs2FontEntry& rWFE )
+Os2Layout::Os2Layout( HPS hPS, const ImplOs2FontData& rWFD, ImplOs2FontEntry& rWFE )
 :   mhPS( hPS ),
     mnBaseAdv( 0 ),
     mfFontScale( 1.0 ),
@@ -194,7 +194,7 @@ void Os2Layout::InitFont() const
 // =======================================================================
 
 Os2SalLayout::Os2SalLayout( HPS hPS, BYTE nCharSet,
-    ImplOs2FontData& rOs2FontData, ImplOs2FontEntry& rOs2FontEntry )
+    const ImplOs2FontData& rOs2FontData, ImplOs2FontEntry& rOs2FontEntry )
 :   Os2Layout( hPS, rOs2FontData, rOs2FontEntry ),
     mnGlyphCount( 0 ),
     mnCharCount( 0 ),
@@ -950,7 +950,7 @@ SalLayout* Os2SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     Os2SalLayout* pLayout = NULL;
     DBG_ASSERT( mpOs2FontEntry[nFallbackLevel], "WinSalGraphics mpWinFontEntry==NULL");
 
-    ImplOs2FontData& rFontFace      = *mpOs2FontData[ nFallbackLevel ];
+    const ImplOs2FontData& rFontFace      = *mpOs2FontData[ nFallbackLevel ];
     ImplOs2FontEntry& rFontInstance = *mpOs2FontEntry[ nFallbackLevel ];
 
     {