Merge branch 'master' into feature/gnumake4

11 files changed, 130 insertions, 129 deletions

diff --git a/vcl/inc/aqua/salconst.h b/vcl/inc/aqua/salconst.h
index 50971a819c09..87bdbf42d5e0 100644
--- a/vcl/inc/aqua/salconst.h
+++ b/vcl/inc/aqua/salconst.h
@@ -33,23 +33,6 @@
 // - Constants -
 // -------------------
 
-static const unsigned short kByteMask = 0xFF;
-
-static const unsigned short kOneByte  =  8;
-static const unsigned short kTwoBytes = 16;
-
-static const unsigned short kOneBit     =  1;
-static const unsigned short kFiveBits   =  5;
-static const unsigned short kEightBits  =  8;
-static const unsigned short kTenBits    = 10;
-static const unsigned short kElevenBits = 11;
-
-static const unsigned short kBlackAndWhite  =  1;
-static const unsigned short kFourBitColor   =  4;
-static const unsigned short kEightBitColor  =  8;
-static const unsigned short kThousandsColor = 16;
-static const unsigned short kTrueColor      = 32;
-
 static const unsigned long k16BitRedColorMask   = 0x00007c00;
 static const unsigned long k16BitGreenColorMask = 0x000003e0;
 static const unsigned long k16BitBlueColorMask  = 0x0000001f;
@@ -58,14 +41,6 @@ static const unsigned long k32BitRedColorMask   = 0x00ff0000;
 static const unsigned long k32BitGreenColorMask = 0x0000ff00;
 static const unsigned long k32BitBlueColorMask  = 0x000000ff;
 
-static const unsigned short kPixMapCmpSizeOneBit    =  1;
-static const unsigned short kPixMapCmpSizeFourBits  =  4;
-static const unsigned short kPixMapCmpSizeFiveBits  =  5;
-static const unsigned short kPixMapCmpSizeEightBits =  8;
-
-static const long kPixMapHRes = 72;
-static const long kPixMapVRes = 72;
-
 #endif // _SV_SALCONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index 42f90672f87b..6cd958d0cb11 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -71,9 +71,7 @@ public:
     /*virtual*/                 ~GlyphCache();
 
     static GlyphCache&      GetInstance();
-    void                        LoadFonts();
 
-    void                        ClearFontPath();
     void                        AddFontPath( const String& rFontPath );
     void                        AddFontFile( const rtl::OString& rNormalizedName,
                                     int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&,
@@ -96,7 +94,6 @@ private:
     void                        GrowNotify();
 
 private:
-    sal_uLong                       CalcByteCount() const;
     void                        GarbageCollect();
 
     // the GlyphCache's FontList matches a font request to a serverfont instance
diff --git a/vcl/inc/ios/iosvcltypes.h b/vcl/inc/ios/iosvcltypes.h
index 820547b6a013..d0ef03b9e640 100644
--- a/vcl/inc/ios/iosvcltypes.h
+++ b/vcl/inc/ios/iosvcltypes.h
@@ -29,6 +29,7 @@
 #define _IOSVCLTYPES_H
 
 #include "premac.h"
+#import <CoreText/CoreText.h>
 #import <UIKit/UIKit.h>
 #include "postmac.h"
 
diff --git a/vcl/inc/unx/cdeint.hxx b/vcl/inc/ios/salconst.h
index c2b7d578b137..87bdbf42d5e0 100644
--- a/vcl/inc/unx/cdeint.hxx
+++ b/vcl/inc/ios/salconst.h
@@ -25,23 +25,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SV_CDEINT_HXX
-#define _SV_CDEINT_HXX
 
-#include <unx/dtint.hxx>
+#ifndef _SV_SALCONST_H
+#define _SV_SALCONST_H
 
-class CDEIntegrator : public DtIntegrator
-{
-    friend DtIntegrator* DtIntegrator::CreateDtIntegrator();
-private:
-    CDEIntegrator();
+// -------------------
+// - Constants -
+// -------------------
 
-public:
-    virtual ~CDEIntegrator();
+static const unsigned long k16BitRedColorMask   = 0x00007c00;
+static const unsigned long k16BitGreenColorMask = 0x000003e0;
+static const unsigned long k16BitBlueColorMask  = 0x0000001f;
 
-    virtual void GetSystemLook( AllSettings& rSettings );
-};
+static const unsigned long k32BitRedColorMask   = 0x00ff0000;
+static const unsigned long k32BitGreenColorMask = 0x0000ff00;
+static const unsigned long k32BitBlueColorMask  = 0x000000ff;
 
-#endif
+#endif // _SV_SALCONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/dtint.hxx b/vcl/inc/ios/salctfontutils.hxx
index 010a0417d89b..e3f92165086c 100644
--- a/vcl/inc/unx/dtint.hxx
+++ b/vcl/inc/ios/salctfontutils.hxx
@@ -25,50 +25,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SV_DTINT_HXX
-#define _SV_DTINT_HXX
 
-#include <tools/link.hxx>
-#include <tools/string.hxx>
-#include <tools/color.hxx>
-#include <vcl/font.hxx>
-#include "svunx.h"
+#ifndef _SV_SALCGFONTUTILS_HXX
+#define _SV_SALCGFONTUTILS_HXX
 
-class SalBitmap;
-class SalDisplay;
-class AllSettings;
+class ImplIosFontData;
+class ImplDevFontList;
 
-enum DtType {
-    DtGeneric,
-    DtCDE
-};
-
-class DtIntegrator
-{
-protected:
-    DtType              meType;
-    Display*            mpDisplay;
-    SalDisplay*         mpSalDisplay;
-    int                 mnSystemLookCommandProcess;
+#include <CoreText/CoreText.h>
 
+#include <map>
 
-    DtIntegrator();
-
-    static String           aHomeDir;
-
+/* This class has the responsibility of assembling a list of fonts
+   available on the system and enabling access to that list.
+ */
+class SystemFontList
+{
 public:
-    static DtIntegrator* CreateDtIntegrator();
+    SystemFontList();
+    ~SystemFontList();
 
-    virtual ~DtIntegrator();
+    void AnnounceFonts( ImplDevFontList& ) const;
+    ImplIosFontData* GetFontDataFromFont( CGFontRef ) const;
 
-    // SystemLook
-    virtual void GetSystemLook( AllSettings& rSettings );
+private:
+    typedef boost::unordered_map<CGFontRef,ImplIosFontData*> IosFontContainer;
+    IosFontContainer maFontContainer;
 
-    DtType          GetDtType() { return meType; }
-    SalDisplay*     GetSalDisplay() { return mpSalDisplay; }
-    Display*        GetDisplay() { return mpDisplay; }
+    void InitGlyphFallbacks();
 };
 
-#endif
+#endif  // _SV_SALCGFONTUTILS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 51ef49219e9a..0c3e591b3d98 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -49,7 +49,7 @@ class CGRect;
 class ImplIosFontData : public ImplFontData
 {
 public:
-    ImplIosFontData( const ImplDevFontAttributes&, NSString * );
+    ImplIosFontData( const ImplDevFontAttributes&, CTFontRef );
 
     virtual ~ImplIosFontData();
 
@@ -65,6 +65,10 @@ public:
     void                    ReadIosCmapEncoding() const;
     bool                    HasCJKSupport() const;
 
+protected:
+    friend class IosSalGraphics;
+    const CTFontRef             mpFontRef;
+
 private:
     mutable const ImplFontCharMap*  mpCharMap;
     mutable vcl::FontCapabilities maFontCapabilities;
@@ -120,7 +124,13 @@ protected:
     RGBAColor                               maFillColor;
 
     // Device Font settings
-     const ImplIosFontData*                  mpIosFontData;
+    const ImplIosFontData*                  mpIosFontData;
+    /// Font attributes ???
+    NSMutableDictionary*                    mpAttributes;
+    // text color
+    SalColor                                mnColor;
+    /// text rotation ???
+    Fixed                                   mnRotation;
     /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
     float                                   mfFontStretch;
     /// allows text to be rendered without antialiasing
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 825c148cfa1f..8c2d732f7a07 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -57,7 +57,6 @@ typedef unsigned int pthread_t;
 class VCLPLUG_GEN_PUBLIC X11SalData : public SalData
 {
 protected:
-            sal_Bool                bNoExceptions_;
             SalXLib            *pXLib_;
             SalDisplay         *m_pSalDisplay;
             pthread_t           hMainThread_;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 194e050df2b0..5f0bc8c11f5f 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -55,7 +55,6 @@ class   SalFrame;
 class   ColorMask;
 
 namespace vcl_sal { class WMAdaptor; }
-class DtIntegrator;
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #define PROPERTY_SUPPORT_WM_SetPos              0x00000001
@@ -375,7 +374,6 @@ protected:
     rtl::OString m_aKeyboardName;
 
     vcl_sal::WMAdaptor* m_pWMAdaptor;
-    DtIntegrator*       m_pDtIntegrator;
 
     bool            m_bXinerama;
     std::vector< Rectangle > m_aXineramaScreens;
@@ -497,7 +495,6 @@ public:
     { mpKbdExtension = pKbdExtension; }
     const char* GetKeyboardName( bool bRefresh = false );
     ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
-    DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; }
     bool            IsXinerama() const { return m_bXinerama; }
     const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
     XLIB_Window     GetRootWindow( int nScreen ) const
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index dc0fe65f290b..5848c6549c46 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -323,12 +323,6 @@ public:
     Atom getAtom( WMAtom eAtom ) const
     { return m_aWMAtoms[ eAtom ]; }
 
-    /*
-     * supports correct positioning
-     */
-
-    virtual bool supportsICCCMPos () const;
-
     int getPositionWinGravity () const
     { return m_nWinGravity; }
     int getInitWinGravity() const
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index c6f5dd8043fe..6e51a8a2440e 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -59,45 +59,82 @@ public:
                             ~AlphaMask();
 
     AlphaMask&              operator=( const Bitmap& rBitmap );
-    AlphaMask&              operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
-    sal_Bool                    operator!() const { return Bitmap::operator!(); }
-    sal_Bool                    operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
-    sal_Bool                    operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }
-
-    const MapMode&          GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }
-    void                    SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
-
-    const Size&             GetPrefSize() const { return Bitmap::GetPrefSize(); }
-    void                    SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }
-
-    Size                    GetSizePixel() const { return Bitmap::GetSizePixel(); }
-    void                    SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
-
-    sal_uLong                   GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
-    sal_uLong                   GetChecksum() const { return Bitmap::GetChecksum(); }
+    AlphaMask&              operator=( const AlphaMask& rAlphaMask )
+                            {
+                                return (AlphaMask&) Bitmap::operator=( rAlphaMask );
+                            }
+    sal_Bool                operator!() const
+                            {
+                                return Bitmap::operator!();
+                            }
+    sal_Bool                operator==( const AlphaMask& rAlphaMask ) const
+                            {
+                                return Bitmap::operator==( rAlphaMask );
+                            }
+    sal_Bool                operator!=( const AlphaMask& rAlphaMask ) const
+                            {
+                                return Bitmap::operator!=( rAlphaMask );
+                            }
+
+    const MapMode&          GetPrefMapMode() const
+                            {
+                                return Bitmap::GetPrefMapMode();
+                            }
+    void                    SetPrefMapMode( const MapMode& rMapMode )
+                            {
+                                Bitmap::SetPrefMapMode( rMapMode );
+                            }
+
+    const Size&             GetPrefSize() const
+                            {
+                                return Bitmap::GetPrefSize();
+                            }
+    void                    SetPrefSize( const Size& rSize )
+                            {
+                                Bitmap::SetPrefSize( rSize );
+                            }
+
+    Size                    GetSizePixel() const
+                            {
+                                return Bitmap::GetSizePixel();
+                            }
+    void                    SetSizePixel( const Size& rNewSize )
+                            {
+                                Bitmap::SetSizePixel( rNewSize );
+                            }
+
+    sal_uLong               GetSizeBytes() const
+                            {
+                                return Bitmap::GetSizeBytes();
+                            }
+    sal_uLong               GetChecksum() const
+                            {
+                                return Bitmap::GetChecksum();
+                            }
 
     Bitmap                  GetBitmap() const;
 
-public:
-
-    sal_Bool                    Crop( const Rectangle& rRectPixel );
-    sal_Bool                    Expand( sal_uLong nDX, sal_uLong nDY, sal_uInt8* pInitTransparency = NULL );
-    sal_Bool                    CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL );
-    sal_Bool                    Erase( sal_uInt8 cTransparency );
-    sal_Bool                    Invert();
-    sal_Bool                    Mirror( sal_uLong nMirrorFlags );
-    sal_Bool                    Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FAST );
-    sal_Bool                    Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST );
-    sal_Bool                    Rotate( long nAngle10, sal_uInt8 cFillTransparency );
-    sal_Bool                    Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency );
-    sal_Bool                    Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol = 0UL );
-    sal_Bool                    Replace( sal_uInt8* pSearchTransparencies, sal_uInt8* pReplaceTransparencies,
-                                     sal_uLong nColorCount, sal_uLong* pTols = NULL );
-
-public:
-
-    BitmapReadAccess*       AcquireReadAccess() { return Bitmap::AcquireReadAccess(); }
-    BitmapWriteAccess*      AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); }
+    sal_Bool                CopyPixel(
+                                const Rectangle& rRectDst,
+                                const Rectangle& rRectSrc,
+                                const AlphaMask* pAlphaSrc = NULL
+                            );
+    sal_Bool                Erase( sal_uInt8 cTransparency );
+    sal_Bool                Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency );
+    sal_Bool                Replace(
+                                sal_uInt8 cSearchTransparency,
+                                sal_uInt8 cReplaceTransparency,
+                                sal_uLong nTol = 0UL
+                            );
+
+    BitmapReadAccess*       AcquireReadAccess()
+                            {
+                                return Bitmap::AcquireReadAccess();
+                            }
+    BitmapWriteAccess*      AcquireWriteAccess()
+                            {
+                                return Bitmap::AcquireWriteAccess();
+                            }
     void                    ReleaseAccess( BitmapReadAccess* pAccess );
 
     typedef vcl::ScopedBitmapAccess< BitmapReadAccess, AlphaMask, &AlphaMask::AcquireReadAccess >
@@ -105,10 +142,18 @@ public:
     typedef vcl::ScopedBitmapAccess< BitmapWriteAccess, AlphaMask, &AlphaMask::AcquireWriteAccess >
         ScopedWriteAccess;
 
-public:
-
-    sal_Bool                    Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True ) { return Bitmap::Read( rIStm, bFileHeader ); }
-    sal_Bool                    Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
+    sal_Bool                Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True )
+                            {
+                                return Bitmap::Read( rIStm, bFileHeader );
+                            }
+    sal_Bool                Write(
+                                SvStream& rOStm,
+                                sal_Bool bCompressed = sal_True,
+                                sal_Bool bFileHeader = sal_True
+                            ) const
+                            {
+                                return Bitmap::Write( rOStm, bCompressed, bFileHeader );
+                            }
 
     friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
     friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index b233a3c07c03..2c85dbb7de23 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -382,8 +382,6 @@ public:
 
     static void                 SetDialogScaleX( short nScale );
 
-    static const String&        GetFontPath();
-
     static UniqueItemId         CreateUniqueId();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > GetDisplayConnection();