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

13 files changed, 20 insertions, 449 deletions

diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 82fa925097ee..c2b84a8e94a7 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -37,8 +37,10 @@
 #include "gcach_ftyp.hxx"
 
 #include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/impfont.hxx"
+
+#include "outfont.hxx"
+#include "impfont.hxx"
+
 #ifdef ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #include "vcl/graphite_layout.hxx"
@@ -46,7 +48,7 @@
 
 #include "tools/poly.hxx"
 #include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
 #include "basegfx/polygon/b2dpolypolygon.hxx"
 
 #include "osl/file.hxx"
diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx
index 6b461fe59143..9cbe49cd495e 100644
--- a/vcl/source/glyphs/gcach_ftyp.hxx
+++ b/vcl/source/glyphs/gcach_ftyp.hxx
@@ -29,7 +29,7 @@
 #ifndef _SV_GCACHFTYP_HXX
 #define _SV_GCACHFTYP_HXX
 
-#include <vcl/glyphcache.hxx>
+#include <glyphcache.hxx>
 #include <rtl/textcvt.h>
 
 #include <ft2build.h>
diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx
index 63a332869664..e5624b2910c1 100644
--- a/vcl/source/glyphs/gcach_layout.cxx
+++ b/vcl/source/glyphs/gcach_layout.cxx
@@ -31,8 +31,8 @@
 
 #define ENABLE_ICU_LAYOUT
 #include <gcach_ftyp.hxx>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx
index 161e4c6314e7..71784f5dd083 100644
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/glyphcache.hxx>
+#include <glyphcache.hxx>
 #include <string.h>
 
 //------------------------------------------------------------------------
diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx
deleted file mode 100644
index 944d9aee16a3..000000000000
--- a/vcl/source/glyphs/gcach_vdev.cxx
+++ /dev/null
@@ -1,290 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
-#include <gcach_vdev.hxx>
-
-#include <vcl/svapp.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/metric.hxx>
-
-// =======================================================================
-// VirtDevServerFont
-// =======================================================================
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::AnnounceFonts( ImplDevFontList* pToAdd )
-{
-    // TODO: get fonts on server but not on client,
-    // problem is that currently there is no serverside virtual device...
-    VirtualDevice vdev( 1 );
-    long nCount = vdev.GetDevFontCount();
-
-    for( int i = 0; i < nCount; ++i )
-    {
-        const FontInfo aFontInfo = vdev.GetDevFont( i );
-
-        ImplFontData& rData = *new ImplFontData;
-        rData.SetSysData( new FontSysData( (void*)SERVERFONT_MAGIC ) );
-
-        rData.maName        = aFontInfo.GetName();
-        rData.maStyleName   = aFontInfo.GetStyleName();
-        rData.mnWidth       = aFontInfo.GetWidth();
-        rData.mnHeight      = aFontInfo.GetHeight();
-        rData.meFamily      = aFontInfo.GetFamily();
-        rData.meCharSet     = aFontInfo.GetCharSet();
-        rData.mePitch       = aFontInfo.GetPitch();
-        rData.meWidthType   = aFontInfo.GetWidthType();
-        rData.meWeight      = aFontInfo.GetWeight();
-        rData.meItalic      = aFontInfo.GetItalic();
-        rData.meType        = aFontInfo.GetType();
-        rData.meFamily      = aFontInfo.GetFamily();
-
-        rData.mbOrientation = true;         // TODO: where to get this info?
-        rData.mbDevice      = false;
-        rData.mnQuality     = 0;            // prefer client-side fonts if available
-
-        pToAdd->Add( &rData );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::ClearFontList()
-{
-    // TODO
-}
-
-// -----------------------------------------------------------------------
-
-VirtDevServerFont* VirtDevServerFont::CreateFont( const ImplFontSelectData& rFSD )
-{
-    VirtDevServerFont* pServerFont = NULL;
-    // TODO: search list of VirtDevServerFonts, return NULL if not found
-    // pServerFont = new VirtDevServerFont( rFSD );
-    return pServerFont;
-}
-
-// -----------------------------------------------------------------------
-
-VirtDevServerFont::VirtDevServerFont( const ImplFontSelectData& rFSD )
-:   ServerFont( rFSD)
-{}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
-{
-    const ImplFontSelectData& aFSD = GetFontSelData();
-
-    Font aFont;
-    aFont.SetName       ( aFSD.maName );
-    aFont.SetStyleName  ( aFSD.maStyleName );
-    aFont.SetHeight     ( aFSD.mnHeight );
-    aFont.SetWidth      ( aFSD.mnWidth );
-    aFont.SetOrientation( aFSD.mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    FontMetric aMetric( vdev.GetFontMetric( aFont ) );
-
-    rFactor = 0x100;
-
-    rTo.mnAscent        = aMetric.GetAscent();
-    rTo.mnDescent       = aMetric.GetDescent();
-    rTo.mnIntLeading    = aMetric.GetIntLeading();
-    rTo.mnExtLeading    = aMetric.GetExtLeading();
-    rTo.mnSlant     = aMetric.GetSlant();
-    rTo.meType      = aMetric.GetType();
-    rTo.mnFirstChar     = 0x0020;   // TODO: where to get this info?
-    rTo.mnLastChar      = 0xFFFE;   // TODO: where to get this info?
-
-    rTo.mnWidth         = aFSD.mnWidth;
-    rTo.maName          = aFSD.maName;
-    rTo.maStyleName     = aFSD.maStyleName;
-    rTo.mnOrientation   = aFSD.mnOrientation;
-    rTo.meFamily        = aFSD.meFamily;
-    rTo.meCharSet       = aFSD.meCharSet;
-    rTo.meWeight        = aFSD.meWeight;
-    rTo.meItalic        = aFSD.meItalic;
-    rTo.mePitch         = aFSD.mePitch;
-    rTo.mbDevice        = sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-int VirtDevServerFont::GetGlyphIndex( sal_Unicode aChar ) const
-{
-    return aChar;
-}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
-{
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    // get glyph metrics
-    sal_Int32 nCharWidth = 10;
-// TODO:    vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth );
-    rGD.SetCharWidth( nCharWidth );
-
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-    Rectangle aRect;
-    if( vdev.GetTextBoundRect( aRect, aGlyphStr, 0, 1 ) )
-    {
-        rGD.SetOffset( aRect.Top(), aRect.Left() );
-        rGD.SetDelta( vdev.GetTextWidth( nGlyphIndex ), 0 );
-        rGD.SetSize( aRect.GetSize() );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetAntialiasAdvice( void ) const
-{
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const
-{
-    /*
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-
-    // draw bitmap
-    vdev.SetOutputSizePixel( aSize, sal_True );
-    vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), aGlyphStr );
-
-    // create new glyph item
-
-    const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize );
-    rGD.SetBitmap( new Bitmap( rBitmap ) );
-    return true;
-    */
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool     VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const
-{
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-int VirtDevServerFont::GetGlyphKernValue( int, int ) const
-{
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uLong VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const
-{
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    sal_uLong nPairs = vdev.GetKerningPairCount();
-    if( nPairs > 0 )
-    {
-        KerningPair* const pKernPairs = new KerningPair[ nPairs ];
-        vdev.GetKerningPairs( nPairs, pKernPairs );
-
-        *ppImplKernPairs = new ImplKernPairData[ nPairs ];
-        ImplKernPairData* pTo = *ppImplKernPairs;
-        KerningPair* pFrom = pKernPairs;
-        for ( sal_uLong n = 0; n < nPairs; n++ )
-        {
-            pTo->mnChar1    = pFrom->nChar1;
-            pTo->mnChar2    = pFrom->nChar2;
-            pTo->mnKern     = pFrom->nKern;
-            ++pFrom;
-            ++pTo;
-        }
-
-        delete[] pKernPairs;
-    }
-
-    return nPairs;
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const
-{
-    return false;
-    /*
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    const bool bOptimize = true;
-
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-    return vdev.GetTextOutline( rPolyPoly, aGlyphStr, 0, 1, bOptimize );
-    */
-}
-
-// =======================================================================
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx
deleted file mode 100644
index 61cd02b1f9cc..000000000000
--- a/vcl/source/glyphs/gcach_vdev.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-#include <vcl/glyphcache.hxx>
-
-// -----------------------------------------------------------------------
-
-class VirtDevServerFont : public ServerFont
-{
-public:
-    virtual bool                GetAntialiasAdvice( void ) const;
-    virtual bool                GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
-
-protected:
-    friend class GlyphCache;
-    static void                 AnnounceFonts( ImplDevFontList* );
-    static void                 ClearFontList();
-
-    static VirtDevServerFont*   CreateFont( const ImplFontSelectData& );
-    virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
-    virtual sal_uLong               GetKernPairs( ImplKernPairData** ) const;
-    virtual int                 GetGlyphKernValue( int, int ) const;
-
-    virtual int                 GetGlyphIndex( sal_Unicode ) const;
-    virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const;
-
-private:
-                                VirtDevServerFont( const ImplFontSelectData& );
-};
-
-// -----------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index ab56853dcf65..54e946dc3831 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -32,15 +32,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <vcl/salbtype.hxx>
+
 #include <gcach_ftyp.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/outfont.hxx>
+#include <vcl/salbtype.hxx>
+
+#include <outfont.hxx>
 
 #ifdef ENABLE_GRAPHITE
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 #endif
 
 #include <rtl/ustring.hxx>      // used only for string=>hashvalue
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 175656e25515..1db4a50564bd 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -40,7 +40,7 @@
 #include <windows.h>
 #endif
 
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 
 using namespace grutils;
 // These mustn't conflict with font name lists which use ; and ,
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index ab5b59025724..b43a57b93392 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -54,8 +54,9 @@
 
 // Platform
 #include <svsys.h>
+#include <graphite_adaptors.hxx>
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 #include <unicode/uchar.h>
 #include <unicode/ubidi.h>
diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx
index ec1388d9bb29..4ce0ebcc3f31 100644
--- a/vcl/source/glyphs/graphite_serverfont.cxx
+++ b/vcl/source/glyphs/graphite_serverfont.cxx
@@ -37,13 +37,12 @@
 
 // Platform
 #include <i18npool/mslangid.hxx>
-#include <vcl/sallayout.hxx>
 // Module
 #include "gcach_ftyp.hxx"
 #include <vcl/glyphcache.hxx>
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 //#include "graphite_textsrc.hxx"
-#include <vcl/graphite_serverfont.hxx>
+#include <graphite_serverfont.hxx>
 
 #ifndef WNT
 
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx
index 33508ae34712..0758c10564c6 100644
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ b/vcl/source/glyphs/graphite_textsrc.cxx
@@ -38,7 +38,7 @@
 #include <string>
 #include <cassert>
 #include "graphite_textsrc.hxx"
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 
 // class TextSourceAdaptor implementation.
 //
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index b5251cff2922..f40f6052725d 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -44,9 +44,6 @@
 #include <windows.h>
 #endif
 
-#include <vcl/salgdi.hxx>
-
-#include <vcl/sallayout.hxx>
 
 // Module
 #include "vcl/dllapi.h"
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
deleted file mode 100644
index cbc9a38b4f9e..000000000000
--- a/vcl/source/glyphs/makefile.mk
+++ /dev/null
@@ -1,80 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=vcl
-TARGET=glyphs
-
-ENABLE_EXCEPTIONS=true
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-CFLAGS+= $(FREETYPE_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(USE_BUILTIN_RASTERIZER)" != ""
-# GlyphCache + FreeType support (only on UNX platforms currently)
-SLOFILES=\
-        $(SLO)$/glyphcache.obj		\
-        $(SLO)$/gcach_rbmp.obj		\
-        $(SLO)$/gcach_layout.obj	\
-        $(SLO)$/gcach_ftyp.obj
-
-.IF "$(ENABLE_GRAPHITE)" != ""
-# Graphite support using the glyphcache infrastructure
-CFLAGS+=-DENABLE_GRAPHITE
-SLOFILES+=\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_serverfont.obj	\
-        $(SLO)$/graphite_layout.obj
-
-.ENDIF
-
-.ELSE
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-# Graphite support on non-UNX platforms
-SLOFILES=\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_layout.obj
-
-.IF "$(SYSTEM_GRAPHITE)" != "YES"
-CDEFS+=-DGR2_STATIC
-.ENDIF
-
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-