Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
	cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
	l10ntools/scripts/localize.pl
	l10ntools/source/directory.cxx
	l10ntools/source/srciter.cxx
	padmin/Executable_spadmin.bin.mk
	padmin/Library_spa.mk
	svtools/inc/svtools/filter.hxx
	svtools/inc/svtools/grfmgr.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/filter2.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winmtf.cxx
	svtools/source/filter/wmf/winmtf.hxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/grfmgr.cxx
	svtools/source/graphic/grfmgr2.cxx
	toolkit/source/controls/controlmodelcontainerbase.cxx
	toolkit/source/controls/unocontrol.cxx
	toolkit/source/helper/formpdfexport.cxx
	toolkit/source/helper/unowrapper.cxx
	vcl/Package_osx.mk
	vcl/aqua/source/app/salinst.cxx
	vcl/aqua/source/app/salsys.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/dtrans/test_aquacb.cxx
	vcl/aqua/source/res/makefile.mk
	vcl/aqua/source/window/salframe.cxx
	vcl/aqua/source/window/salframeview.mm
	vcl/inc/aqua/salgdi.h
	vcl/inc/aqua/salinst.h
	vcl/inc/graphite_adaptors.hxx
	vcl/inc/graphite_cache.hxx
	vcl/inc/graphite_serverfont.hxx
	vcl/inc/impprn.hxx
	vcl/inc/svdata.hxx
	vcl/inc/unx/i18n_status.hxx
	vcl/inc/unx/saldata.hxx
	vcl/inc/unx/salfont.h
	vcl/inc/unx/salinst.h
	vcl/inc/unx/salprn.h
	vcl/inc/unx/salsys.h
	vcl/inc/unx/sm.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/graph.hxx
	vcl/inc/vcl/outdev.hxx
	vcl/inc/vcl/polyscan.hxx
	vcl/inc/vcl/svcompat.hxx
	vcl/inc/vcl/svgread.hxx
	vcl/inc/vcl/unobrok.hxx
	vcl/inc/win/salgdi.h
	vcl/inc/win/wincomp.hxx
	vcl/prj/d.lst
	vcl/source/app/dbggui.cxx
	vcl/source/app/idlemgr.cxx
	vcl/source/app/makefile.mk
	vcl/source/app/settings.cxx
	vcl/source/app/sound.cxx
	vcl/source/app/stdtext.cxx
	vcl/source/app/svapp.cxx
	vcl/source/app/svdata.cxx
	vcl/source/app/svmain.cxx
	vcl/source/app/timer.cxx
	vcl/source/app/unohelp.cxx
	vcl/source/components/dtranscomp.cxx
	vcl/source/control/button.cxx
	vcl/source/control/combobox.cxx
	vcl/source/control/ctrl.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/field2.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/cvtgrf.cxx
	vcl/source/gdi/font.cxx
	vcl/source/gdi/image.cxx
	vcl/source/gdi/imagerepository.cxx
	vcl/source/gdi/impbmp.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/jobset.cxx
	vcl/source/gdi/makefile.mk
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/outdev5.cxx
	vcl/source/gdi/outdev6.cxx
	vcl/source/gdi/outmap.cxx
	vcl/source/gdi/polyscan.cxx
	vcl/source/gdi/print.cxx
	vcl/source/gdi/print2.cxx
	vcl/source/gdi/region.cxx
	vcl/source/gdi/salgdilayout.cxx
	vcl/source/gdi/sallayout.cxx
	vcl/source/gdi/svcompat.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/gcach_vdev.cxx
	vcl/source/glyphs/gcach_vdev.hxx
	vcl/source/glyphs/graphite_adaptors.cxx
	vcl/source/glyphs/graphite_cache.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/glyphs/graphite_serverfont.cxx
	vcl/source/glyphs/graphite_textsrc.hxx
	vcl/source/glyphs/makefile.mk
	vcl/source/src/makefile.mk
	vcl/source/window/accel.cxx
	vcl/source/window/brdwin.cxx
	vcl/source/window/btndlg.cxx
	vcl/source/window/dialog.cxx
	vcl/source/window/dndevdis.cxx
	vcl/source/window/dockmgr.cxx
	vcl/source/window/dockwin.cxx
	vcl/source/window/floatwin.cxx
	vcl/source/window/introwin.cxx
	vcl/source/window/keycod.cxx
	vcl/source/window/menu.cxx
	vcl/source/window/msgbox.cxx
	vcl/source/window/scrwnd.cxx
	vcl/source/window/split.cxx
	vcl/source/window/splitwin.cxx
	vcl/source/window/status.cxx
	vcl/source/window/syswin.cxx
	vcl/source/window/tabpage.cxx
	vcl/source/window/toolbox.cxx
	vcl/source/window/toolbox2.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window2.cxx
	vcl/source/window/winproc.cxx
	vcl/source/window/wrkwin.cxx
	vcl/unx/generic/app/i18n_cb.cxx
	vcl/unx/generic/app/i18n_ic.cxx
	vcl/unx/generic/app/saldata.cxx
	vcl/unx/generic/app/saldisp.cxx
	vcl/unx/generic/app/salinst.cxx
	vcl/unx/generic/app/wmadaptor.cxx
	vcl/unx/generic/fontmanager/afm_hash.cpp
	vcl/unx/generic/gdi/salbmp.cxx
	vcl/unx/generic/gdi/salgdi3.cxx
	vcl/unx/generic/gdi/xrender_peer.cxx
	vcl/unx/generic/window/salframe.cxx
	vcl/unx/generic/window/salobj.cxx
	vcl/unx/gtk/a11y/makefile.mk
	vcl/unx/gtk/app/gtksys.cxx
	vcl/unx/gtk/app/makefile.mk
	vcl/unx/gtk/window/gtkframe.cxx
	vcl/unx/gtk/window/gtkobject.cxx
	vcl/unx/headless/svpinst.cxx
	vcl/unx/headless/svpinst.hxx
	vcl/unx/headless/svpprn.hxx
	vcl/unx/kde/kdedata.cxx
	vcl/unx/kde/salnativewidgets-kde.cxx
	vcl/unx/kde4/KDESalDisplay.hxx
	vcl/unx/kde4/KDEXLib.cxx
	vcl/unx/kde4/KDEXLib.hxx
	vcl/unx/kde4/VCLKDEApplication.cxx
	vcl/unx/kde4/makefile.mk
	vcl/unx/source/app/makefile.mk
	vcl/unx/source/fontmanager/makefile.mk
	vcl/unx/source/gdi/makefile.mk
	vcl/unx/source/inc/salcursors.h
	vcl/util/linksvp/makefile.mk
	vcl/win/source/app/saldata.cxx
	vcl/win/source/app/salinst.cxx
	vcl/win/source/app/salshl.cxx
	vcl/win/source/gdi/makefile.mk
	vcl/win/source/gdi/salbmp.cxx
	vcl/win/source/gdi/salgdi.cxx
	vcl/win/source/gdi/salgdi2.cxx
	vcl/win/source/gdi/salgdi3.cxx
	vcl/win/source/gdi/salgdi_gdiplus.cxx
	vcl/win/source/gdi/salprn.cxx
	vcl/win/source/gdi/salvd.cxx
	vcl/win/source/gdi/winlayout.cxx
	vcl/win/source/window/salframe.cxx
	vcl/win/source/window/salmenu.cxx
	vcl/win/source/window/salobj.cxx

1 files changed, 242 insertions, 0 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
new file mode 100644
index 000000000000..40355af21518
--- /dev/null
+++ b/vcl/inc/impfont.hxx
@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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 _SV_IMPFONT_HXX
+#define _SV_IMPFONT_HXX
+
+#include <tools/gen.hxx>
+#include <tools/string.hxx>
+#include <i18npool/lang.h>
+#include <tools/color.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/vclenum.hxx>
+#include <vcl/fntstyle.hxx>
+
+// ------------
+// - Impl_Font -
+// ------------
+
+class Impl_Font
+{
+public:
+             Impl_Font();
+             Impl_Font( const Impl_Font& );
+
+    bool     operator==( const Impl_Font& ) const;
+
+    FontPitch           GetPitch()      { if(mePitch==PITCH_DONTKNOW)    AskConfig(); return mePitch; }
+    FontFamily          GetFamily()     { if(meFamily==FAMILY_DONTKNOW)  AskConfig(); return meFamily; }
+    FontItalic          GetItalic()     { if(meItalic==ITALIC_DONTKNOW)  AskConfig(); return meItalic; }
+    FontWeight          GetWeight()     { if(meWeight==WEIGHT_DONTKNOW)  AskConfig(); return meWeight; }
+    FontWidth           GetWidthType()  { if(meWidthType==WIDTH_DONTKNOW)AskConfig(); return meWidthType; }
+
+private:
+    friend class Font;
+    void                AskConfig();
+
+    int                 mnRefCount;
+    String              maFamilyName;
+    String              maStyleName;
+    Size                maSize;
+    Color               maColor;        // compatibility, now on output device
+    Color               maFillColor;    // compatibility, now on output device
+    rtl_TextEncoding    meCharSet;
+    LanguageType        meLanguage;
+    LanguageType        meCJKLanguage;
+    FontFamily          meFamily;
+    FontPitch           mePitch;
+    TextAlign           meAlign;
+    FontWeight          meWeight;
+    FontWidth           meWidthType;
+    FontItalic          meItalic;
+    FontUnderline       meUnderline;
+    FontUnderline       meOverline;
+    FontStrikeout       meStrikeout;
+    FontRelief          meRelief;
+    FontEmphasisMark    meEmphasisMark;
+    FontType            meType;         // used by metrics only
+    short               mnOrientation;
+    FontKerning         mnKerning;
+    sal_Bool                mbWordLine:1,
+                        mbOutline:1,
+                        mbConfigLookup:1,   // there was a config lookup
+                        mbShadow:1,
+                        mbVertical:1,
+                        mbTransparent:1;    // compatibility, now on output device
+
+    friend SvStream&    operator>>( SvStream& rIStm, Impl_Font& );
+    friend SvStream&    operator<<( SvStream& rOStm, const Impl_Font& );
+};
+
+// ------------------
+// - ImplFontMetric -
+// ------------------
+
+class ImplFontMetric
+{
+    friend class OutputDevice;
+
+private:
+    long    mnAscent;      // Ascent
+    long    mnDescent;     // Descent
+    long    mnIntLeading;  // Internal Leading
+    long    mnExtLeading;  // External Leading
+    long    mnLineHeight;  // Ascent+Descent+EmphasisMark
+    long    mnSlant;       // Slant
+    sal_uInt16  mnMiscFlags;   // Misc Flags
+    sal_uInt32  mnRefCount;    // Reference Counter
+
+    enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 };
+
+public:
+            ImplFontMetric();
+    void    AddReference();
+    void    DeReference();
+
+    long    GetAscent() const       { return mnAscent; }
+    long    GetDescent() const      { return mnDescent; }
+    long    GetIntLeading() const   { return mnIntLeading; }
+    long    GetExtLeading() const   { return mnExtLeading; }
+    long    GetLineHeight() const   { return mnLineHeight; }
+    long    GetSlant() const        { return mnSlant; }
+
+    bool    IsDeviceFont() const    { return ((mnMiscFlags & DEVICE_FLAG) != 0); }
+    bool    IsScalable() const      { return ((mnMiscFlags & SCALABLE_FLAG) != 0); }
+    bool    SupportsLatin() const   { return ((mnMiscFlags & LATIN_FLAG) != 0); }
+    bool    SupportsCJK() const     { return ((mnMiscFlags & CJK_FLAG) != 0); }
+    bool    SupportsCTL() const     { return ((mnMiscFlags & CTL_FLAG) != 0); }
+
+    bool    operator==( const ImplFontMetric& ) const;
+};
+
+// ------------------
+// - ImplFontOptions -
+// ------------------
+
+class ImplFontOptions
+{
+public:
+    FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps should be used
+    FontAntiAlias      meAntiAlias;      // whether the font should be antialiased
+    FontAutoHint       meAutoHint;       // whether the font should be autohinted
+    FontHinting        meHinting;        // whether the font should be hinted
+    FontHintStyle      meHintStyle;      // type of font hinting to be used
+public:
+    ImplFontOptions() :
+        meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
+        meAntiAlias(ANTIALIAS_DONTKNOW),
+        meAutoHint(AUTOHINT_DONTKNOW),
+        meHinting(HINTING_DONTKNOW),
+        meHintStyle(HINT_SLIGHT)
+    {}
+    virtual ~ImplFontOptions()
+    {}
+    FontAutoHint GetUseAutoHint() const
+        { return meAutoHint; }
+    FontHintStyle GetHintStyle() const
+        { return meHintStyle; }
+    bool DontUseEmbeddedBitmaps() const
+        { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
+    bool DontUseAntiAlias() const
+        { return meAntiAlias == ANTIALIAS_FALSE; }
+    bool DontUseHinting() const
+        { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
+    virtual void *GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const
+        { return NULL; }
+};
+
+// -------------------
+// - ImplFontCharMap -
+// -------------------
+
+class CmapResult;
+
+class VCL_PLUGIN_PUBLIC ImplFontCharMap
+{
+public:
+    explicit             ImplFontCharMap( const CmapResult& );
+    virtual              ~ImplFontCharMap();
+
+    static ImplFontCharMap* GetDefaultMap( bool bSymbols=false);
+
+    bool                IsDefaultMap() const;
+    bool                HasChar( sal_uInt32 ) const;
+    int                 CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const;
+    int                 GetCharCount() const;
+
+    sal_uInt32          GetFirstChar() const;
+    sal_uInt32          GetLastChar() const;
+
+    sal_uInt32          GetNextChar( sal_uInt32 ) const;
+    sal_uInt32          GetPrevChar( sal_uInt32 ) const;
+
+    int                 GetIndexFromChar( sal_uInt32 ) const;
+    sal_uInt32          GetCharFromIndex( int ) const;
+
+    void                AddReference() const;
+    void                DeReference() const;
+
+    int                 GetGlyphIndex( sal_uInt32 ) const;
+
+private:
+    int                 ImplFindRangeIndex( sal_uInt32 ) const;
+
+    // prevent assignment and copy construction
+    explicit            ImplFontCharMap( const ImplFontCharMap& );
+    void                operator=( const ImplFontCharMap& );
+
+private:
+    const sal_uInt32*   mpRangeCodes;     // pairs of StartCode/(EndCode+1)
+    const int*          mpStartGlyphs;    // range-specific mapper to glyphs
+    const sal_uInt16*       mpGlyphIds;       // individual glyphid mappings
+    int                 mnRangeCount;
+    int                 mnCharCount;      // covered codepoints
+    mutable int         mnRefCount;
+};
+
+// CmapResult is a normalized version of the many CMAP formats
+class VCL_PLUGIN_PUBLIC CmapResult
+{
+public:
+    explicit    CmapResult( bool bSymbolic = false,
+                    const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0,
+                    const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL );
+
+    const sal_uInt32* mpRangeCodes;
+    const int*        mpStartGlyphs;
+    const sal_uInt16*     mpGlyphIds;
+    int               mnRangeCount;
+    bool              mbSymbolic;
+    bool              mbRecoded;
+};
+
+bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
+
+#endif // _SV_IMPFONT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */