INTEGRATION: CWS dr20 (1.8.168); FILE MERGED

2004/08/20 08:48:28 dr 1.8.168.7: #i194# merged cells need equal cell format
2004/08/17 11:54:35 dr 1.8.168.6: #i30205# Excel filter code cleanup
2004/08/12 12:28:52 dr 1.8.168.5: #i194# default column format
2004/08/11 14:27:48 dr 1.8.168.4: RESYNC: (1.8-1.9); FILE MERGED
2004/08/11 10:43:52 dr 1.8.168.3: #i12577# #i16277# #i24129# #i31482# #i24672# #i27407# #i30411# rework of cell table export - default row/column formats and shared formulas
2004/06/21 12:59:47 dr 1.8.168.2: #i30205# record list handling
2004/06/15 16:40:29 dr 1.8.168.1: #i30205# Excel filter code cleanup
- rowlimit changes: SCCOL/SCROW/SCTAB usage
- type correctness: USHORT vs. sal_uInt16, ULONG/size_t vs. sal_uInt32
- removed compiler warnings

1 files changed, 350 insertions, 286 deletions

diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 1efd87fe9fd6..e9a095d42014 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xestyle.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 16:59:24 $
+ *  last change: $Author: hr $ $Date: 2004-09-08 15:45:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,8 @@
 #ifndef SC_XESTYLE_HXX
 #define SC_XESTYLE_HXX
 
+#include <map>
+
 #ifndef _SVMEMPOOL_HXX
 #include <tools/mempool.hxx>
 #endif
@@ -88,7 +90,6 @@
 #include "xerecord.hxx"
 #endif
 
-
 /* ============================================================================
 - Buffers for style records (PALETTE, FONT, FORMAT, XF).
 - Page styles export.
@@ -108,97 +109,104 @@ enum XclColorType
     xlColorGrid             /// Spreadsheet grid color.
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Stores all used colors in the document.
-    @descr  Supports color reduction to the maximum count of the current BIFF version.
-    An instance of this class collects all colors in the conversion phase of the export,
-    using the InsertColor() function. It returns a unique identidier for each passed color.
-    After the entire document is converted, the palette will be reduced to the number of
-    colors supported by the current BIFF version, using the function Reduce().
-    Then, in the streaming phase, the functions GetColorIndex() and GetMixedColors()
-    return the real Excel palette index for all color identifiers. */
+
+    Supports color reduction to the maximum count of the current BIFF version.
+    An instance of this class collects all colors in the conversion phase of
+    the export, using the InsertColor() function. It returns a unique
+    identidier for each passed color.
+
+    After the entire document is converted, the Finalize() function will reduce
+    the palette to the  number of colors supported by the current BIFF version.
+
+    Then, in the streaming phase, the functions GetColorIndex() and
+    GetMixedColors() return the real Excel palette index for all color
+    identifiers.
+ */
 class XclExpPalette : public XclExpRecord, public XclDefaultPalette, protected XclExpRoot
 {
 public:
-    explicit                    XclExpPalette( const XclExpRoot& rRoot );
+    explicit            XclExpPalette( const XclExpRoot& rRoot );
 
     /** Inserts the color into the list and updates weighting.
         @param nAutoDefault  The Excel palette index for automatic color.
         @return  A unique ID for this color. */
-    sal_uInt32                  InsertColor( const Color& rColor, XclColorType eType, sal_uInt16 nAutoDefault = 0 );
+    sal_uInt32          InsertColor( const Color& rColor, XclColorType eType, sal_uInt16 nAutoDefault = 0 );
     /** Returns the color ID representing a fixed Excel palette index (i.e. for auto colors). */
-    static sal_uInt32           GetColorIdFromIndex( sal_uInt16 nIndex );
+    static sal_uInt32   GetColorIdFromIndex( sal_uInt16 nIndex );
 
     /** Reduces the color list to the maximum count of the current BIFF version. */
-    void                        Reduce();
+    void                Finalize();
 
     /** Returns the Excel palette index of the color with passed color ID. */
-    sal_uInt16                  GetColorIndex( sal_uInt32 nColorId ) const;
+    sal_uInt16          GetColorIndex( sal_uInt32 nColorId ) const;
     /** Returns the Excel palette index of the passed color (searches for nearest color).
         @param nAutoDefault  The Excel palette index for automatic color. */
-    sal_uInt16                  GetColorIndex( const Color& rColor, sal_uInt16 nAutoDefault = 0 ) const;
+    sal_uInt16          GetColorIndex( const Color& rColor, sal_uInt16 nAutoDefault = 0 ) const;
 
     /** Returns a foreground and background color for the two passed color IDs.
         @descr  If rnXclPattern contains a solid pattern, this function tries to find
         the two best fitting colors and a mix pattern (25%, 50% or 75%) for nForeColorId.
         This will result in a better approximation to the passed foreground color. */
-    void                        GetMixedColors(
-                                    sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt8& rnXclPattern,
-                                    sal_uInt32 nForeColorId, sal_uInt32 nBackColorId ) const;
+    void                GetMixedColors(
+                            sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt8& rnXclPattern,
+                            sal_uInt32 nForeColorId, sal_uInt32 nBackColorId ) const;
 
     /** Returns the RGB color data for a (non-zero-based) Excel palette entry.
         @return  The color from current or default palette or COL_AUTO, if nothing else found. */
-    ColorData                   GetColorData( sal_uInt16 nXclIndex ) const;
+    ColorData           GetColorData( sal_uInt16 nXclIndex ) const;
     /** Returns the color for a (non-zero-based) Excel palette entry.
         @return  The color from current or default palette or COL_AUTO, if nothing else found. */
-    inline Color                GetColor( sal_uInt16 nXclIndex ) const
-                                    { return Color( GetColorData( nXclIndex ) ); }
+    inline Color        GetColor( sal_uInt16 nXclIndex ) const
+                            { return Color( GetColorData( nXclIndex ) ); }
 
+    /** Saves the PALETTE record, if it differs from the default palette. */
+    virtual void        Save( XclExpStream& rStrm );
 
 private:
     class XclListColor;
 
     /** Returns the Excel index of a 0-based color index. */
-    inline sal_uInt16           GetXclIndex( sal_uInt32 nIndex ) const;
+    inline sal_uInt16   GetXclIndex( sal_uInt32 nIndex ) const;
 
     /** Returns the original inserted color represented by the color ID nColorId. */
-    const Color&                GetOriginalColor( sal_uInt32 nColorId ) const;
+    const Color&        GetOriginalColor( sal_uInt32 nColorId ) const;
 
     /** Returns the ordered insertion index for rColor in rnIndex.
         @param rbIsEqual  Returns true, if the color already exists. */
-    void                        SearchListEntry(
-                                    sal_uInt32& rnIndex, bool& rbIsEqual,
-                                    const Color& rColor ) const;
+    void                SearchListEntry(
+                            sal_uInt32& rnIndex, bool& rbIsEqual,
+                            const Color& rColor ) const;
     /** Creates and inserts a new color list entry at the specified list position. */
-    XclListColor*               CreateListEntry( const Color& rColor, sal_uInt32 nIndex );
+    XclListColor*       CreateListEntry( const Color& rColor, sal_uInt32 nIndex );
     /** Merges two colors and removes the color specified by nRemove. */
-    void                        MergeListColors( sal_uInt32 nKeep, sal_uInt32 nRemove );
+    void                MergeListColors( sal_uInt32 nKeep, sal_uInt32 nRemove );
 
     /** Finds the least used color and returns its current list index. */
-    sal_uInt32                  GetLeastUsedListColor() const;
+    sal_uInt32          GetLeastUsedListColor() const;
     /** Returns the list index of the color nearest to rColor.
         @param nIgnore  List index of a color which will be ignored.
         @return  The list index of the found color. */
-    sal_uInt32                  GetNearestListColor( const Color& rColor, sal_uInt32 nIgnore ) const;
+    sal_uInt32          GetNearestListColor( const Color& rColor, sal_uInt32 nIgnore ) const;
     /** Returns the list index of the color nearest to the color with list index nIndex. */
-    sal_uInt32                  GetNearestListColor( sal_uInt32 nIndex ) const;
+    sal_uInt32          GetNearestListColor( sal_uInt32 nIndex ) const;
 
     /** Returns in rnIndex the palette index of the color nearest to rColor.
         @param bDefaultOnly  true = Searches for default colors only (colors never replaced).
         @return  The distance from passed color to found color. */
-    sal_Int32                   GetNearestPaletteColor(
-                                    sal_uInt32& rnIndex,
-                                    const Color& rColor, bool bDefaultOnly ) const;
+    sal_Int32           GetNearestPaletteColor(
+                            sal_uInt32& rnIndex,
+                            const Color& rColor, bool bDefaultOnly ) const;
     /** Returns in rnFirst and rnSecond the palette indexes of the two colors nearest to rColor.
         @return  The minimum distance from passed color to found colors. */
-    sal_Int32                   GetNearPaletteColors(
-                                    sal_uInt32& rnFirst, sal_uInt32& rnSecond,
-                                    const Color& rColor ) const;
+    sal_Int32           GetNearPaletteColors(
+                            sal_uInt32& rnFirst, sal_uInt32& rnSecond,
+                            const Color& rColor ) const;
 
     /** Writes the contents of the PALETTE record. */
-    virtual void                WriteBody( XclExpStream& rStrm );
+    virtual void        WriteBody( XclExpStream& rStrm );
 
 private:
     /** Represents an entry in a color list.
@@ -210,59 +218,59 @@ private:
         DECL_FIXEDMEMPOOL_NEWDEL( XclListColor )
 
     private:
-        Color                   maColor;    /// The color value of this palette entry.
-        sal_uInt32              mnColorId;  /// Unique color ID for color reduction.
-        sal_uInt32              mnWeight;   /// Weighting for color reduction.
+        Color               maColor;    /// The color value of this palette entry.
+        sal_uInt32          mnColorId;  /// Unique color ID for color reduction.
+        sal_uInt32          mnWeight;   /// Weighting for color reduction.
 
     public:
-        explicit                XclListColor( const Color& rColor, sal_uInt32 nColorId );
+        explicit            XclListColor( const Color& rColor, sal_uInt32 nColorId );
 
         /** Returns the RGB color value of the color. */
-        inline const Color&     GetColor() const { return maColor; }
+        inline const Color& GetColor() const { return maColor; }
         /** Returns the unique ID of the color. */
-        inline sal_uInt32       GetColorId() const { return mnColorId; }
+        inline sal_uInt32   GetColorId() const { return mnColorId; }
         /** Returns the current weighting of the color. */
-        inline sal_uInt32       GetWeighting() const { return mnWeight; }
+        inline sal_uInt32   GetWeighting() const { return mnWeight; }
         /** Returns true, if this color value is greater than rColor (simple arithmetic comparison). */
-        inline bool             IsGreater( const Color& rColor ) const { return maColor.GetColor() > rColor.GetColor(); }
+        inline bool         IsGreater( const Color& rColor ) const { return maColor.GetColor() > rColor.GetColor(); }
         /** Returns true, if this color is equal to rColor. */
-        inline bool             IsEqual( const Color& rColor ) const { return maColor.GetColor() == rColor.GetColor(); }
+        inline bool         IsEqual( const Color& rColor ) const { return maColor.GetColor() == rColor.GetColor(); }
 
         /** Updates the weighting of this color dependent from nColorType. */
-        void                    UpdateWeighting( XclColorType eType );
+        void                UpdateWeighting( XclColorType eType );
         /** Adds the weighting of rColor to this color. */
-        inline void             AddWeighting( const XclListColor& rColor ) { mnWeight += rColor.mnWeight; }
+        inline void         AddWeighting( const XclListColor& rColor ) { mnWeight += rColor.mnWeight; }
         /** Merges this color with rColor, regarding weighting settings. */
-        void                    Merge( const XclListColor& rColor );
+        void                Merge( const XclListColor& rColor );
     };
 
     /** Data for each inserted original color, represented by a color ID. */
     struct XclColorIdData
     {
-        Color                   maColor;    /// The original inserted color.
-        sal_uInt32              mnIndex;    /// Maps current color ID to color list or export color vector.
+        Color               maColor;    /// The original inserted color.
+        sal_uInt32          mnIndex;    /// Maps current color ID to color list or export color vector.
         /** Sets the contents of this struct. */
-        inline void             Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
+        inline void         Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
     };
 
     /** A color that will be written to the Excel file. */
     struct XclPaletteColor
     {
-        Color                   maColor;    /// Resulting color to export.
-        bool                    mbDefault;  /// true = Entry is a default color.
-        /** Sets a new color.
-            @param bDefault  true = Color is a color from default palette. */
-        inline void             SetColor( const Color& rColor, bool bDefault = false ) { maColor = rColor; mbDefault = bDefault; }
+        Color               maColor;    /// Resulting color to export.
+        bool                mbUsed;     /// true = Entry is used in the document.
+
+        inline explicit     XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {}
+        inline void         SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; }
     };
 
     typedef ScfDelList< XclListColor >          XclListColorList;
     typedef ::std::vector< XclColorIdData >     XclColorIdDataVec;
     typedef ::std::vector< XclPaletteColor >    XclPaletteColorVec;
 
-    XclListColorList            maColorList;        /// Working color list.
-    XclColorIdDataVec           maColorIdDataVec;   /// Data of all CIDs.
-    XclPaletteColorVec          maPalette;          /// Contains resulting colors to export.
-    sal_uInt32                  mnLastIx;           /// Last insertion index for search opt.
+    XclListColorList    maColorList;        /// Working color list.
+    XclColorIdDataVec   maColorIdDataVec;   /// Data of all CIDs.
+    XclPaletteColorVec  maPalette;          /// Contains resulting colors to export.
+    sal_uInt32          mnLastIx;           /// Last insertion index for search opt.
 };
 
 inline sal_uInt16 XclExpPalette::GetXclIndex( sal_uInt32 nIndex ) const
@@ -270,50 +278,74 @@ inline sal_uInt16 XclExpPalette::GetXclIndex( sal_uInt32 nIndex ) const
     return static_cast< sal_uInt16 >( nIndex + EXC_COLOR_USEROFFSET );
 }
 
-
 // FONT record - font information =============================================
 
 class Font;
 class SvxFont;
 
+const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 );
+
+// ----------------------------------------------------------------------------
+
+/** This struct adds a color identifier to XclFontData. */
+struct XclExpFontData : public XclFontData
+{
+    sal_uInt32          mnColorId;      /// Unique color ID for text color.
+
+    /** Constructs an empty font data structure. */
+    explicit            XclExpFontData();
+    /** Constructs a font data structure and fills it with the passed font attributes. */
+    explicit            XclExpFontData( const XclExpRoot& rRoot, const Font& rFont );
+    /** As directly above but also fills in the escapement member. */
+    explicit            XclExpFontData( const XclExpRoot& rRoot, const SvxFont& rFont );
+
+    /** Sets the color identifier from the passed color. */
+    void                SetColorId( const XclExpRoot& rRoot, const Color& rColor );
+
+    /** Calculates a hash value from the current font settings. */
+    sal_uInt32          GetHash() const;
+};
+
+bool operator==( const XclExpFontData& rLeft, const XclExpFontData& rRight );
+
+// ----------------------------------------------------------------------------
+
 /** Stores all data of an Excel font and provides export of FONT records. */
 class XclExpFont : public XclExpRecord, protected XclExpRoot
 {
 public:
-    explicit                    XclExpFont( const XclExpRoot& rRoot, const Font& rFont );
-    explicit                    XclExpFont( const XclExpRoot& rRoot, const SvxFont& rFont );
-    explicit                    XclExpFont( const XclExpRoot& rRoot, const XclFontData& rFontData );
+    explicit            XclExpFont( const XclExpRoot& rRoot, const XclExpFontData& rFontData );
 
     /** Returns read-only access to font data. */
-    inline const XclFontData&   GetFontData() const { return maData; }
-    /** Compares this font with the passed font.
-        @descr  Ignores color settings, if no color is set. */
-    bool                        Equals( const XclExpFont& rCmpFont ) const;
-
-    /** Returns true, if this font contains a specific color (if SetColor was called before). */
-    inline bool                 HasColor() const { return mbHasColor; }
-    /** Returns the unique color ID of the font color from palette. */
-    inline sal_uInt32           GetColorId() const { return mnColorId; }
-    /** Sets the color ID for this font. */
-    void                        SetColorId( sal_uInt32 nColorId );
+    inline const XclExpFontData& GetFontData() const { return maData; }
+    /** Compares this font with the passed font data.
+        @param nHash  The hash value calculated from the font data. */
+    virtual bool        Equals( const XclExpFontData& rFontData, sal_uInt32 nHash ) const;
 
 private:
-    /** Calculates an internal hash value for faster comparison. */
-    void                        CalcHash();
-
-    /** Sets the ColorId, internal hash value and the record size. */
-    void                        SetColorHashAndRecSize( const Font& rFont );
-
     /** Writes the contents of the FONT record. */
-    virtual void                WriteBody( XclExpStream& rStrm );
+    virtual void        WriteBody( XclExpStream& rStrm );
 
 private:
-    XclFontData                 maData;         /// All font attributes.
-    sal_uInt32                  mnColorId;      /// Unique color ID for text color.
-    sal_uInt32                  mnHash;         /// Hash value for fast comparison.
-    bool                        mbHasColor;     /// false = Font does not use a color (i.e. chart).
+    XclExpFontData      maData;         /// All font attributes.
+    sal_uInt32          mnHash;         /// Hash value for fast comparison.
 };
 
+// ----------------------------------------------------------------------------
+
+/** Used as placeholder for font index 4, which is not used in Excel. */
+class XclExpBlindFont : public XclExpFont
+{
+public:
+    explicit            XclExpBlindFont( const XclExpRoot& rRoot );
+
+    /** Returns always false to never find this font while searching the font list. */
+    virtual bool        Equals( const XclExpFontData& rFontData, sal_uInt32 nHash ) const;
+
+private:
+    /** Skips writing this record. */
+    virtual void        Save( XclExpStream& rStrm );
+};
 
 // ----------------------------------------------------------------------------
 
@@ -323,70 +355,67 @@ class ScPatternAttr;
 class XclExpFontBuffer : public XclExpRecordBase, protected XclExpRoot
 {
 public:
-    explicit                    XclExpFontBuffer( const XclExpRoot& rRoot );
+    explicit            XclExpFontBuffer( const XclExpRoot& rRoot );
 
     /** Returns the specified font from font list. */
-    inline const XclExpFont*    GetFont( sal_uInt32 nIndex ) const
-                                    { return maFontList.GetObject( nIndex ); }
+    const XclExpFont*   GetFont( sal_uInt16 nXclFont ) const;
+    /** Returns the application font data of this file, needed i.e. for column width. */
+    const XclFontData&  GetAppFontData() const;
 
-    /** Searches for the passed font and returns its Excel font index.
+    /** Searches for the passed font data and returns its Excel font index.
         @return  Excel font index or nDefault, if not found. */
-    sal_uInt16                  GetIndex( const XclExpFont& rFont, sal_uInt16 nDefault = EXC_FONT_APP );
+    sal_uInt16          GetXclIndex( const XclExpFontData& rFontData, sal_uInt16 nDefault = EXC_FONT_APP );
 
-    /** Inserts the font into the buffer if not present, otherwise deletes it.
+    /** Inserts a new font with the passed font data into the buffer if not present.
         @param bAppFont  true = Sets the application font; false = Inserts a new font.
         @return  The resulting Excel font index. */
-    sal_uInt16                  Insert( XclExpFont*& rpFont, bool bAppFont = false );
+    sal_uInt16          Insert( const XclExpFontData& rFontData, bool bAppFont = false );
     /** Inserts the font into the buffer if not present.
         @param bAppFont  true = Sets the application font; false = Inserts a new font.
         @return  The resulting Excel font index. */
-    sal_uInt16                  Insert( const Font& rFont, bool bAppFont = false );
+    sal_uInt16          Insert( const Font& rFont, bool bAppFont = false );
     /** Inserts the SvxFont into the buffer if not present i.e. where escapements are used
         @param bAppFont  true = Sets the application font; false = Inserts a new font.
         @return  The resulting Excel font index. */
-    sal_uInt16                  Insert( const SvxFont& rFont, bool bAppFont = false );
+    sal_uInt16          Insert( const SvxFont& rFont, bool bAppFont = false );
     /** Inserts the font contained in the passed item set into the buffer, if not present.
         @param bAppFont  true = Sets the application font; false = Inserts a new font.
         @return  The resulting Excel font index. */
-    sal_uInt16                  Insert( const SfxItemSet& rItemSet, bool bAppFont = false );
+    sal_uInt16          Insert( const SfxItemSet& rItemSet, bool bAppFont = false );
     /** Inserts the font contained in rPattern into the buffer if not present.
         @param bAppFont  true = Sets the application font; false = Inserts a new font.
         @return  The resulting Excel font index. */
-    sal_uInt16                  Insert( const ScPatternAttr& rPattern, bool bAppFont = false );
+    sal_uInt16          Insert( const ScPatternAttr& rPattern, bool bAppFont = false );
 
     /** Writes all FONT records contained in this buffer. */
-    virtual void                Save( XclExpStream& rStrm );
+    virtual void        Save( XclExpStream& rStrm );
 
 private:
     /** Initializes the default fonts for the current BIFF version. */
-    void                        InitDefaultFonts();
-    /** Converts a list index into Excel font index. */
-    sal_uInt16                  GetXclIndex( sal_uInt32 nIndex ) const;
+    void                InitDefaultFonts();
     /** Tries to find the passed font and returns the current list index. */
-    sal_uInt32                  Find( const XclExpFont& rFont );
+    size_t              Find( const XclExpFontData& rFontData );
 
 private:
-    typedef XclExpRecordList< XclExpFont > XclExpFontList;
+    typedef XclExpRecordList< XclExpFont >  XclExpFontList;
+    typedef XclExpFontList::RecordRefType   XclExpFontRef;
 
-    XclExpFontList              maFontList;     /// List of all FONT records.
-    XclFontData                 maAppFont;      /// Application font (for column width).
-    sal_uInt32                  mnXclMaxCount;  /// Maximum number of fonts.
+    XclExpFontList      maFontList;     /// List of all FONT records.
+    size_t              mnXclMaxSize;   /// Maximum number of fonts.
 };
 
-
 // FORMAT record - number formats =============================================
 
 /** Stores a core number format index with corresponding Excel format index. */
 struct XclExpNumFmt
 {
-    sal_uInt32                  mnFormatIx;     /// Core index of the number format.
-    sal_uInt16                  mnXclIx;        /// Resulting Excel format index.
+    ULONG               mnScNumFmt;     /// Core index of the number format.
+    sal_uInt16          mnXclNumFmt;    /// Resulting Excel format index.
 
-    inline explicit             XclExpNumFmt( sal_uInt32 nFormatIx, sal_uInt16 nXclIx ) :
-                                    mnFormatIx( nFormatIx ), mnXclIx( nXclIx ) {}
+    inline explicit     XclExpNumFmt( ULONG nScNumFmt, sal_uInt16 nXclNumFmt ) :
+                            mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ) {}
 };
 
-
 // ----------------------------------------------------------------------------
 
 class SvNumberFormatter;
@@ -395,40 +424,39 @@ class SvNumberFormatter;
 class XclExpNumFmtBuffer : public XclExpRecordBase, protected XclExpRoot
 {
 public:
-    explicit                    XclExpNumFmtBuffer( const XclExpRoot& rRoot );
+    explicit            XclExpNumFmtBuffer( const XclExpRoot& rRoot );
 
-    virtual                     ~XclExpNumFmtBuffer();
+    virtual             ~XclExpNumFmtBuffer();
 
     /** Returns the core index of the current standard number format. */
-    inline sal_uInt32           GetStandardFormat() const { return mnStdFmt; }
+    inline ULONG        GetStandardFormat() const { return mnStdFmt; }
 
     /** Inserts a number format into the format buffer.
-        @param nFormatIx  The core index of the number format.
+        @param nScNumFmt  The core index of the number format.
         @return  The resulting Excel format index. */
-    sal_uInt16                  Insert( sal_uInt32 nScFormatIx );
+    sal_uInt16          Insert( ULONG nScNumFmt );
 
     /** Writes all FORMAT records contained in this buffer. */
-    virtual void                Save( XclExpStream& rStrm );
+    virtual void        Save( XclExpStream& rStrm );
 
 private:
     /** Writes the FORMAT record with index nXclIx and format string rFormatStr. */
-    void                        WriteFormatRecord( XclExpStream& rStrm, sal_uInt16 nXclIx, const String& rFormatStr );
+    void                WriteFormatRecord( XclExpStream& rStrm, sal_uInt16 nXclNumFmt, const String& rFormatStr );
     /** Writes the FORMAT record represented by rFormat. */
-    void                        WriteFormatRecord( XclExpStream& rStrm, const XclExpNumFmt& rFormat );
+    void                WriteFormatRecord( XclExpStream& rStrm, const XclExpNumFmt& rFormat );
 
 private:
     typedef ::std::auto_ptr< SvNumberFormatter >    SvNumberFormatterPtr;
     typedef NfKeywordTable*                         NfKeywordTablePtr;
     typedef ::std::vector< XclExpNumFmt >           XclExpNumFmtVec;
 
-    SvNumberFormatterPtr        mpFormatter;    /// Special number formatter for conversion.
-    NfKeywordTablePtr           mpKeywordTable; /// Replacement table.
-    XclExpNumFmtVec             maFormatMap;    /// Maps core formats to Excel indexes.
-    sal_uInt32                  mnStdFmt;       /// Key for standard number format.
-    sal_uInt16                  mnXclOffset;    /// Offset to first user defined format.
+    SvNumberFormatterPtr mxFormatter;   /// Special number formatter for conversion.
+    NfKeywordTablePtr   mpKeywordTable; /// Replacement table.
+    XclExpNumFmtVec     maFormatMap;    /// Maps core formats to Excel indexes.
+    ULONG               mnStdFmt;       /// Key for standard number format.
+    sal_uInt16          mnXclOffset;    /// Offset to first user defined format.
 };
 
-
 // XF, STYLE record - Cell formatting =========================================
 
 /** Extends the XclCellProt struct for export.
@@ -438,17 +466,16 @@ struct XclExpCellProt : public XclCellProt
     /** Fills the protection attributes from the passed item set.
         @descr  Fills only the attributes exported in the passed BIFF version.
         @return  true = At least one protection item is set. */
-    bool                        FillFromItemSet( const SfxItemSet& rItemSet, XclBiff eBiff, bool bStyle = false );
+    bool                FillFromItemSet( const SfxItemSet& rItemSet, XclBiff eBiff, bool bStyle = false );
 
 #if 0
     /** Fills the data to the passed fields of a BIFF2 XF record. */
-    void                        FillToXF2( sal_uInt8& rnNumFmt ) const;
+    void                FillToXF2( sal_uInt8& rnNumFmt ) const;
 #endif
     /** Fills the data to the passed fields of a BIFF3-BIFF8 XF record. */
-    void                        FillToXF3( sal_uInt16& rnProt ) const;
+    void                FillToXF3( sal_uInt16& rnProt ) const;
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Extends the XclCellAlign struct for export.
@@ -457,101 +484,111 @@ struct XclExpCellAlign : public XclCellAlign
 {
     /** Fills the alignment attributes from the passed item set.
         @descr  Fills only the attributes exported in the passed BIFF version.
-        @param bForceWrapped  true = Set text wrap flag unconditionally.
+        @param bForceLineBreak  true = Set line break flag unconditionally.
         @return  true = At least one alignment item is set. */
-    bool                        FillFromItemSet(
-                                    const SfxItemSet& rItemSet, XclBiff eBiff,
-                                    bool bForceWrapped = false, bool bStyle = false );
+    bool                FillFromItemSet( const SfxItemSet& rItemSet,
+                            bool bForceLineBreak, XclBiff eBiff, bool bStyle = false );
 
 #if 0
     /** Fills the data to the passed fields of a BIFF2 XF record. */
-    void                        FillToXF2( sal_uInt8& rnFlags ) const;
+    void                FillToXF2( sal_uInt8& rnFlags ) const;
     /** Fills the data to the passed fields of a BIFF3 XF record. */
-    void                        FillToXF3( sal_uInt16& rnAlign ) const;
+    void                FillToXF3( sal_uInt16& rnAlign ) const;
     /** Fills the data to the passed fields of a BIFF4 XF record. */
-    void                        FillToXF4( sal_uInt16& rnAlign ) const;
+    void                FillToXF4( sal_uInt16& rnAlign ) const;
 #endif
     /** Fills the data to the passed fields of a BIFF5/BIFF7 XF record. */
-    void                        FillToXF5( sal_uInt16& rnAlign ) const;
+    void                FillToXF5( sal_uInt16& rnAlign ) const;
     /** Fills the data to the passed fields of a BIFF8 XF record. */
-    void                        FillToXF8( sal_uInt16& rnAlign, sal_uInt16& rnMiscAttrib ) const;
+    void                FillToXF8( sal_uInt16& rnAlign, sal_uInt16& rnMiscAttrib ) const;
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Extends the XclCellBorder struct for export.
     @descr  Provides functions to fill from item sets and to fill to Excel record data. */
 struct XclExpCellBorder : public XclCellBorder
 {
-    sal_uInt32                  mnLeftColorId;      /// Color ID for left line.
-    sal_uInt32                  mnRightColorId;     /// Color ID for right line.
-    sal_uInt32                  mnTopColorId;       /// Color ID for top line.
-    sal_uInt32                  mnBottomColorId;    /// Color ID for bottom line.
-    sal_uInt32                  mnDiagColorId;      /// Color ID for diagonal line(s).
+    sal_uInt32          mnLeftColorId;      /// Color ID for left line.
+    sal_uInt32          mnRightColorId;     /// Color ID for right line.
+    sal_uInt32          mnTopColorId;       /// Color ID for top line.
+    sal_uInt32          mnBottomColorId;    /// Color ID for bottom line.
+    sal_uInt32          mnDiagColorId;      /// Color ID for diagonal line(s).
 
-    explicit                    XclExpCellBorder();
+    explicit            XclExpCellBorder();
 
     /** Fills the border attributes from the passed item set.
         @descr  Fills only the attributes exported in the passed BIFF version.
         @return  true = At least one border item is set. */
-    bool                        FillFromItemSet(
-                                    const SfxItemSet& rItemSet, XclExpPalette& rPalette,
-                                    XclBiff eBiff, bool bStyle = false );
+    bool                FillFromItemSet( const SfxItemSet& rItemSet,
+                            XclExpPalette& rPalette, XclBiff eBiff, bool bStyle = false );
     /** Fills the mn***Color base members from the mn***ColorId members. */
-    void                        SetFinalColors( const XclExpPalette& rPalette );
+    void                SetFinalColors( const XclExpPalette& rPalette );
 
 #if 0
     /** Fills the data to the passed fields of a BIFF2 XF record. */
-    void                        FillToXF2( sal_uInt8& rnFlags ) const;
+    void                FillToXF2( sal_uInt8& rnFlags ) const;
     /** Fills the data to the passed fields of a BIFF3/BIFF4 XF record. */
-    void                        FillToXF3( sal_uInt32& rnBorder ) const;
+    void                FillToXF3( sal_uInt32& rnBorder ) const;
 #endif
     /** Fills the data to the passed fields of a BIFF5/BIFF7 XF record. */
-    void                        FillToXF5( sal_uInt32& rnBorder, sal_uInt32& rnArea ) const;
+    void                FillToXF5( sal_uInt32& rnBorder, sal_uInt32& rnArea ) const;
     /** Fills the data to the passed fields of a BIFF8 XF record. */
-    void                        FillToXF8( sal_uInt32& rnBorder1, sal_uInt32& rnBorder2 ) const;
+    void                FillToXF8( sal_uInt32& rnBorder1, sal_uInt32& rnBorder2 ) const;
 
     /** Fills the data to the passed fields of a BIFF8 CF (conditional format) record. */
-    void                        FillToCF8( sal_uInt16& rnLine, sal_uInt32& rnColor ) const;
+    void                FillToCF8( sal_uInt16& rnLine, sal_uInt32& rnColor ) const;
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Extends the XclCellArea struct for export.
     @descr  Provides functions to fill from item sets and to fill to Excel record data. */
 struct XclExpCellArea : public XclCellArea
 {
-    sal_uInt32                  mnForeColorId;  /// Foreground color ID.
-    sal_uInt32                  mnBackColorId;  /// Background color ID.
+    sal_uInt32          mnForeColorId;  /// Foreground color ID.
+    sal_uInt32          mnBackColorId;  /// Background color ID.
 
-    explicit                    XclExpCellArea();
+    explicit            XclExpCellArea();
 
     /** Fills the area attributes from the passed item set.
         @descr  Fills only the attributes exported in the passed BIFF version.
         @return  true = At least one area item is set. */
-    bool                        FillFromItemSet(
-                                    const SfxItemSet& rItemSet, XclExpPalette& rPalette,
-                                    XclBiff eBiff, bool bStyle = false );
+    bool                FillFromItemSet(
+                            const SfxItemSet& rItemSet, XclExpPalette& rPalette,
+                            XclBiff eBiff, bool bStyle = false );
     /** Fills the mn***Color base members from the mn***ColorId members. */
-    void                        SetFinalColors( const XclExpPalette& rPalette );
+    void                SetFinalColors( const XclExpPalette& rPalette );
 
 #if 0
     /** Fills the data to the passed fields of a BIFF2 XF record. */
-    void                        FillToXF2( sal_uInt8& rnFlags ) const;
+    void                FillToXF2( sal_uInt8& rnFlags ) const;
     /** Fills the data to the passed fields of a BIFF3/BIFF4 XF record. */
-    void                        FillToXF3( sal_uInt16& rnArea ) const;
+    void                FillToXF3( sal_uInt16& rnArea ) const;
 #endif
     /** Fills the data to the passed fields of a BIFF5/BIFF7 XF record. */
-    void                        FillToXF5( sal_uInt32& rnArea ) const;
+    void                FillToXF5( sal_uInt32& rnArea ) const;
     /** Fills the data to the passed fields of a BIFF8 XF record. */
-    void                        FillToXF8( sal_uInt32& rnBorder2, sal_uInt16& rnArea ) const;
+    void                FillToXF8( sal_uInt32& rnBorder2, sal_uInt16& rnArea ) const;
 
     /** Fills the data to the passed fields of a BIFF8 CF (conditional format) record. */
-    void                        FillToCF8( sal_uInt16& rnPattern, sal_uInt16& rnColor ) const;
+    void                FillToCF8( sal_uInt16& rnPattern, sal_uInt16& rnColor ) const;
 };
 
+// ----------------------------------------------------------------------------
+
+/** A combination of unique XF identifier with real Excel XF index. */
+struct XclExpXFId
+{
+    sal_uInt32          mnXFId;         /// Temporary XF identifier.
+    sal_uInt16          mnXFIndex;      /// Real Excel XF index.
+
+    explicit            XclExpXFId();
+    explicit            XclExpXFId( sal_uInt32 nXFId );
+
+    /** Converts the XF identifier in mnXFId to an Excel XF index and stores it in mnXFIndex. */
+    void                ConvertXFIndex( const XclExpRoot& rRoot );
+};
 
 // ----------------------------------------------------------------------------
 
@@ -561,110 +598,106 @@ class SfxStyleSheetBase;
 class XclExpXF : public XclXFBase, public XclExpRecord, protected XclExpRoot
 {
 public:
-    /** Constructs a cell XF record from the passed Calc cell formatting.
-        @param nForcedNumFmt  If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite
-        the number format of the passed item set.
-        @param bForceWrapped  true = set text wrap flag unconditionally. */
-    explicit                    XclExpXF(
-                                    const XclExpRoot& rRoot,
-                                    const ScPatternAttr& rPattern,
-                                    sal_uInt32 nForcedNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND,
-                                    bool bForceWrapped = false,
-                                    sal_uInt16 nFontIx = EXC_FONT_NOTFOUND);
+    /** Constructs a cell XF record from the passed Calc cell formatting. */
+    explicit            XclExpXF(
+                            const XclExpRoot& rRoot,
+                            const ScPatternAttr& rPattern,
+                            ULONG nScForceNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND,
+                            sal_uInt16 nForceXclFont = EXC_FONT_NOTFOUND,
+                            bool bForceLineBreak = false );
     /** Constructs a style XF record from the passed cell style sheet. */
-    explicit                    XclExpXF(
-                                    const XclExpRoot& rRoot,
-                                    const SfxStyleSheetBase& rStyleSheet );
+    explicit            XclExpXF(
+                            const XclExpRoot& rRoot,
+                            const SfxStyleSheetBase& rStyleSheet );
 
     /** Returns true, if this XF record represents the passed cell formatting.
         @descr  Searches for cell XFs only. */
-    bool                        Equals(
-                                    const ScPatternAttr& rPattern,
-                                    sal_uInt32 nForcedNumFmt,
-                                    bool bForceWrapped,
-                    sal_uInt16 nFontIx ) const;
+    bool                Equals(
+                            const ScPatternAttr& rPattern,
+                            ULONG nScForceNumFmt,
+                            sal_uInt16 nForceXclFont,
+                            bool bForceLineBreak ) const;
 
     /** Returns true, if this XF record represents the passed style.
         @descr  Searches for style XFs only. */
-    bool                        Equals( const SfxStyleSheetBase& rStyleSheet ) const;
+    bool                Equals( const SfxStyleSheetBase& rStyleSheet ) const;
 
     /** Sets the resulting Excel palette index from all used color IDs (border and area). */
-    void                        SetFinalColors();
+    void                SetFinalColors();
 
     /** Returns true, if this XF record is completely equal to the passed. */
-    bool                        Equals( const XclExpXF& rCmpXF ) const;
+    bool                Equals( const XclExpXF& rCmpXF ) const;
 
 protected:
-    explicit                    XclExpXF( const XclExpRoot& rRoot, bool bCellXF );
+    explicit            XclExpXF( const XclExpRoot& rRoot, bool bCellXF );
 
 protected:  // access for XclExpDefaultXF
-    const SfxItemSet*           mpItemSet;          /// Pointer to the item set (we do not own it).
+    const SfxItemSet*   mpItemSet;          /// Pointer to the item set (we do not own it).
 
-    XclExpCellProt              maProtection;       /// Cell protection flags.
-    XclExpCellAlign             maAlignment;        /// All alignment attributes.
-    XclExpCellBorder            maBorder;           /// Border line style.
-    XclExpCellArea              maArea;             /// Background area style.
-    sal_uInt32                  mnParentXFId;       /// XF ID of parent XF record.
-    sal_uInt16                  mnFont;             /// Excel font index.
-    sal_uInt16                  mnNumFmt;           /// Excel number format index.
+    XclExpCellProt      maProtection;       /// Cell protection flags.
+    XclExpCellAlign     maAlignment;        /// All alignment attributes.
+    XclExpCellBorder    maBorder;           /// Border line style.
+    XclExpCellArea      maArea;             /// Background area style.
+    sal_uInt32          mnParentXFId;       /// XF ID of parent XF record.
+    ULONG               mnScNumFmt;         /// Calc number format index.
+    sal_uInt16          mnXclFont;          /// Excel font index.
+    sal_uInt16          mnXclNumFmt;        /// Excel number format index.
 
 private:
     /** Initializes with default values. */
-    void                        InitDefault();
+    void                InitDefault();
     /** Fills all members from the passed item set.
         @param bDefStyle  true = This is the "Default"/"Normal" style - needs special handling. */
-    void                        Init(
-                                    const SfxItemSet& rItemSet,
-                                    sal_uInt32 nForcedNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND,
-                                    bool bForceWrapped = false,
-                                    sal_uInt16 nFontIx = EXC_FONT_NOTFOUND,
-                                    bool bDefStyle = false);
+    void                Init(
+                            const SfxItemSet& rItemSet,
+                            ULONG nForceScNumFmt,
+                            sal_uInt16 nForceXclFont,
+                            bool bForceLineBreak,
+                            bool bDefStyle );
 
     /** Returns the bits specifying the used attributes.
         @descr  In cell XFs a set bit means a used attribute, in style XF a cleared
         bit means a used attribute. This method regards the cell/style state.
         @return  The mask based on bit 0 (not yet bit-shifted as needed for export). */
-    sal_uInt8                   GetUsedFlags() const;
+    sal_uInt8           GetUsedFlags() const;
 
-    void                        WriteBody5( XclExpStream& rStrm );
-    void                        WriteBody8( XclExpStream& rStrm );
+    void                WriteBody5( XclExpStream& rStrm );
+    void                WriteBody8( XclExpStream& rStrm );
 
     /** Writes the contents of the XF record. */
-    virtual void                WriteBody( XclExpStream& rStrm );
+    virtual void        WriteBody( XclExpStream& rStrm );
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Represents a default XF record. Supports methods to set attributes directly. */
 class XclExpDefaultXF : public XclExpXF
 {
 public:
-    explicit                    XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF );
+    explicit            XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF );
 
     /** Sets the parent XF ID. Only allowed for cell XFs. */
-    void                        SetParent( sal_uInt32 nParentXFId );
+    void                SetParent( sal_uInt32 nParentXFId );
 
     /** Sets all "attribute used" flags explicitely.
         @descr  The following Set***() functions set the appropriate flag too. */
-    void                        SetUsedFlags(
-                                    bool bProtUsed, bool bFontUsed, bool bFmtUsed,
-                                    bool bAlignUsed, bool bBorderUsed, bool bAreaUsed );
+    void                SetUsedFlags(
+                            bool bProtUsed, bool bFontUsed, bool bFmtUsed,
+                            bool bAlignUsed, bool bBorderUsed, bool bAreaUsed );
     /** Sets the cell protection flags. */
-    void                        SetProtection( const XclExpCellProt& rProtection );
+    void                SetProtection( const XclExpCellProt& rProtection );
     /** Sets the Excel font index. */
-    void                        SetFont( sal_uInt16 nFont );
+    void                SetFont( sal_uInt16 nXclFont );
     /** Sets the Excel number format index. */
-    void                        SetNumFmt( sal_uInt16 nNumFmt );
+    void                SetNumFmt( sal_uInt16 nXclNumFmt );
     /** Sets cell alignment attributes. */
-    void                        SetAlignment( const XclExpCellAlign& rAlignment );
+    void                SetAlignment( const XclExpCellAlign& rAlignment );
     /** Sets a cell border style. */
-    void                        SetBorder( const XclExpCellBorder& rBorder );
+    void                SetBorder( const XclExpCellBorder& rBorder );
     /** Sets a cell area style. */
-    void                        SetArea( const XclExpCellArea& rArea );
+    void                SetArea( const XclExpCellArea& rArea );
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Represents a STYLE record containing the data of a cell style.
@@ -672,115 +705,146 @@ public:
 class XclExpStyle : public XclExpRecord
 {
 public:
-    explicit                    XclExpStyle( sal_uInt32 nXFId, const String& rStyleName );
-    explicit                    XclExpStyle( sal_uInt32 nXFId, sal_uInt8 nStyleId, sal_uInt8 nLevel = EXC_STYLE_NOLEVEL );
+    explicit            XclExpStyle( sal_uInt32 nXFId, const String& rStyleName );
+    explicit            XclExpStyle( sal_uInt32 nXFId, sal_uInt8 nStyleId, sal_uInt8 nLevel = EXC_STYLE_NOLEVEL );
 
-    /** Returns the index of the XF record used by this style. */
-    inline sal_uInt32           GetXFId() const { return mnXFId; }
     /** Returns true, if this record represents an Excel built-in style. */
-    inline bool                 IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }
+    inline bool         IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }
 
 private:
     /** Writes the contents of the STYLE record. */
-    virtual void                WriteBody( XclExpStream& rStrm );
+    virtual void        WriteBody( XclExpStream& rStrm );
 
 private:
-    String                      maName;         /// Name of the cell style.
-    sal_uInt32                  mnXFId;         /// XF record ID with style formatting.
-    sal_uInt8                   mnStyleId;      /// Built-in style identifier.
-    sal_uInt8                   mnLevel;        /// Outline level for RowLevel and ColLevel styles.
+    String              maName;         /// Name of the cell style.
+    XclExpXFId          maXFId;         /// XF identifier for style formatting.
+    sal_uInt8           mnStyleId;      /// Built-in style identifier.
+    sal_uInt8           mnLevel;        /// Outline level for RowLevel and ColLevel styles.
 };
 
-
 // ----------------------------------------------------------------------------
 
 /** Stores all XF records (cell formats and cell styles) in the document.
-    @descr  Stores also the names of user defined cell styles (STYLE records).
-    Supports reduction to the maximum count of XF records of the current BIFF version.
-    An instance of this class collects all XF records in the conversion phase of the export,
-    using the Insert() and InsertStyle() functions. It returns a unique identidier for each
-    XF record. After the entire document is converted, the list will be reduced to the
-    number of XF records supported by the current BIFF version, using the function Reduce().
-    Then, in the streaming phase, the function GetXFIndex() returns the real Excel XF index
-    for all XF identifiers. */
+
+    Stores also the names of user defined cell styles (STYLE records). Supports
+    reduction to the maximum count of XF records of the current BIFF version.
+
+    An instance of this class collects all XF records in the conversion phase
+    of the export, using the Insert() and InsertStyle() functions. It returns a
+    unique identidier for each XF record.
+
+    After the entire document is converted, the Finalize() function will reduce
+    the list to the number of XF records supported by the current BIFF version.
+
+    Then, in the streaming phase, the function GetXFIndex() returns the real
+    Excel XF index for all XF identifiers.
+ */
 class XclExpXFBuffer : public XclExpRecordBase, protected XclExpRoot
 {
 public:
-    explicit                    XclExpXFBuffer( const XclExpRoot& rRoot );
+    explicit            XclExpXFBuffer( const XclExpRoot& rRoot );
 
     /** Inserts predefined built-in styles and user-defined styles. */
-    void                        InitDefaults();
+    void                InitDefaults();
 
     /** Finds or creates a cell XF record for the passed item set.
-        @param bForceWrapped  true = cell contains hard newlines.
-        In this case the text wrap flag must be set in the XF record.
         @return  A unique XF record ID. */
-    sal_uInt32                  Insert( const ScPatternAttr* pPattern, bool bForceWrapped = false, sal_uInt16 nFontIx = EXC_FONT_NOTFOUND );
+    sal_uInt32          Insert( const ScPatternAttr* pPattern );
+    /** Finds or creates a cell XF record for the passed item set.
+        @param nForceXclFont  The font to be exported. If not equal to EXC_FONT_NOTFOUND,
+            this font index will be used unconditionally and the cell font will be ignored.
+        @param bForceLineBreak  true = Set line break flag unconditionally.
+            This is required for cells that contain multi-line text.
+        @return  A unique XF record ID. */
+    sal_uInt32          InsertWithFont(
+                            const ScPatternAttr* pPattern,
+                            sal_uInt16 nForceXclFont,
+                            bool bForceLineBreak );
     /** Finds or creates a cell XF record for the passed item set, with custom number format.
-        @param nForcedNumFmt  The number format to be exported, i.e. formula result type.
-        This format will always overwrite the cell's number format.
+        @param nXFFlags  Additional flags allowing to control the creation of an XF.
+        @param nForceScNumFmt  The number format to be exported, i.e. formula
+            result type. This format will always overwrite the cell's number format.
         @return  A unique XF record ID. */
-    sal_uInt32                  Insert( const ScPatternAttr* pPattern, sal_uInt32 nForcedNumFmt );
+    sal_uInt32          InsertWithNumFmt(
+                            const ScPatternAttr* pPattern,
+                            ULONG nForceScNumFmt );
     /** Inserts the passed cell style. Creates a style XF record and a STYLE record.
         @return  A unique XF record ID. */
-    sal_uInt32                  InsertStyle( const SfxStyleSheetBase* pStyleSheet );
-    /** Returns the XF ID representing a fixed Excel XF index (i.e. for built-in XFs). */
-    static sal_uInt32           GetXFIdFromIndex( sal_uInt16 nXFIndex );
+    sal_uInt32          InsertStyle( const SfxStyleSheetBase* pStyleSheet );
+    /** Returns the XF identifier representing a fixed Excel XF index (i.e. for built-in XFs). */
+    static sal_uInt32   GetXFIdFromIndex( sal_uInt16 nXFIndex );
+    /** Returns the XF identifier representing the default cell XF. */
+    static sal_uInt32   GetDefCellXFId();
 
     /** Reduces the XF record list to the maximum allowed number of records. */
-    void                        Reduce();
+    void                Finalize();
 
     /** Returns the Excel XF index of the XF record with passed XF ID. */
-    sal_uInt16                  GetXFIndex( sal_uInt32 nXFId ) const;
+    sal_uInt16          GetXFIndex( sal_uInt32 nXFId ) const;
 
     /** Writes all XF records contained in this buffer. */
-    virtual void                Save( XclExpStream& rStrm );
+    virtual void        Save( XclExpStream& rStrm );
+
+private:
+    typedef XclExpRecordList< XclExpXF >    XclExpXFList;
+    typedef XclExpXFList::RecordRefType     XclExpXFRef;
+    typedef XclExpRecordList< XclExpStyle > XclExpStyleList;
+    typedef XclExpStyleList::RecordRefType  XclExpStyleRef;
 
 private:
     /** Returns the XF ID of the cell XF containing the passed format. */
-    sal_uInt32                  FindXF(
-                                    const ScPatternAttr& rPattern,
-                                    sal_uInt32 nForcedNumFmt, bool bForceWrapped, sal_uInt16 nFontIx ) const;
+    sal_uInt32          FindXF( const ScPatternAttr& rPattern, ULONG nForceScNumFmt,
+                            sal_uInt16 nForceXclFont, bool bForceLineBreak ) const;
     /** Returns the XF ID of the style XF containing the passed style. */
-    sal_uInt32                  FindXF( const SfxStyleSheetBase& rStyleSheet ) const;
+    sal_uInt32          FindXF( const SfxStyleSheetBase& rStyleSheet ) const;
 
-    /** Returns the style list index of the STYLE record containing the passed XF ID. */
-    sal_uInt32                  FindStyle( sal_uInt32 nXFId ) const;
+    /** Returns the XF ID of a built-in style XF, searches by style identifier. */
+    sal_uInt32          FindBuiltInXF( sal_uInt8 nStyleId, sal_uInt8 nLevel = EXC_STYLE_NOLEVEL ) const;
 
     /** Tries to find the XF record containing the passed format or inserts a new record.
         @return  The XF record ID. */
-    sal_uInt32                  InsertCellXF(
-                                    const ScPatternAttr* pPattern,
-                                    sal_uInt32 nForcedNumFmt, bool bForceWrapped, sal_uInt16 nFontIx );
+    sal_uInt32          InsertCellXF( const ScPatternAttr* pPattern, ULONG nForceScNumFmt,
+                            sal_uInt16 nForceXclFont, bool bForceLineBreak );
     /** Inserts the passed cell style. Creates a style XF record and a STYLE record.
         @return  The XF record ID. */
-    sal_uInt32                  InsertStyleXF( const SfxStyleSheetBase& rStyleSheet );
+    sal_uInt32          InsertStyleXF( const SfxStyleSheetBase& rStyleSheet );
 
     /** Inserts an XF and a STYLE record for all user defined style sheets. */
-    void                        InsertUserStyles();
+    void                InsertUserStyles();
+
+    /** Inserts a built-in XF record without a STYLE record and returns the XF ID.
+        @param bCreateStyleRec  true = Creates the related STYLE record. */
+    sal_uInt32          AppendBuiltInXF( XclExpXFRef xXF,
+                            sal_uInt8 nStyleId, sal_uInt8 nLevel = EXC_STYLE_NOLEVEL );
+    /** Inserts a built-in XF and STYLE record and returns the XF ID.
+        @param bCreateStyleRec  true = Creates the related STYLE record. */
+    sal_uInt32          AppendBuiltInXFWithStyle( XclExpXFRef xXF,
+                            sal_uInt8 nStyleId, sal_uInt8 nLevel = EXC_STYLE_NOLEVEL );
 
-    /** Inserts a default XF and STYLE record. */
-    void                        InsertDefaultStyle( XclExpXF* pXF, sal_uInt8 nStyleId, sal_uInt8 nLevel = 0xFF );
     /** Inserts all default XF and STYLE records. */
-    void                        InsertDefaultRecords();
+    void                InsertDefaultRecords();
 
     /** Appends a XF index to the internal ID<->index maps. */
-    void                        AppendXFIndex( sal_uInt32 nXFId );
+    void                AppendXFIndex( sal_uInt32 nXFId );
 
 private:
-    typedef ScfDelList< XclExpXF >          XclExpXFList;
-    typedef XclExpRecordList< XclExpStyle > XclExpStyleList;
-    typedef ::std::vector< bool >           BoolVec;
-    typedef ::std::vector< sal_uInt16 >     XclExpXFIndexVec;
-    typedef ::std::vector< XclExpXF* >      XclExpXFPtrVec;
-
-    XclExpXFList                maXFList;       /// List of all XF records.
-    XclExpStyleList             maStyleList;    /// List of all STYLE records.
-    BoolVec                     maPredefined;   /// true = Corresponding XF still predefined.
-    XclExpXFIndexVec            maXFIndexVec;   /// Maps XF IDs to XF indexes.
-    XclExpXFPtrVec              maXFPtrVec;     /// Pointer to XF records in resulting export order.
-};
+    /** Extended info about a built-in XF. */
+    struct XclExpBuiltInInfo
+    {
+        sal_uInt8           mnStyleId;          /// Built-in style identifier.
+        sal_uInt8           mnLevel;            /// Level for RowLevel/ColLevel styles.
+        bool                mbPredefined;       /// true = XF still predefined.
+        bool                mbHasStyleRec;      /// true = STYLE record created.
+        explicit            XclExpBuiltInInfo();
+    };
+    typedef ::std::map< sal_uInt32, XclExpBuiltInInfo > XclExpBuiltInMap;
 
+    XclExpXFList        maXFList;           /// List of all XF records.
+    XclExpStyleList     maStyleList;        /// List of all STYLE records.
+    XclExpBuiltInMap    maBuiltInMap;       /// Contained elements describe built-in XFs.
+    ScfUInt16Vec        maXFIndexVec;       /// Maps XF IDs to XF indexes.
+    XclExpXFList        maSortedXFList;     /// List of XF records in XF index order.
+};
 
 // ============================================================================