Update from master repository (DEV300_m98).

15 files changed, 49 insertions, 229 deletions

diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/unx/inc/i18n_im.hxx
index 297bc8edec17..a22a57b976c8 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/unx/inc/i18n_im.hxx
@@ -56,10 +56,6 @@ public:
     Bool        FilterEvent( XEvent *pEvent, XLIB_Window window );
     Bool        AddConnectionWatch (Display *pDisplay, void *pConnectionHandler);
 
-    #ifdef _USE_PRINT_EXTENSION_
-    void            Invalidate()                    { mbUseable = False; }
-    #endif
-
     SalI18N_InputMethod();
     ~SalI18N_InputMethod();
 };
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index d4dec957a6b3..b650cffbae8b 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
@@ -59,6 +59,8 @@ class GtkSalDisplay : public SalDisplay
     GdkDisplay*                     m_pGdkDisplay;
     GdkCursor                      *m_aCursors[ POINTER_COUNT ];
     bool                            m_bStartupCompleted;
+    std::vector< int >              m_aXineramaScreenIndexMap;
+
     GdkCursor* getFromXPM( const char *pBitmap, const char *pMask,
                            int nWidth, int nHeight, int nXHot, int nYHot );
 public:
@@ -73,6 +75,8 @@ public:
     virtual long Dispatch( XEvent *pEvent );
     virtual void initScreen( int nScreen ) const;
 
+    virtual int GetDefaultMonitorNumber() const;
+
     static GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
                                            GdkEvent* event,
                                            gpointer data );
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index 18dd476fc2c4..d47e5fb50fca 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
@@ -38,6 +38,8 @@
 #include <vcl/salframe.hxx>
 #include <vcl/sysdata.hxx>
 
+#include "tools/link.hxx"
+
 #include <list>
 #include <vector>
 
@@ -265,6 +267,8 @@ class GtkSalFrame : public SalFrame
     void setMinMaxSize();
     void createNewWindow( XLIB_Window aParent, bool bXEmbed, int nScreen );
     void askForXEmbedFocus( sal_Int32 nTimecode );
+
+    DECL_LINK( ImplDelayedFullScreenHdl, void* );
 public:
     GtkSalFrame( SalFrame* pParent, ULONG nStyle );
     GtkSalFrame( SystemParentData* pSysData );
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 065b5435eeb0..38c79b3e11df 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
@@ -63,17 +63,17 @@ public:
 
     // native widget methods
     virtual BOOL        IsNativeControlSupported( ControlType nType, ControlPart nPart );
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& rCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& rCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& rCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
@@ -178,10 +178,6 @@ protected:
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-
-    BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Region& rControlRegion,
-                                    ControlState nState, const ImplControlValue& aValue,
-                                    const rtl::OUString& rCaption );
 };
 
 #endif // _VCL_GTKGDI_HXX
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index ea740249f1c6..9d3f235b8894 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
@@ -64,6 +64,7 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h
index 2eae73cdaa86..d4f5a9f156e0 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/unx/inc/pspgraphics.h
@@ -102,9 +102,9 @@ public:
 
     virtual void            SetTextColor( SalColor nSalColor );
     virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
     virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
-    virtual ImplFontCharMap* GetImplFontCharMap() const;
+    virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
@@ -142,7 +142,7 @@ public:
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const basegfx::B2DPolygon&, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
+    virtual bool            drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
     virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 7e38e0a89bf2..939437060750 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -63,6 +63,7 @@ protected:
             SalDisplay         *m_pSalDisplay;
             pthread_t           hMainThread_;
             rtl::OUString       maLocalHostName;
+            rtl::OUString       maUnicodeAccumulator;
 
 public:
     X11SalData();
@@ -90,6 +91,7 @@ public:
 
     const rtl::OUString&    GetLocalHostName() const
     { return maLocalHostName; }
+    rtl::OUString&          GetUnicodeAccumulator() { return maUnicodeAccumulator; }
 
     static int XErrorHdl( Display*, XErrorEvent* );
     static int XIOErrorHdl( Display* );
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 3734cbec6ef7..89efad3cde4d 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -269,15 +269,10 @@ public:
 
 class SalI18N_InputMethod;
 class SalI18N_KeyboardExtension;
-class XlfdStorage;
-class ExtendedFontStruct;
-class ExtendedXlfd;
 class AttributeProvider;
 class SalUnicodeConverter;
 class SalConverterCache;
 
-DECLARE_LIST( SalFontCache, ExtendedFontStruct* )
-
 extern "C" {
     struct SnDisplay;
     struct SnLauncheeContext;
@@ -349,8 +344,6 @@ protected:
     SalI18N_KeyboardExtension   *mpKbdExtension;
 
     AttributeProvider           *mpFactory;
-    XlfdStorage                 *mpFontList;
-    const ExtendedXlfd          *mpFallbackFactory;
 
     Display        *pDisp_;             // X Display
     int             m_nDefaultScreen;           // XDefaultScreen
@@ -374,8 +367,6 @@ protected:
     XLIB_Cursor     aPointerCache_[POINTER_COUNT];
     SalFrame*       m_pCapture;
 
-    mutable SalFontCache* m_pFontCache;
-
     // Keyboard
     BOOL            bNumLockFromXS_;    // Num Lock handled by X Server
     int             nNumLockIndex_;     // modifier index in modmap
@@ -397,7 +388,6 @@ protected:
 
     mutable XLIB_Time  m_nLastUserEventTime; // mutable because changed on first access
 
-    void            DestroyFontCache();
     virtual long    Dispatch( XEvent *pEvent ) = 0;
     void            InitXinerama();
     void            InitRandR( XLIB_Window aRoot ) const;
@@ -405,7 +395,7 @@ protected:
     int             processRandREvent( XEvent* );
 
     void            doDestruct();
-    void            addXineramaScreenUnique( long i_nX, long i_nY, long i_nWidth, long i_nHeight );
+    int             addXineramaScreenUnique( long i_nX, long i_nY, long i_nWidth, long i_nHeight );
 public:
     static  SalDisplay     *GetSalDisplay( Display* display );
     static  BOOL            BestVisual( Display     *pDisp,
@@ -434,14 +424,6 @@ public:
     void            PrintEvent( const ByteString &rComment,
                                 XEvent       *pEvent ) const;
 
-    XlfdStorage*    GetXlfdList() const;
-    ExtendedFontStruct*
-    GetFont( const ExtendedXlfd *pFont,
-             const Size& rPixelSize, sal_Bool bVertical ) const;
-    const ExtendedXlfd*
-    GetFallbackFactory()
-    { return mpFallbackFactory; }
-
     void            Beep() const;
 
     void            ModifierMapping();
@@ -475,6 +457,7 @@ public:
     XLIB_Window     GetDrawable( int nScreen ) const { return getDataForScreen( nScreen ).m_aRefWindow; }
     Display        *GetDisplay() const { return pDisp_; }
     int             GetDefaultScreenNumber() const { return m_nDefaultScreen; }
+    virtual int     GetDefaultMonitorNumber() const { return 0; }
     const Size&     GetScreenSize( int nScreen ) const { return getDataForScreen( nScreen ).m_aSize; }
     srv_vendor_t    GetServerVendor() const { return meServerVendor; }
     void            SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 6f962c9a13b3..9786bac76f35 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -108,6 +108,8 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
     bool            m_bXEmbed;
     int             nVisibility_;
     int             m_nWorkArea;
+    bool            m_bSetFocusOnMap;
+
 
     int             nScreenSaversTimeout_;
     Rectangle       maPaintRegion;
@@ -206,6 +208,10 @@ public:
     bool                    isMapped() const { return bMapped_; }
     bool                    hasFocus() const { return mbInputFocus; }
 
+    void                    beginUnicodeSequence();
+    bool                    appendUnicodeSequence( sal_Unicode );
+    bool                    endUnicodeSequence();
+
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
 
diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h
index 6ccea2c4a00c..8af62a5c6607 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/unx/inc/salgdi.h
@@ -28,18 +28,15 @@
 #ifndef _SV_SALGDI_H
 #define _SV_SALGDI_H
 
-
-// -=-= exports -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-class   SalFontCacheItem;
-
 // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include "salstd.hxx"
 #include "vcl/salgdi.hxx"
 #include "vcl/salgtype.hxx"
 #include "tools/fract.hxx"
 #include "vcl/dllapi.h"
+#include <vcl/vclenum.hxx>
+#include <vcl/sallayout.hxx>
 #include <deque>
-#include "xfont.hxx"
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 struct  ImplFontMetricData;
@@ -100,7 +97,6 @@ protected:
     Pixel           nPenPixel_;
 
     GC              pFontGC_;       // Font attributes
-    ExtendedFontStructRef   mXFont[ MAX_FALLBACK ];
     ServerFont*             mpServerFont[ MAX_FALLBACK ];
 
     SalColor        nTextColor_;
@@ -185,7 +181,7 @@ protected:
                                 const SalBitmap  &rTransparentBitmap,
                                 SalColor          nTransparentColor );
 
-    GC                      SelectFont();
+    GC                      GetFontGC();
     bool                    setFont( const ImplFontSelectData* pEntry, int nFallbackLevel );
 
     void                    drawMaskedBitmap( const SalTwoRect* pPosAry,
@@ -193,9 +189,6 @@ protected:
                                               const SalBitmap& rTransparentBitmap );
 
 protected:
-    void                    DrawStringUCS2MB( ExtendedFontStruct& rFont, const Point&,
-                                const sal_Unicode* pStr, int nLength );
-
     void                    DrawPrinterString( const SalLayout& );
 
     void                    DrawServerFontString( const ServerFontLayout& );
@@ -253,9 +246,9 @@ public:
 
     virtual void            SetTextColor( SalColor nSalColor );
     virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData* );
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
     virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
-    virtual ImplFontCharMap* GetImplFontCharMap() const;
+    virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
@@ -294,7 +287,7 @@ public:
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
+    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
     virtual bool            drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
 
 #if 1 // TODO: remove these obselete methods
@@ -386,19 +379,8 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
 
 #ifdef DBG_UTIL
 #define stderr0( s )            fprintf( stderr, s )
-#define stderr1( s, a )         fprintf( stderr, s, a )
-#define stderr2( s, a, b )      fprintf( stderr, s, a, b )
-#define stderr3( s, a, b, c )   fprintf( stderr, s, a, b, c )
-#define stdass0( b )            (void)( !(b) \
-                                        ? fprintf( stderr, "\"%s\" (%s line %d)\n", \
-                                                    #b, __FILE__, __LINE__ ) \
-                                        : 0 )
 #else
 #define stderr0( s )            ;
-#define stderr1( s, a )     ;
-#define stderr2( s, a, b )  ;
-#define stderr3( s, a, b, c )   ;
-#define stdass0( b )            ;
 #endif
 
 #endif // _SV_SALGDI_H
diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h
index d73d67f81425..133f0bf6037f 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/unx/inc/salinst.h
@@ -39,11 +39,11 @@
 #include <vcl/dllapi.h>
 #include <vcl/salinst.hxx>
 
-class VCL_DLLPUBLIC SalYieldMutex : public NAMESPACE_VOS(OMutex)
+class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
 {
 protected:
     ULONG                                       mnCount;
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   mnThreadId;
+    vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
                                                 SalYieldMutex();
@@ -53,7 +53,7 @@ public:
     virtual sal_Bool                            tryToAcquire();
 
     ULONG                                       GetAcquireCount() const { return mnCount; }
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   GetThreadId() const { return mnThreadId; }
+    vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
 // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -102,13 +102,10 @@ public:
     virtual vos::IMutex*        GetYieldMutex();
     virtual ULONG               ReleaseYieldMutex();
     virtual void                AcquireYieldMutex( ULONG nCount );
+    virtual bool                CheckYieldMutex();
 
     virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
     virtual bool                AnyInput( USHORT nType );
-    virtual SalMenu*        CreateMenu( BOOL bMenuBar );
-    virtual void            DestroyMenu( SalMenu* pMenu);
-    virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData );
-    virtual void            DestroyMenuItem( SalMenuItem* pItem );
 
     virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     void                    FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h
index fa9f1309c8ca..d7d9334f281b 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/unx/inc/salobj.h
@@ -98,6 +98,7 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h
index fa68f1b38e73..6e6ca0a2f1cc 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/unx/inc/salprn.h
@@ -71,6 +71,7 @@ public:
     bool                    m_bFax:1;
     bool                    m_bPdf:1;
     bool                    m_bSwallowFaxNo:1;
+    bool                    m_bIsPDFWriterJob:1;
     PspGraphics*            m_pGraphics;
     psp::PrinterJob         m_aPrintJob;
     psp::JobData            m_aJobData;
@@ -91,6 +92,11 @@ public:
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
+    virtual BOOL                    StartJob( const String*,
+                                              const String&,
+                                              const String&,
+                                              ImplJobSetup*,
+                                              vcl::PrinterController& i_rController );
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
     virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx
index cbedede2cc99..e8620db29c6f 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/unx/inc/wmadaptor.hxx
@@ -165,6 +165,8 @@ protected:
     bool                    m_bLegacyPartialFullscreen;
     int                     m_nWinGravity;
     int                     m_nInitWinGravity;
+    bool                    m_bWMshouldSwitchWorkspace;
+    bool                    m_bWMshouldSwitchWorkspaceInit;
 
     WMAdaptor( SalDisplay * )
 ;
@@ -177,6 +179,7 @@ protected:
      */
     virtual bool isValid() const;
 
+    bool getWMshouldSwitchWorkspace() const;
 public:
     virtual ~WMAdaptor();
 
@@ -214,8 +217,9 @@ public:
 
     /*
      * attemp to switch the desktop to a certain workarea
+     * if bConsiderWM is true, then on some WMs the call will not result in any action
      */
-    void switchToWorkArea( int nWorkArea ) const;
+    void switchToWorkArea( int nWorkArea, bool bConsiderWM = true ) const;
 
     /*
      *  sets window title
diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx
deleted file mode 100644
index 4041ed7ce67d..000000000000
--- a/vcl/unx/inc/xfont.hxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef EXTENDED_FONTSTRUCT_HXX
-#define EXTENDED_FONTSTRUCT_HXX
-
-#ifndef _XLIB_H_
-#include <tools/prex.h>
-#include <X11/Xlib.h>
-#include <tools/postx.h>
-#endif
-#include <tools/ref.hxx>
-#include <rtl/tencinfo.h>
-#include <vcl/vclenum.hxx>
-#include <vcl/sallayout.hxx>
-
-typedef unsigned short sal_MultiByte;
-
-class ImplFontMetricData;
-class ExtendedXlfd;
-
-struct VerticalTextItem
-{
-    BOOL                mbFixed;
-    XFontStruct*        mpXFontStruct;
-    const sal_Unicode*  mpString;
-    int                 mnLength;
-    int                 mnTransX;
-    int                 mnTransY;
-    int                 mnFixedAdvance;
-    int*                mpAdvanceAry;
-
-    VerticalTextItem( XFontStruct* pXFontStruct,
-                        const sal_Unicode* pString,
-                        int nLength,
-                        int nTransX,
-                        int nTransY,
-                        int nFixedAdvance )
-      : mbFixed( TRUE ),
-        mpXFontStruct( pXFontStruct ),
-        mpString( pString ),
-        mnLength( nLength ),
-        mnTransX( nTransX ),
-        mnTransY( nTransY ),
-        mnFixedAdvance( nFixedAdvance )
-    {}
-
-    VerticalTextItem( XFontStruct* pXFontStruct,
-                        const sal_Unicode* pString,
-                        int nLength,
-                        int nTransX,
-                        int nTransY,
-                        int* pAdvanceAry )
-      : mbFixed( FALSE ),
-        mpXFontStruct( pXFontStruct ),
-        mpString( pString ),
-        mnLength( nLength ),
-        mnTransX( nTransX ),
-        mnTransY( nTransY ),
-        mpAdvanceAry( pAdvanceAry )
-    {}
-
-    ~VerticalTextItem()
-    {
-        if (!mbFixed)
-        {
-            delete( mpAdvanceAry );
-        }
-    }
-};
-
-class ExtendedFontStruct : public SvRefBase
-{
-    private:
-        Display*            mpDisplay;
-        Size                maPixelSize;
-        float               mfXScale;
-        float               mfYScale;
-        sal_Size            mnDefaultWidth;
-        sal_Bool            mbVertical;
-        rtl_TextEncoding    mnCachedEncoding;
-        rtl_TextEncoding    mnAsciiEncoding;
-
-        ExtendedXlfd*       mpXlfd;
-        XFontStruct**       mpXFontStruct;
-
-        // unicode range cache
-        mutable sal_uInt32* mpRangeCodes;
-        mutable int         mnRangeCount;
-
-        int                 LoadEncoding( rtl_TextEncoding nEncoding );
-        FontPitch           GetSpacing( rtl_TextEncoding nEncoding );
-        bool                GetFontBoundingBox( XCharStruct *pCharStruct,
-                                    int *pAscent, int *pDescent ) ;
-
-        sal_Size            GetDefaultWidth();
-        sal_Size            GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo,
-                                    sal_Int32 *pWidthArray,
-                                    rtl_TextEncoding nEncoding );
-        sal_Size            GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo,
-                                    sal_Int32 *pWidthArray );
-        sal_Size            GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo,
-                                    sal_Int32 *pWidthArray, ExtendedFontStruct *pFallback );
-    public:
-                            ExtendedFontStruct( Display* pDisplay,
-                                    const Size& rPixelSize, sal_Bool bVertical,
-                                    ExtendedXlfd* pXlfd );
-                            ~ExtendedFontStruct();
-        bool                Match( const ExtendedXlfd *pXlfd,
-                                    const Size& rPixelSize, sal_Bool bVertical ) const;
-        XFontStruct*        GetFontStruct( rtl_TextEncoding nEncoding );
-        XFontStruct*        GetFontStruct( sal_Unicode nChar,
-                                    rtl_TextEncoding *pEncoding );
-        bool                ToImplFontMetricData( ImplFontMetricData *pMetric );
-        rtl_TextEncoding    GetAsciiEncoding( int *pAsciiRange = NULL ) const;
-        sal_Size            GetCharWidth( sal_Unicode,
-                                    sal_Int32* pPhysWidth, sal_Int32* pLogWidth );
-        int                 GetFontCodeRanges( sal_uInt32* pCodePairs ) const;
-        bool                HasUnicodeChar( sal_Unicode ) const;
-};
-
-// Declaration and Implementation for ExtendedFontStructRef: Add RefCounting
-// to ExtendedFontStruct (it's not possible to separate decl and impl into
-// a separate source file: all ref member functions are inline
-SV_DECL_IMPL_REF( ExtendedFontStruct );
-
-class X11FontLayout : public GenericSalLayout
-{
-public:
-                    X11FontLayout( ExtendedFontStruct& );
-    virtual bool    LayoutText( ImplLayoutArgs& );
-    virtual void    AdjustLayout( ImplLayoutArgs& );
-    virtual void    DrawText( SalGraphics& ) const;
-
-private:
-    ExtendedFontStruct& mrFont;
-};
-
-#endif /* EXTENDED_FONTSTRUCT_HXX */