merge with DEV300_m68

18 files changed, 82 insertions, 785 deletions

diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index f34db3a2a5db..c5f032dfff82 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -65,6 +65,7 @@ private:
     SAL_DLLPRIVATE         Dialog (const Dialog &);
     SAL_DLLPRIVATE         Dialog & operator= (const Dialog &);
 
+    DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
 protected:
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx
index 98bc27cbadba..7417342d95be 100644
--- a/vcl/inc/vcl/fldunit.hxx
+++ b/vcl/inc/vcl/fldunit.hxx
@@ -31,14 +31,6 @@
 #ifndef _VCL_FLDUNIT_HXX
 #define _VCL_FLDUNIT_HXX
 
-// --------------
-// - FieldTypes -
-// --------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
-                 FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
-                 FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
-                 FUNIT_PERCENT, FUNIT_100TH_MM };
+#include <tools/fldunit.hxx>
 
 #endif // _VCL_FLDUNIT_HXX
diff --git a/vcl/inc/vcl/fontcfg.hxx b/vcl/inc/vcl/fontcfg.hxx
deleted file mode 100644
index 76864f0cb40a..000000000000
--- a/vcl/inc/vcl/fontcfg.hxx
+++ /dev/null
@@ -1,232 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fontcfg.hxx,v $
- * $Revision: 1.3 $
- *
- * 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 _VCL_FONTCFG_HXX
-#define _VCL_FONTCFG_HXX
-
-#include "dllapi.h"
-#include <tools/string.hxx>
-#ifndef _VCL_ENUM_HXX
-#include <vcl/vclenum.hxx>
-#endif
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-#include <hash_map>
-#include <hash_set>
-#include <vector>
-
-namespace com {
-namespace sun {
-namespace star {
-namespace lang {
-
-// equality operator needed for hash_map;
-// (-> why does this need to be in the namespace of Locale ? g++ fails to compile else)
-inline bool operator==( const com::sun::star::lang::Locale& rLeft, const com::sun::star::lang::Locale& rRight )
-{
-    return
-        rLeft.Language.equals( rRight.Language ) &&
-        rLeft.Country.equals( rRight.Country )  &&
-        rLeft.Variant.equals( rRight.Variant )
-        ;
-}
-}}}}
-
-namespace vcl
-{
-
-struct LocaleHash
-{
-    size_t operator()( const com::sun::star::lang::Locale& rLocale ) const
-    {
-        return
-            (size_t)rLocale.Language.hashCode() ^
-            (size_t)rLocale.Country.hashCode()  ^
-            (size_t)rLocale.Variant.hashCode();
-    }
-};
-
-class DefaultFontConfiguration
-{
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-            m_xConfigProvider;
-    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
-            m_xConfigAccess;
-
-    struct LocaleAccess
-    {
-        // the real string used in the configuration
-        // used to get rid of upper/lower case problems
-        rtl::OUString aConfigLocaleString;
-        // xAccess is mutable to be able to be filled on demand
-        mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess;
-    };
-
-    std::hash_map< com::sun::star::lang::Locale,
-                   LocaleAccess,
-                   vcl::LocaleHash >
-            m_aConfig;
-
-    rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const;
-
-    DefaultFontConfiguration();
-    public:
-    ~DefaultFontConfiguration();
-
-    static DefaultFontConfiguration* get();
-
-    rtl::OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const;
-    rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const;
-};
-
-// IMPL_FONT_ATTR_DEFAULT       - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ...
-// IMPL_FONT_ATTR_STANDARD      - Standard-Font like Arial, Times, Courier, ...
-// IMPL_FONT_ATTR_NORMAL        - normal Font for writing text like Arial, Verdana, Arial Narrow, Trebuchet, Times, Courier, ...
-// IMPL_FONT_ATTR_SYMBOL        - Font with symbols
-// IMPL_FONT_ATTR_DECORATIVE    - Readable and normally used for drawings
-// IMPL_FONT_ATTR_SPECIAL       - very special design
-// IMPL_FONT_ATTR_TITLING       - only uppercase characters
-// IMPL_FONT_ATTR_FULL          - Font with normally all characters
-// IMPL_FONT_ATTR_CAPITALS     - only uppercase characters, but lowercase characters smaller as the uppercase characters
-// IMPL_FONT_ATTR_TYPEWRITER    - like a typewriter: Courier, ...
-// IMPL_FONT_ATTR_SCRIPT        - Handwriting or Script
-// IMPL_FONT_ATTR_HANDWRITING   - More Handwriting with normal letters
-// IMPL_FONT_ATTR_CHANCERY      - Like Zapf Chancery
-// IMPL_FONT_ATTR_COMIC         - Like Comic Sans MS
-// IMPL_FONT_ATTR_BRUSHSCRIPT   - More Script
-// IMPL_FONT_ATTR_OTHERSTYLE    - OldStyle, ... so negativ points
-#define IMPL_FONT_ATTR_DEFAULT       ((ULONG)0x00000001)
-#define IMPL_FONT_ATTR_STANDARD      ((ULONG)0x00000002)
-#define IMPL_FONT_ATTR_NORMAL        ((ULONG)0x00000004)
-#define IMPL_FONT_ATTR_SYMBOL        ((ULONG)0x00000008)
-#define IMPL_FONT_ATTR_FIXED         ((ULONG)0x00000010)
-#define IMPL_FONT_ATTR_SANSSERIF     ((ULONG)0x00000020)
-#define IMPL_FONT_ATTR_SERIF         ((ULONG)0x00000040)
-#define IMPL_FONT_ATTR_DECORATIVE    ((ULONG)0x00000080)
-#define IMPL_FONT_ATTR_SPECIAL       ((ULONG)0x00000100)
-#define IMPL_FONT_ATTR_ITALIC        ((ULONG)0x00000200)
-#define IMPL_FONT_ATTR_TITLING       ((ULONG)0x00000400)
-#define IMPL_FONT_ATTR_CAPITALS      ((ULONG)0x00000800)
-#define IMPL_FONT_ATTR_CJK           ((ULONG)0x00001000)
-#define IMPL_FONT_ATTR_CJK_JP        ((ULONG)0x00002000)
-#define IMPL_FONT_ATTR_CJK_SC        ((ULONG)0x00004000)
-#define IMPL_FONT_ATTR_CJK_TC        ((ULONG)0x00008000)
-#define IMPL_FONT_ATTR_CJK_KR        ((ULONG)0x00010000)
-#define IMPL_FONT_ATTR_CTL           ((ULONG)0x00020000)
-#define IMPL_FONT_ATTR_NONELATIN     ((ULONG)0x00040000)
-#define IMPL_FONT_ATTR_FULL          ((ULONG)0x00080000)
-#define IMPL_FONT_ATTR_OUTLINE       ((ULONG)0x00100000)
-#define IMPL_FONT_ATTR_SHADOW        ((ULONG)0x00200000)
-#define IMPL_FONT_ATTR_ROUNDED       ((ULONG)0x00400000)
-#define IMPL_FONT_ATTR_TYPEWRITER    ((ULONG)0x00800000)
-#define IMPL_FONT_ATTR_SCRIPT        ((ULONG)0x01000000)
-#define IMPL_FONT_ATTR_HANDWRITING   ((ULONG)0x02000000)
-#define IMPL_FONT_ATTR_CHANCERY      ((ULONG)0x04000000)
-#define IMPL_FONT_ATTR_COMIC         ((ULONG)0x08000000)
-#define IMPL_FONT_ATTR_BRUSHSCRIPT   ((ULONG)0x10000000)
-#define IMPL_FONT_ATTR_GOTHIC        ((ULONG)0x20000000)
-#define IMPL_FONT_ATTR_SCHOOLBOOK    ((ULONG)0x40000000)
-#define IMPL_FONT_ATTR_OTHERSTYLE    ((ULONG)0x80000000)
-
-#define IMPL_FONT_ATTR_CJK_ALLLANG   (IMPL_FONT_ATTR_CJK_JP | IMPL_FONT_ATTR_CJK_SC | IMPL_FONT_ATTR_CJK_TC | IMPL_FONT_ATTR_CJK_KR)
-#define IMPL_FONT_ATTR_ALLSCRIPT     (IMPL_FONT_ATTR_SCRIPT | IMPL_FONT_ATTR_HANDWRITING | IMPL_FONT_ATTR_CHANCERY | IMPL_FONT_ATTR_COMIC | IMPL_FONT_ATTR_BRUSHSCRIPT)
-#define IMPL_FONT_ATTR_ALLSUBSCRIPT  (IMPL_FONT_ATTR_HANDWRITING | IMPL_FONT_ATTR_CHANCERY | IMPL_FONT_ATTR_COMIC | IMPL_FONT_ATTR_BRUSHSCRIPT)
-#define IMPL_FONT_ATTR_ALLSERIFSTYLE (IMPL_FONT_ATTR_ALLSCRIPT |\
-                                      IMPL_FONT_ATTR_SANSSERIF | IMPL_FONT_ATTR_SERIF |\
-                                      IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_ITALIC |\
-                                      IMPL_FONT_ATTR_GOTHIC | IMPL_FONT_ATTR_SCHOOLBOOK |\
-                                      IMPL_FONT_ATTR_SHADOW | IMPL_FONT_ATTR_OUTLINE)
-
-struct FontNameAttr
-{
-    String                              Name;
-    ::std::vector< String >             Substitutions;
-    ::std::vector< String >             MSSubstitutions;
-    ::std::vector< String >             PSSubstitutions;
-    ::std::vector< String >             HTMLSubstitutions;
-    FontWeight                          Weight;
-    FontWidth                           Width;
-    unsigned long                       Type; // bitfield of IMPL_FONT_ATTR_*
-};
-
-class VCL_DLLPUBLIC FontSubstConfiguration
-{
-private:
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-            m_xConfigProvider;
-    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
-            m_xConfigAccess;
-    struct LocaleSubst
-    {
-        rtl::OUString                           aConfigLocaleString;
-        mutable bool                            bConfigRead;
-        // note: aSubstAttributes must be sorted alphabetically by Name
-        // searches on the substitutes are done with Name as key, where
-        // a minimal match is sufficient (that is e.g. "Thorndale" will match
-        // "Thorndale BlaBlub"). Also names must be lower case.
-        mutable std::vector< FontNameAttr >     aSubstAttributes;
-
-        LocaleSubst() : bConfigRead( false ) {}
-    };
-    std::hash_map< com::sun::star::lang::Locale, LocaleSubst, vcl::LocaleHash > m_aSubst;
-    typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash;
-    mutable UniqueSubstHash maSubstHash;
-
-
-    void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont,
-                          const rtl::OUString& rType,
-                          std::vector< String >& rSubstVector ) const;
-    FontWeight getSubstWeight( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont,
-                          const rtl::OUString& rType ) const;
-    FontWidth getSubstWidth( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont,
-                             const rtl::OUString& rType ) const;
-    unsigned long getSubstType( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont,
-                                const rtl::OUString& rType ) const;
-    void readLocaleSubst( const com::sun::star::lang::Locale& rLocale ) const;
-    FontSubstConfiguration();
-public:
-    ~FontSubstConfiguration();
-
-    static FontSubstConfiguration* get();
-
-    const FontNameAttr* getSubstInfo(
-                                     const String& rFontName,
-                                     const com::sun::star::lang::Locale& rLocale =
-                                     com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ),
-                                                                   rtl::OUString(),
-                                                                   rtl::OUString() )
-                                     ) const;
-    static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, ULONG& rType );
-};
-
-} // namespace vcl
-
-#endif // _VCL_FONTCFG_HXX
diff --git a/vcl/inc/vcl/fontcvt.hxx b/vcl/inc/vcl/fontcvt.hxx
deleted file mode 100644
index 8269928dc730..000000000000
--- a/vcl/inc/vcl/fontcvt.hxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fontcvt.hxx,v $
- * $Revision: 1.3 $
- *
- * 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_FONTCVT_HXX
-#define _SV_FONTCVT_HXX
-
-#include <vcl/dllapi.h>
-#include <tools/string.hxx>
-
-// ------------------
-// - FontToSubsFont -
-// ------------------
-
-#define FONTTOSUBSFONT_IMPORT                   ((ULONG)0x00000001)
-#define FONTTOSUBSFONT_EXPORT                   ((ULONG)0x00000002)
-#define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((ULONG)0x00000004)
-
-typedef void* FontToSubsFontConverter;
-VCL_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, ULONG nFlags );
-VCL_DLLPUBLIC void                        DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
-VCL_DLLPUBLIC sal_Unicode                 ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
-VCL_DLLPUBLIC String                      GetFontToSubsFontName( FontToSubsFontConverter hConverter );
-
-// ----------------
-// - SubsFontName -
-// ----------------
-
-#define SUBSFONT_ONLYONE    ((ULONG)0x00000001)
-#define SUBSFONT_MS         ((ULONG)0x00000002)
-#define SUBSFONT_PS         ((ULONG)0x00000004)
-#define SUBSFONT_HTML       ((ULONG)0x00000008)
-VCL_DLLPUBLIC String GetSubsFontName( const String& rName, ULONG nFlags );
-
-// -----------------
-// - FontTokenName -
-// -----------------
-
-VCL_DLLPUBLIC String GetFontToken( const String& rName, xub_StrLen nToken, xub_StrLen& rIndex );
-inline String GetFontToken( const String& rName, xub_StrLen nToken )
-{
-    xub_StrLen nTempIndex = 0;
-    return GetFontToken( rName, nToken, nTempIndex );
-}
-
-// ---------------------------
-// - StarSymbolToMSMultiFont -
-// ---------------------------
-
-class VCL_DLLPUBLIC StarSymbolToMSMultiFont
-{
-public:
-    //Returns the name of the best windows symbol font which this char can be
-    //mapped to. Sets rChar to the correct position for that font. If no
-    //match found, then no name is returned, and rChar is unchanged. If you
-    //want to convert a string, you don't want to use this.
-    virtual String ConvertChar(sal_Unicode &rChar) = 0;
-
-    //Starts converting the string at position rIndex. It converts as much of
-    //the string that can be converted to the same symbol font and returns the
-    //name of that font. rIndex is modified to the last index that was
-    //converted. Typically you call if continously until rIndex ==
-    //rString.Len() and handle each section as seperate 8bit strings using
-    //seperate fonts. Will return an empty string for a continous section
-    //that has no possible mapping.
-    virtual String ConvertString(String &rString, xub_StrLen &rIndex) = 0;
-    virtual ~StarSymbolToMSMultiFont() {}
-};
-
-//with bPerfect set the converter will only try and convert symbols which have
-//perfect mappings to the windows symbols fonts. With it not set, it will
-//allow somewhat more dubious transformations that are nevertheless
-//recognizably similiar. Even in this mode there will be characters that fail.
-//The users of this might want to make a distinction between failed characters
-//which were inside and those outside the unicode private area.
-VCL_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
-#endif // _SV_FONTCVT_HXX
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index dfbcb366fe6a..92761eabdf3c 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -54,14 +54,17 @@ public:
 
     ~ImplImageTree();
 
+    // check whether the icon style is installed
+    bool checkStyle(rtl::OUString const & style);
+
     bool loadImage(
         rtl::OUString const & name, rtl::OUString const & style,
-        BitmapEx & bitmap, bool localized = false);
+        BitmapEx & bitmap, bool localized = false );
 
     void shutDown();
         // a crude form of life cycle control (called from DeInitVCL; otherwise,
         // if the ImplImageTree singleton were destroyed during exit that would
-        // be too late for the destructors of the bitmaps in m_cache)
+        // be too late for the destructors of the bitmaps in m_iconCache)
 
 private:
     typedef std::list<
@@ -71,20 +74,23 @@ private:
                 com::sun::star::container::XNameAccess > > > Zips;
 
     typedef std::hash_map<
-        rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > Cache;
+        rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
+    typedef std::hash_map<
+        rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
 
     rtl::OUString m_style;
     Zips m_zips;
-    Cache m_cache;
+    CheckStyleCache m_checkStyleCache;
+    IconCache m_iconCache;
 
-    void setStyle(rtl::OUString const & style);
+    void setStyle(rtl::OUString const & style );
 
     void resetZips();
 
-    bool cacheLookup(
-        rtl::OUString const & name, bool localized, BitmapEx & bitmap);
+    bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists );
+    bool iconCacheLookup( rtl::OUString const & name, bool localized, BitmapEx & bitmap );
 
-    bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap);
+    bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap );
 };
 
 typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef;
diff --git a/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx
index 6ba500f4fdb7..c50ba49c17bb 100644
--- a/vcl/inc/vcl/mapunit.hxx
+++ b/vcl/inc/vcl/mapunit.hxx
@@ -31,14 +31,6 @@
 #ifndef _VCL_MAPUNIT_HXX
 #define _VCL_MAPUNIT_HXX
 
-// -----------------
-// - MapMode-Types -
-// -----------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
-               MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
-               MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
-               MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY };
+#include <tools/mapunit.hxx>
 
 #endif  // _VCL_MAPUNIT_HXX
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index af671e24ee0a..67dc256ce11c 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.h
@@ -31,7 +31,7 @@
 #ifndef _SV_OUTDEV_H
 #define _SV_OUTDEV_H
 
-#include <vcl/sv.h>
+#include <tools/solar.h>
 #include <vcl/outfont.hxx>
 
 #include <vector>
@@ -44,13 +44,6 @@ class VirtualDevice;
 class ImplServerGraphics;
 class ImplGetDevFontList;
 class GetDevSizeList;
-namespace vcl {
-class FontSubstConfiguration;
-}
-
-// -----------------------------------------------------------------------
-
-void ImplGetEnglishSearchFontName( String& rName );
 
 // -----------------------
 // - ImplDevFontListData -
@@ -80,7 +73,7 @@ public:
     int                 GetMinQuality() const    { return mnMinQuality; }
 
     bool                AddFontFace( ImplFontData* );
-    void                InitMatchData( const vcl::FontSubstConfiguration&,
+    void                InitMatchData( const utl::FontSubstConfiguration&,
                             const String& rSearchName );
     ImplFontData*       FindBestFontFace( const ImplFontSelectData& rFSD ) const;
 
@@ -106,24 +99,6 @@ friend class ImplDevFontList; // TODO: remove soon
 };
 
 
-// ---------------
-// - ImplCvtChar -
-// ---------------
-
-class ImplCvtChar
-{
-public:
-    const sal_Unicode*  mpCvtTab;
-    const char*         mpSubsFontName;
-    sal_Unicode         (*mpCvtFunc)( sal_Unicode );
-};
-
-sal_Unicode ImplRecodeChar( const ImplCvtChar* pCvtData, sal_Unicode c );
-void ImplRecodeString( const ImplCvtChar* pCvtData, String& rStr,
-                       xub_StrLen nIndex, xub_StrLen nLen );
-const ImplCvtChar* ImplGetRecodeData( const String& rOrgFontName,
-                                      const String& rMapFontName );
-
 // ----------------------
 // - ImplGetDevFontList -
 // ----------------------
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 130492a2bd0c..1e1f784f0f49 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -45,6 +45,7 @@
 #include <tools/poly.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <com/sun/star/uno/Reference.h>
+#include <unotools/fontdefs.hxx>
 
 #include <vector>
 
@@ -264,31 +265,6 @@ struct KerningPair
 #define FONT_SUBSTITUTE_ALWAYS          ((USHORT)0x0001)
 #define FONT_SUBSTITUTE_SCREENONLY      ((USHORT)0x0002)
 
-// Default-Font
-#define DEFAULTFONT_SANS_UNICODE        ((USHORT)1)
-#define DEFAULTFONT_SANS                ((USHORT)2)
-#define DEFAULTFONT_SERIF               ((USHORT)3)
-#define DEFAULTFONT_FIXED               ((USHORT)4)
-#define DEFAULTFONT_SYMBOL              ((USHORT)5)
-#define DEFAULTFONT_UI_SANS             ((USHORT)1000)
-#define DEFAULTFONT_UI_FIXED            ((USHORT)1001)
-#define DEFAULTFONT_LATIN_TEXT          ((USHORT)2000)
-#define DEFAULTFONT_LATIN_PRESENTATION  ((USHORT)2001)
-#define DEFAULTFONT_LATIN_SPREADSHEET   ((USHORT)2002)
-#define DEFAULTFONT_LATIN_HEADING       ((USHORT)2003)
-#define DEFAULTFONT_LATIN_DISPLAY       ((USHORT)2004)
-#define DEFAULTFONT_LATIN_FIXED         ((USHORT)2005)
-#define DEFAULTFONT_CJK_TEXT            ((USHORT)3000)
-#define DEFAULTFONT_CJK_PRESENTATION    ((USHORT)3001)
-#define DEFAULTFONT_CJK_SPREADSHEET     ((USHORT)3002)
-#define DEFAULTFONT_CJK_HEADING         ((USHORT)3003)
-#define DEFAULTFONT_CJK_DISPLAY         ((USHORT)3004)
-#define DEFAULTFONT_CTL_TEXT            ((USHORT)4000)
-#define DEFAULTFONT_CTL_PRESENTATION    ((USHORT)4001)
-#define DEFAULTFONT_CTL_SPREADSHEET     ((USHORT)4002)
-#define DEFAULTFONT_CTL_HEADING         ((USHORT)4003)
-#define DEFAULTFONT_CTL_DISPLAY         ((USHORT)4004)
-
 #define DEFAULTFONT_FLAGS_ONLYONE       ((ULONG)0x00000001)
 
 enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV };
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 88316130cc3a..b72e78994a75 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -32,9 +32,9 @@
 #include <tools/list.hxx>
 #include <i18npool/lang.h>
 #include <tools/gen.hxx>
-#include <vcl/sv.h>
+#include <tools/solar.h>
 #include <vcl/dllapi.h>
-
+#include <unotools/fontdefs.hxx>
 #include <vcl/vclenum.hxx>
 
 #include <hash_map>
@@ -48,14 +48,10 @@ class ImplPreMatchFontSubstitution;
 class ImplGlyphFallbackFontSubstitution;
 class ImplFontSelectData;
 class Font;
-class ImplCvtChar;
+class ConvertChar;
 struct FontMatchStatus;
 class OutputDevice;
 
-namespace vcl {
-  struct FontNameAttr;
-}
-
 // ----------------------
 // - ImplFontAttributes -
 // ----------------------
@@ -185,8 +181,6 @@ public: // TODO: change to private
     ImplFontEntry*      mpFontEntry;        // pointer to the resulting FontCache entry
 };
 
-struct FontNameHash { int operator()(const String&) const; };
-
 // -------------------
 // - ImplDevFontList -
 // -------------------
@@ -238,7 +232,7 @@ protected:
 
     ImplDevFontListData*    ImplFindByTokenNames( const String& ) const;
     ImplDevFontListData*    ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const;
-    ImplDevFontListData*    ImplFindBySubstFontAttr( const vcl::FontNameAttr& ) const;
+    ImplDevFontListData*    ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
     ImplDevFontListData*    ImplFindByAttributes( ULONG nSearchType, FontWeight, FontWidth,
                                 FontFamily, FontItalic, const String& rSearchFamily ) const;
     ImplDevFontListData*    FindDefaultFont() const;
@@ -337,7 +331,7 @@ public:
 public: // TODO: make data members private
     ImplFontSelectData  maFontSelData;      // FontSelectionData
     ImplFontMetricData  maMetric;           // Font Metric
-    const ImplCvtChar*  mpConversion;       // used e.g. for StarBats->StarSymbol
+    const ConvertChar*  mpConversion;       // used e.g. for StarBats->StarSymbol
     long                mnLineHeight;
     ULONG               mnRefCount;
     USHORT              mnSetFontFlags;     // Flags returned by SalGraphics::SetFont()
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index a4a6c4d53170..dbfaf9eda18d 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -547,6 +547,7 @@ The following structure describes the permissions used in PDF security
          */
         PDFWriter::ExportDataFormat     SubmitFormat;
         bool                            AllowDuplicateFieldNames;
+        bool                            FieldsUseSystemFonts;
         /* the following data members are used to customize the PDF viewer
            preferences
          */
@@ -592,6 +593,7 @@ The following structure describes the permissions used in PDF security
                 EmbedStandardFonts( false ),
                 SubmitFormat( PDFWriter::FDF ),
                 AllowDuplicateFieldNames( false ),
+                FieldsUseSystemFonts( true ),
                 PDFDocumentMode( PDFWriter::ModeDefault ),
                 PDFDocumentAction( PDFWriter::ActionDefault ),
                 Zoom( 100 ),
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 2a10353bee94..d9be75369a5d 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -37,6 +37,7 @@
 #include <tools/debug.hxx>
 #include <vcl/salgtype.hxx>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
 
@@ -49,14 +50,6 @@ typedef HPBYTE      Scanline;
 typedef const BYTE* ConstHPBYTE;
 typedef ConstHPBYTE ConstScanline;
 
-// --------------------
-// - Helper functions -
-// --------------------
-
-inline long MinMax( long nVal, long nMin, long nMax );
-inline long AlignedWidth4Bytes( long nWidthBits );
-inline long FRound( double fVal );
-
 // ------------------
 // - Bitmap formats -
 // ------------------
@@ -292,29 +285,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
 VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
                                                ULONG nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL );
 
-// ---------------
-// - Inlines -
-// ---------------
-
-inline long MinMax( long nVal, long nMin, long nMax )
-{
-    return( nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin );
-}
-
-// ------------------------------------------------------------------
-
-inline long AlignedWidth4Bytes( long nWidthBits )
-{
-    return( ( ( nWidthBits + 31 ) >> 5 ) << 2 );
-}
-
-// ------------------------------------------------------------------
-
-inline long FRound( double fVal )
-{
-    return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
-}
-
 // ------------------------------------------------------------------
 
 inline BitmapColor::BitmapColor() :
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 0e3f4e94a0b3..b95f7036ad19 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -170,6 +170,7 @@ public:
 
     virtual void                SetTitle( const XubString& rTitle ) = 0;
     virtual void                SetIcon( USHORT nIcon ) = 0;
+    virtual void                SetRepresentedURL( const rtl::OUString& );
     virtual void                    SetMenu( SalMenu *pSalMenu ) = 0;
     virtual void                    DrawMenuBar() = 0;
 
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx
index 05aa76cb0f56..bdc698fc63fd 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/vcl/salsession.hxx
@@ -37,7 +37,8 @@ enum SalSessionEventType
 {
     Interaction,
     SaveRequest,
-    ShutdownCancel
+    ShutdownCancel,
+    Quit
 };
 
 struct SalSessionEvent
@@ -78,6 +79,13 @@ struct SalSessionShutdownCancelEvent : public SalSessionEvent
     {}
 };
 
+struct SalSessionQuitEvent : public SalSessionEvent
+{
+    SalSessionQuitEvent()
+            : SalSessionEvent( Quit )
+    {}
+};
+
 typedef void(*SessionProc)( SalSessionEvent *pEvent);
 
 class VCL_DLLPUBLIC SalSession
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index decb7d01b2d4..61a970b738e0 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -38,6 +38,7 @@
 #include "vcl/accel.hxx"
 #include "vcl/wall.hxx"
 #include "com/sun/star/lang/Locale.hpp"
+#include <unotools/syslocale.hxx>
 
 class CollatorWrapper;
 class LocaleDataWrapper;
@@ -521,9 +522,10 @@ private:
 #define STYLE_SYMBOLS_HICONTRAST    ((ULONG)2)
 #define STYLE_SYMBOLS_INDUSTRIAL    ((ULONG)3)
 #define STYLE_SYMBOLS_CRYSTAL       ((ULONG)4)
-#define STYLE_SYMBOLS_TANGO     ((ULONG)5)
-#define STYLE_SYMBOLS_CLASSIC       ((ULONG)6)
-#define STYLE_SYMBOLS_THEMES_MAX    ((ULONG)6)
+#define STYLE_SYMBOLS_TANGO         ((ULONG)5)
+#define STYLE_SYMBOLS_OXYGEN        ((ULONG)6)
+#define STYLE_SYMBOLS_CLASSIC       ((ULONG)7)
+#define STYLE_SYMBOLS_THEMES_MAX    ((ULONG)8)
 
 #define STYLE_CURSOR_NOBLINKTIME    ((ULONG)0xFFFFFFFF)
 
@@ -947,6 +949,8 @@ public:
     void                            SetPreferredSymbolsStyleName( const ::rtl::OUString &rName );
     ULONG                           GetPreferredSymbolsStyle() const
                                         { return mpData->mnPreferredSymbolsStyle; }
+    // check whether the symbols style is supported (icons are installed)
+    bool                            CheckSymbolStyle( ULONG nStyle ) const;
     ULONG                           GetAutoSymbolsStyle() const;
 
     ULONG                           GetCurrentSymbolsStyle() const;
@@ -993,7 +997,6 @@ class ImplMiscData
 
 private:
     ULONG                           mnRefCount;
-    USHORT                          mnTwoDigitYearStart;
     USHORT                          mnEnableATT;
     BOOL                            mbEnableLocalizedDecimalSep;
     USHORT                          mnDisablePrinting;
@@ -1015,10 +1018,6 @@ public:
                                     MiscSettings( const MiscSettings& rSet );
                                     ~MiscSettings();
 
-    void                            SetTwoDigitYearStart( USHORT nYearStart )
-                                        { CopyData(); mpData->mnTwoDigitYearStart = nYearStart; }
-    USHORT                          GetTwoDigitYearStart() const
-                                        { return mpData->mnTwoDigitYearStart; }
     void                            SetEnableATToolSupport( BOOL bEnable );
     BOOL                            GetEnableATToolSupport() const;
     void                            SetDisablePrinting( BOOL bEnable );
@@ -1141,7 +1140,7 @@ public:
 // -----------------------
 // - ImplAllSettingsData -
 // -----------------------
-
+class LocaleConfigurationListener;
 class ImplAllSettingsData
 {
     friend class    AllSettings;
@@ -1171,6 +1170,8 @@ private:
     CollatorWrapper*                        mpUICollatorWrapper;
     vcl::I18nHelper*                        mpI18nHelper;
     vcl::I18nHelper*                        mpUII18nHelper;
+    LocaleConfigurationListener*            mpLocaleCfgListener;
+    SvtSysLocale                            maSysLocale;
 };
 
 // ---------------
@@ -1287,6 +1288,8 @@ public:
     BOOL                                    operator ==( const AllSettings& rSet ) const;
     BOOL                                    operator !=( const AllSettings& rSet ) const
                                                 { return !(*this == rSet); }
+    static void                             LocaleSettingsChanged( sal_uInt32 nHint );
+    SvtSysLocale&                           GetSysLocale() { return mpData->maSysLocale; }
 };
 
 #endif // _SV_SETTINGS_HXX
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 5d970f060448..17ad1aa28c1a 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -44,6 +44,7 @@
 #include <tools/debug.hxx>
 #include <vcl/dllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
+#include <unotools/options.hxx>
 
 namespace com {
 namespace sun {
@@ -114,11 +115,17 @@ class VclEventListeners2;
 
 namespace vos { class OMutex; }
 namespace vos { class OCondition; }
-namespace vcl { class DisplayConnection; class FontSubstConfiguration; class SettingsConfigItem; class DefaultFontConfiguration; class DeleteOnDeinitBase; }
+namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; }
+namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; }
 
 // -----------------
 // - ImplSVAppData -
 // -----------------
+class LocaleConfigurationListener : public utl::ConfigurationListener
+{
+public:
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+};
 
 struct ImplSVAppData
 {
@@ -131,21 +138,22 @@ struct ImplSVAppData
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMSF;
     String*                 mpMSFTempFileName;
-    AllSettings*            mpSettings;                     // Application settings
-    VclEventListeners*      mpEventListeners;               // listeners for vcl events (eg, extended toolkit)
-    VclEventListeners*      mpKeyListeners;                 // listeners for key events only (eg, extended toolkit)
-    ImplAccelManager*       mpAccelMgr;                     // Accelerator Manager
-    XubString*              mpAppName;                      // Application name
-    XubString*              mpAppFileName;                  // Abs. Application FileName
-    XubString*              mpDisplayName;                  // Application Display Name
-    String*                 mpFontPath;                     // Additional Fontpath
-    Help*                   mpHelp;                         // Application help
-    PopupMenu*              mpActivePopupMenu;              // Actives Popup-Menu (in Execute)
-    UniqueIdContainer*      mpUniqueIdCont;                 // Fuer Eindeutige Id's
-    ImplIdleMgr*            mpIdleMgr;                      // Idle-Manager
-    ImplWheelWindow*        mpWheelWindow;                  // WheelWindow
-    ImplHotKey*             mpFirstHotKey;                  // HotKey-Verwaltung
-    ImplEventHook*          mpFirstEventHook;               // Event-Hooks
+    AllSettings*            mpSettings;         // Application settings
+    LocaleConfigurationListener* mpCfgListener;
+    VclEventListeners*      mpEventListeners;   // listeners for vcl events (eg, extended toolkit)
+    VclEventListeners*      mpKeyListeners;     // listeners for key events only (eg, extended toolkit)
+    ImplAccelManager*       mpAccelMgr;         // Accelerator Manager
+    XubString*              mpAppName;          // Application name
+    XubString*              mpAppFileName;      // Abs. Application FileName
+    XubString*              mpDisplayName;      // Application Display Name
+    String*                 mpFontPath;         // Additional Fontpath
+    Help*                   mpHelp;             // Application help
+    PopupMenu*              mpActivePopupMenu;  // Actives Popup-Menu (in Execute)
+    UniqueIdContainer*      mpUniqueIdCont;     // Fuer Eindeutige Id's
+    ImplIdleMgr*            mpIdleMgr;          // Idle-Manager
+    ImplWheelWindow*        mpWheelWindow;      // WheelWindow
+    ImplHotKey*             mpFirstHotKey;      // HotKey-Verwaltung
+    ImplEventHook*          mpFirstEventHook;   // Event-Hooks
     VclEventListeners2*     mpPostYieldListeners;           // post yield listeners
     ULONG                   mnLastInputTime;                // GetLastInputTime()
     USHORT                  mnDispatchLevel;                // DispatchLevel
@@ -200,8 +208,8 @@ struct ImplSVGDIData
     long                    mnAppFontX;         // AppFont X-Numenator for 40/tel Width + DialogScaleX
     long                    mnAppFontY;         // AppFont Y-Numenator for 80/tel Height
     BOOL                    mbFontSubChanged;   // TRUE: FontSubstitution wurde zwischen Begin/End geaendert
-    vcl::DefaultFontConfiguration* mpDefaultFontConfiguration;
-    vcl::FontSubstConfiguration* mpFontSubstConfiguration;
+    utl::DefaultFontConfiguration* mpDefaultFontConfiguration;
+    utl::FontSubstConfiguration* mpFontSubstConfiguration;
     bool                    mbPrinterPullModel; // true: use pull model instead of normal push model when printing
     bool                    mbNativeFontConfig; // true: do not override UI font
     bool                    mbNoXORClipping;    // true: do not use XOR to achieve clipping effects
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 99a340ae4a58..d590cfe0a37e 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -201,6 +201,10 @@ public:
 
     void            SetIcon( USHORT nIcon );
     USHORT          GetIcon() const { return mnIcon; }
+    // for systems like MacOSX which can display the URL a document is loaded from
+    // separately from the window title
+    void            SetRepresentedURL( const rtl::OUString& );
+    const rtl::OUString& GetRepresentedURL() const;
 
     void            SetZLevel( BYTE nLevel );
     BYTE            GetZLevel() const;
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h
index 52a0db40b226..2dee85ab6b82 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/vcl/toolbox.h
@@ -51,6 +51,7 @@
 #define TB_LARGEIMAGESIZE            26
 #define TB_LARGEIMAGESIZE_INDUSTRIAL 24
 #define TB_LARGEIMAGESIZE_CRYSTAL    22
+#define TB_LARGEIMAGESIZE_OXYGEN     22
 
 class Window;
 
diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx
index 1c32001a649b..52484c80eff4 100644
--- a/vcl/inc/vcl/wintypes.hxx
+++ b/vcl/inc/vcl/wintypes.hxx
@@ -30,308 +30,7 @@
 #ifndef _SV_WINTYPES_HXX
 #define _SV_WINTYPES_HXX
 
-#include <vcl/sv.h>
-#include <sal/types.h>
-
-// ----------------
-// - Window-Types -
-// ----------------
-
-typedef USHORT WindowType;
-#define WINDOW_BASE                 0x0100
-#define WINDOW_FIRST                (WINDOW_BASE + 0x30)
-#define WINDOW_MESSBOX              (WINDOW_FIRST)
-#define WINDOW_INFOBOX              (WINDOW_FIRST + 0x01)
-#define WINDOW_WARNINGBOX           (WINDOW_FIRST + 0x02)
-#define WINDOW_ERRORBOX             (WINDOW_FIRST + 0x03)
-#define WINDOW_QUERYBOX             (WINDOW_FIRST + 0x04)
-#define WINDOW_WINDOW               (WINDOW_FIRST + 0x05)
-#define WINDOW_SYSWINDOW            (WINDOW_FIRST + 0x06)
-#define WINDOW_WORKWINDOW           (WINDOW_FIRST + 0x07)
-// #define WINDOW_MDIWINDOW            (WINDOW_FIRST + 0x08)
-#define WINDOW_FLOATINGWINDOW       (WINDOW_FIRST + 0x09)
-#define WINDOW_DIALOG               (WINDOW_FIRST + 0x0a)
-#define WINDOW_MODELESSDIALOG       (WINDOW_FIRST + 0x0b)
-#define WINDOW_MODALDIALOG          (WINDOW_FIRST + 0x0c)
-#define WINDOW_SYSTEMDIALOG         (WINDOW_FIRST + 0x0d)
-#define WINDOW_PATHDIALOG           (WINDOW_FIRST + 0x0e)
-#define WINDOW_FILEDIALOG           (WINDOW_FIRST + 0x0f)
-#define WINDOW_PRINTERSETUPDIALOG   (WINDOW_FIRST + 0x10)
-#define WINDOW_PRINTDIALOG          (WINDOW_FIRST + 0x11)
-#define WINDOW_COLORDIALOG          (WINDOW_FIRST + 0x12)
-#define WINDOW_FONTDIALOG           (WINDOW_FIRST + 0x13)
-#define WINDOW_CONTROL              (WINDOW_FIRST + 0x14)
-#define WINDOW_BUTTON               (WINDOW_FIRST + 0x15)
-#define WINDOW_PUSHBUTTON           (WINDOW_FIRST + 0x16)
-#define WINDOW_OKBUTTON             (WINDOW_FIRST + 0x17)
-#define WINDOW_CANCELBUTTON         (WINDOW_FIRST + 0x18)
-#define WINDOW_HELPBUTTON           (WINDOW_FIRST + 0x19)
-#define WINDOW_IMAGEBUTTON          (WINDOW_FIRST + 0x1a)
-#define WINDOW_MENUBUTTON           (WINDOW_FIRST + 0x1b)
-#define WINDOW_MOREBUTTON           (WINDOW_FIRST + 0x1c)
-#define WINDOW_SPINBUTTON           (WINDOW_FIRST + 0x1d)
-#define WINDOW_RADIOBUTTON          (WINDOW_FIRST + 0x1e)
-#define WINDOW_IMAGERADIOBUTTON     (WINDOW_FIRST + 0x1f)
-#define WINDOW_CHECKBOX             (WINDOW_FIRST + 0x20)
-#define WINDOW_TRISTATEBOX          (WINDOW_FIRST + 0x21)
-#define WINDOW_EDIT                 (WINDOW_FIRST + 0x22)
-#define WINDOW_MULTILINEEDIT        (WINDOW_FIRST + 0x23)
-#define WINDOW_COMBOBOX             (WINDOW_FIRST + 0x24)
-#define WINDOW_LISTBOX              (WINDOW_FIRST + 0x25)
-#define WINDOW_MULTILISTBOX         (WINDOW_FIRST + 0x26)
-#define WINDOW_FIXEDTEXT            (WINDOW_FIRST + 0x27)
-#define WINDOW_FIXEDLINE            (WINDOW_FIRST + 0x28)
-#define WINDOW_FIXEDBITMAP          (WINDOW_FIRST + 0x29)
-#define WINDOW_FIXEDIMAGE           (WINDOW_FIRST + 0x2a)
-#define WINDOW_GROUPBOX             (WINDOW_FIRST + 0x2c)
-#define WINDOW_SCROLLBAR            (WINDOW_FIRST + 0x2d)
-#define WINDOW_SCROLLBARBOX         (WINDOW_FIRST + 0x2e)
-#define WINDOW_SPLITTER             (WINDOW_FIRST + 0x2f)
-#define WINDOW_SPLITWINDOW          (WINDOW_FIRST + 0x30)
-#define WINDOW_SPINFIELD            (WINDOW_FIRST + 0x31)
-#define WINDOW_PATTERNFIELD         (WINDOW_FIRST + 0x32)
-#define WINDOW_NUMERICFIELD         (WINDOW_FIRST + 0x33)
-#define WINDOW_METRICFIELD          (WINDOW_FIRST + 0x34)
-#define WINDOW_CURRENCYFIELD        (WINDOW_FIRST + 0x35)
-#define WINDOW_DATEFIELD            (WINDOW_FIRST + 0x36)
-#define WINDOW_TIMEFIELD            (WINDOW_FIRST + 0x37)
-#define WINDOW_PATTERNBOX           (WINDOW_FIRST + 0x38)
-#define WINDOW_NUMERICBOX           (WINDOW_FIRST + 0x39)
-#define WINDOW_METRICBOX            (WINDOW_FIRST + 0x3a)
-#define WINDOW_CURRENCYBOX          (WINDOW_FIRST + 0x3b)
-#define WINDOW_DATEBOX              (WINDOW_FIRST + 0x3c)
-#define WINDOW_TIMEBOX              (WINDOW_FIRST + 0x3d)
-#define WINDOW_LONGCURRENCYFIELD    (WINDOW_FIRST + 0x3e)
-#define WINDOW_LONGCURRENCYBOX      (WINDOW_FIRST + 0x3f)
-#define WINDOW_TOOLBOX              (WINDOW_FIRST + 0x41)
-#define WINDOW_DOCKINGWINDOW        (WINDOW_FIRST + 0x42)
-#define WINDOW_STATUSBAR            (WINDOW_FIRST + 0x43)
-#define WINDOW_TABPAGE              (WINDOW_FIRST + 0x44)
-#define WINDOW_TABCONTROL           (WINDOW_FIRST + 0x45)
-#define WINDOW_TABDIALOG            (WINDOW_FIRST + 0x46)
-#define WINDOW_BORDERWINDOW         (WINDOW_FIRST + 0x47)
-#define WINDOW_BUTTONDIALOG         (WINDOW_FIRST + 0x48)
-#define WINDOW_SYSTEMCHILDWINDOW    (WINDOW_FIRST + 0x49)
-#define WINDOW_FIXEDBORDER          (WINDOW_FIRST + 0x4a)
-#define WINDOW_SLIDER               (WINDOW_FIRST + 0x4b)
-#define WINDOW_MENUBARWINDOW        (WINDOW_FIRST + 0x4c)
-#define WINDOW_TREELISTBOX          (WINDOW_FIRST + 0x4d)
-#define WINDOW_HELPTEXTWINDOW       (WINDOW_FIRST + 0x4e)
-#define WINDOW_INTROWINDOW          (WINDOW_FIRST + 0x4f)
-#define WINDOW_LISTBOXWINDOW        (WINDOW_FIRST + 0x50)
-#define WINDOW_DOCKINGAREA          (WINDOW_FIRST + 0x51)
-#define WINDOW_LAST                 (WINDOW_DOCKINGAREA)
-
-
-// ---------------
-// - Window-Bits -
-// ---------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-typedef sal_Int64 WinBits;
-
-// Window-Bits fuer Window
-#define WB_CLIPCHILDREN         ((WinBits)0x00000001)
-#define WB_DIALOGCONTROL        ((WinBits)0x00000002)
-#define WB_NODIALOGCONTROL      ((WinBits)0x00000004)
-#define WB_BORDER               ((WinBits)0x00000008)
-#define WB_NOBORDER             ((WinBits)0x00000010)
-#define WB_SIZEABLE             ((WinBits)0x00000020)
-#define WB_3DLOOK               ((WinBits)0x00000040)
-#define WB_AUTOSIZE             ((WinBits)0x00000080)
-
-// Window-Bits fuer SystemWindows
-#define WB_MOVEABLE             ((WinBits)0x00000100)
-#define WB_ROLLABLE             ((WinBits)0x00000200)
-#define WB_CLOSEABLE            ((WinBits)0x00000400)
-#define WB_STANDALONE           ((WinBits)0x00000800)
-#define WB_APP                  ((WinBits)0x00001000)
-#define WB_PINABLE              ((WinBits)0x00002000)
-#define WB_SYSTEMWINDOW         ((WinBits)SAL_CONST_INT64(0x40000000))
-// warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class
-
-// the SystemChildWindow class was there first and is a very specialized
-// sytem child window type for plugged applications. The SystemChildWindow class
-// explicitly should never use the WB_SYSTEMCHILDWINDOW WinBit
-
-// WB_SYSTEMCHILDWINDOW on the other hand is to be used on system windows
-// which should be created as system child windows with (more or less)
-// normal event handling
-#define WB_SYSTEMCHILDWINDOW    ((WinBits)SAL_CONST_INT64(0x8000000000))
-#define WB_SIZEMOVE             (WB_SIZEABLE | WB_MOVEABLE)
-
-// Standard-Window-Bits fuer ChildWindows
-#define WB_TABSTOP              ((WinBits)0x00000100)
-#define WB_NOTABSTOP            ((WinBits)0x00000200)
-#define WB_GROUP                ((WinBits)0x00000400)
-#define WB_NOGROUP              ((WinBits)0x00000800)
-#define WB_HORZ                 ((WinBits)0x00001000)
-#define WB_VERT                 ((WinBits)0x00002000)
-#define WB_LEFT                 ((WinBits)0x00004000)
-#define WB_CENTER               ((WinBits)0x00008000)
-#define WB_RIGHT                ((WinBits)0x00010000)
-#define WB_TOP                  ((WinBits)0x00020000)
-#define WB_VCENTER              ((WinBits)0x00040000)
-#define WB_BOTTOM               ((WinBits)0x00080000)
-#define WB_DRAG                 ((WinBits)0x00100000)
-#define WB_SPIN                 ((WinBits)0x00200000)
-#define WB_REPEAT               ((WinBits)0x00400000)
-#define WB_NOPOINTERFOCUS       ((WinBits)0x00800000)
-#define WB_WORDBREAK            ((WinBits)0x01000000)
-#define WB_NOLABEL              ((WinBits)0x02000000)
-#define WB_SORT                 ((WinBits)0x04000000)
-#define WB_DROPDOWN             ((WinBits)0x08000000)
-#define WB_AUTOHSCROLL          ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DOCKABLE             ((WinBits)SAL_CONST_INT64(0x20000000))
-#define WB_AUTOVSCROLL          ((WinBits)SAL_CONST_INT64(0x40000000))
-#define WB_HYPHENATION          (((WinBits)SAL_CONST_INT64(0x80000000)) | WB_WORDBREAK)
-#define WB_CHILDDLGCTRL         ((WinBits)SAL_CONST_INT64(0x100000000000))
-
-// system floating window
-#define WB_SYSTEMFLOATWIN       ((WinBits)SAL_CONST_INT64(0x100000000))
-#define WB_INTROWIN             ((WinBits)SAL_CONST_INT64(0x200000000))
-#define WB_NOSHADOW             ((WinBits)SAL_CONST_INT64(0x400000000))
-#define WB_TOOLTIPWIN           ((WinBits)SAL_CONST_INT64(0x800000000))
-#define WB_OWNERDRAWDECORATION  ((WinBits)SAL_CONST_INT64(0x2000000000))
-#define WB_DEFAULTWIN           ((WinBits)SAL_CONST_INT64(0x4000000000))
-#define WB_NEEDSFOCUS           ((WinBits)SAL_CONST_INT64(0x1000000000))
-
-#define WB_HIDE                 ((WinBits)SAL_CONST_INT64(0x80000000))
-#define WB_HSCROLL              WB_HORZ
-#define WB_VSCROLL              WB_VERT
-#define WB_TOPIMAGE             WB_TOP
-
-// Window-Bits for PushButtons
-#define WB_DEFBUTTON            ((WinBits)0x10000000)
-#define WB_NOLIGHTBORDER        ((WinBits)0x20000000)
-#define WB_RECTSTYLE            ((WinBits)0x08000000)
-#define WB_SMALLSTYLE           ((WinBits)0x04000000)
-#define WB_TOGGLE               ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_BEVELBUTTON          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Window-Bits for FixedText
-#define WB_PATHELLIPSIS         ((WinBits)0x00100000)
-#define WB_EXTRAOFFSET          ((WinBits)0x02000000)
-#define WB_NOMULTILINE          ((WinBits)0x10000000)
-#define WB_INFO                 ((WinBits)0x20000000)
-
-// Window-Bits for CheckBox
-#define WB_CBLINESTYLE          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Window-Bits for Edit
-#define WB_PASSWORD             ((WinBits)0x01000000)
-#define WB_READONLY             ((WinBits)0x02000000)
-#define WB_NOHIDESELECTION      ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_FORCECTRLBACKGROUND  ((WinBits)0x80000000)
-
-// Window-Bits for MultiLineEdit
-#define WB_IGNORETAB            ((WinBits)0x20000000)
-
-// Window-Bits for ListBox and MultiListBox
-#define WB_SIMPLEMODE           ((WinBits)0x20000000)
-
-// Window-Bits for FixedBitmap
-#define WB_FAST                 ((WinBits)0x04000000)
-#define WB_SCALE                ((WinBits)0x08000000)
-#define WB_TOPLEFTVISIBLE       ((WinBits)0x10000000)
-
-// Window-Bits for ToolBox
-#define WB_LINESPACING          ((WinBits)0x01000000)
-#define WB_SCROLL               ((WinBits)0x02000000)
-#define WB_FORCETABCYCLE        ((WinBits)0x04000000)
-
-// Window-Bits for TabControl
-#define WB_SINGLELINE           ((WinBits)0x02000000)
-
-// Window-Bits for DockingWindows
-#define WB_DOCKBORDER           ((WinBits)0x00001000)
-
-// Window-Bits for SplitWindow
-#define WB_NOSPLITDRAW          ((WinBits)0x01000000)
-#define WB_FLATSPLITDRAW        ((WinBits)0x02000000)
-
-// Window-Bits for MessageBoxen
-#define WB_OK                   ((WinBits)0x00100000)
-#define WB_OK_CANCEL            ((WinBits)0x00200000)
-#define WB_YES_NO               ((WinBits)0x00400000)
-#define WB_YES_NO_CANCEL        ((WinBits)0x00800000)
-#define WB_RETRY_CANCEL         ((WinBits)0x01000000)
-#define WB_DEF_OK               ((WinBits)0x02000000)
-#define WB_DEF_CANCEL           ((WinBits)0x04000000)
-#define WB_DEF_RETRY            ((WinBits)0x08000000)
-#define WB_DEF_YES              ((WinBits)SAL_CONST_INT64(0x10000000))
-#define WB_DEF_NO               ((WinBits)SAL_CONST_INT64(0x20000000))
-#define WB_ABORT_RETRY_IGNORE  ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_DEF_IGNORE          ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Standard-WinBits
-#define WB_STDWORK              (WB_SIZEMOVE | WB_CLOSEABLE)
-#define WB_STDDOCKWIN           (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDFLOATWIN          (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
-#define WB_STDDIALOG            (WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDMODELESS          (WB_STDDIALOG)
-#define WB_STDMODAL             (WB_STDDIALOG)
-#define WB_STDTABDIALOG         (WB_STDDIALOG)
-#define WB_STDTABCONTROL        0
-
-// For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)0x00800000)
-#define WB_HASLINES             ((WinBits)0x01000000)
-#define WB_HASLINESATROOT       ((WinBits)0x02000000)
-
-// For FileOpen Dialog
-#define WB_PATH                 ((WinBits)0x00100000)
-#define WB_OPEN                 ((WinBits)0x00200000)
-#define WB_SAVEAS               ((WinBits)0x00400000)
-
-// For Slider
-// Window-Bits for TabControl
-#define WB_SLIDERSET            ((WinBits)0x02000000)
-
-
-// --------------------
-// - extended WinBits -
-// --------------------
-#define WB_EXT_DOCUMENT         ((WinBits)0x00000001)
-#define WB_EXT_DOCMODIFIED      ((WinBits)0x00000002)
-
-// ---------------
-// - WindowAlign -
-// ---------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum WindowAlign { WINDOWALIGN_LEFT, WINDOWALIGN_TOP, WINDOWALIGN_RIGHT, WINDOWALIGN_BOTTOM };
-enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_BOTTOM,
-                  IMAGEALIGN_LEFT_TOP, IMAGEALIGN_LEFT_BOTTOM, IMAGEALIGN_TOP_LEFT,
-                  IMAGEALIGN_TOP_RIGHT, IMAGEALIGN_RIGHT_TOP, IMAGEALIGN_RIGHT_BOTTOM,
-                  IMAGEALIGN_BOTTOM_LEFT, IMAGEALIGN_BOTTOM_RIGHT, IMAGEALIGN_CENTER };
-enum SymbolAlign { SYMBOLALIGN_LEFT, SYMBOLALIGN_RIGHT };
-
-// ------------
-// - TriState -
-// ------------
-
-// By changes you must also change: rsc/vclrsc.hxx
-enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW };
-
-
-// ----------------------
-// - ButtonDialog-Types -
-// ----------------------
-
-typedef USHORT StandardButtonType;
-#define BUTTON_OK           ((StandardButtonType)0)
-#define BUTTON_CANCEL       ((StandardButtonType)1)
-#define BUTTON_YES          ((StandardButtonType)2)
-#define BUTTON_NO           ((StandardButtonType)3)
-#define BUTTON_RETRY        ((StandardButtonType)4)
-#define BUTTON_HELP         ((StandardButtonType)5)
-#define BUTTON_CLOSE        ((StandardButtonType)6)
-#define BUTTON_MORE         ((StandardButtonType)7)
-#define BUTTON_IGNORE       ((StandardButtonType)8)
-#define BUTTON_ABORT        ((StandardButtonType)9)
-#define BUTTON_LESS         ((StandardButtonType)10)
-#define BUTTON_COUNT        11
+#include <tools/wintypes.hxx>
 
 // --------------------------------------------
 // - prominent place for ListBox window types -