INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/01/24 14:57:20 dr 1.2.4.1: OOBIN additions, BIFF string handling

4 files changed, 44 insertions, 24 deletions

diff --git a/oox/inc/oox/xls/excelfilter.hxx b/oox/inc/oox/xls/excelfilter.hxx
index 89f034152103..815d0d12616f 100644
--- a/oox/inc/oox/xls/excelfilter.hxx
+++ b/oox/inc/oox/xls/excelfilter.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: excelfilter.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:03:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -58,13 +58,11 @@ public:
 
     virtual sal_Int32   getSchemeClr( sal_Int32 nColorSchemeToken ) const;
     virtual const ::oox::vml::DrawingPtr getDrawings();
-    virtual ::oox::core::RecordInfoProviderRef getRecordInfoProvider();
 
 private:
     virtual ::rtl::OUString implGetImplementationName() const;
 
 private:
-    ::oox::core::RecordInfoProviderRef mxRecInfoProv;
     WorkbookHelper*     mpHelper;
 };
 
diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx b/oox/inc/oox/xls/externallinkbuffer.hxx
index ba6a8f71edc1..51cbb222129f 100644
--- a/oox/inc/oox/xls/externallinkbuffer.hxx
+++ b/oox/inc/oox/xls/externallinkbuffer.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: externallinkbuffer.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:03:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -57,20 +57,21 @@ struct LinkSheetRange
 {
     sal_Int32           mnFirst;        /// Index of the first sheet.
     sal_Int32           mnLast;         /// Index of the last sheet.
+    bool                mbRel;          /// True = relative indexes.
 
     inline explicit     LinkSheetRange() { setDeleted(); }
-    inline explicit     LinkSheetRange( sal_Int32 nFirst, sal_Int32 nLast ) { set( nFirst, nLast ); }
+    inline explicit     LinkSheetRange( sal_Int32 nFirst, sal_Int32 nLast ) { setRange( nFirst, nLast ); }
 
     /** Sets this struct to deleted state. */
-    inline void         setDeleted() { mnFirst = mnLast = -1; }
-    /** Sets the passed sheet range to the memebers of this struct. */
-    inline void         set( sal_Int32 nFirst, sal_Int32 nLast )
-                            { mnFirst = ::std::min( nFirst, nLast ); mnLast = ::std::max( nFirst, nLast ); }
+    inline void         setDeleted() { mnFirst = mnLast = -1; mbRel = false; }
+    /** Sets this struct to use current sheet state. */
+    inline void         setRelative() { mnFirst = mnLast = 0; mbRel = true; }
+    /** Sets the passed absolute sheet range to the memebers of this struct. */
+    inline void         setRange( sal_Int32 nFirst, sal_Int32 nLast )
+                            { mnFirst = ::std::min( nFirst, nLast ); mnLast = ::std::max( nFirst, nLast ); mbRel = false; }
 
-    /** Returns true, if one of the sheet indexes in invalid (negative). */
-    inline bool         isDeleted() const { return (mnFirst < 0) || (mnLast < 0); }
     /** Returns true, if the sheet indexes are valid and different. */
-    inline bool         is3dRange() const { return !isDeleted() && (mnFirst < mnLast); }
+    inline bool         is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); }
 };
 
 // ============================================================================
@@ -162,7 +163,8 @@ typedef ::boost::shared_ptr< ExternalName > ExternalNameRef;
 
 enum ExternalLinkType
 {
-    LINKTYPE_SELF,          /// Link refers to the current workbook or sheet.
+    LINKTYPE_SELF,          /// Link refers to the current workbook.
+    LINKTYPE_SAME,          /// Link refers to the current sheet.
     LINKTYPE_INTERNAL,      /// Link refers to a sheet in the own workbook.
     LINKTYPE_EXTERNAL,      /// Link refers to an external spreadsheet document.
     LINKTYPE_ANALYSIS,      /// Link refers to Analysis add-in.
@@ -206,6 +208,10 @@ public:
     void                importExternalRef( RecordInputStream& rStrm );
     /** Imports the EXTERNALSELF record from the passed stream. */
     void                importExternalSelf( RecordInputStream& rStrm );
+    /** Imports the EXTERNALSAME record from the passed stream. */
+    void                importExternalSame( RecordInputStream& rStrm );
+    /** Imports the EXTERNALADDIN record from the passed stream. */
+    void                importExternalAddin( RecordInputStream& rStrm );
 
     /** Imports the EXTERNSHEET record from the passed stream. */
     void                importExternSheet( BiffInputStream& rStrm );
@@ -288,6 +294,10 @@ public:
     ExternalLinkRef     importExternalRef( RecordInputStream& rStrm );
     /** Imports the EXTERNALSELF record from the passed stream. */
     void                importExternalSelf( RecordInputStream& rStrm );
+    /** Imports the EXTERNALSAME record from the passed stream. */
+    void                importExternalSame( RecordInputStream& rStrm );
+    /** Imports the EXTERNALADDIN record from the passed stream. */
+    void                importExternalAddin( RecordInputStream& rStrm );
     /** Imports the EXTERNALSHEETS record from the passed stream. */
     void                importExternalSheets( RecordInputStream& rStrm );
 
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index b5baefe67cfc..ec7859c7409f 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: formulabase.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:04:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -457,7 +457,7 @@ public:
 
     inline const ::com::sun::star::table::CellAddress& getBaseAddress() const { return maBaseAddress; }
     inline bool         isRelativeAsOffset() const { return mbRelativeAsOffset; }
-    inline bool         isAlways3dRefs() const { return mbAlways3dRefs; }
+    inline bool         is2dRefsAs3dRefs() const { return mb2dRefsAs3dRefs; }
 
     virtual void        setTokens( const ApiTokenSequence& rTokens ) = 0;
     virtual void        setSharedFormula( const ::com::sun::star::table::CellAddress& rBaseAddr );
@@ -465,13 +465,13 @@ public:
 protected:
     explicit            FormulaContext(
                             bool bRelativeAsOffset,
-                            bool bAlways3dRefs );
+                            bool b2dRefsAs3dRefs );
     virtual             ~FormulaContext();
 
 private:
     ::com::sun::star::table::CellAddress maBaseAddress;
     bool                mbRelativeAsOffset;
-    bool                mbAlways3dRefs;
+    bool                mb2dRefsAs3dRefs;
 };
 
 // ----------------------------------------------------------------------------
@@ -482,7 +482,7 @@ class TokensFormulaContext : public FormulaContext
 public:
     explicit            TokensFormulaContext(
                             bool bRelativeAsOffset,
-                            bool bAlways3dRefs );
+                            bool b2dRefsAs3dRefs );
 
     inline const ApiTokenSequence& getTokens() const { return maTokens; }
 
@@ -501,7 +501,7 @@ public:
     explicit            SimpleFormulaContext(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens >& rxTokens,
                             bool bRelativeAsOffset,
-                            bool bAlways3dRefs );
+                            bool b2dRefsAs3dRefs );
 
     virtual void        setTokens( const ApiTokenSequence& rTokens );
 
diff --git a/oox/inc/oox/xls/richstring.hxx b/oox/inc/oox/xls/richstring.hxx
index 1eb3d9545629..ebbf242e89fd 100644
--- a/oox/inc/oox/xls/richstring.hxx
+++ b/oox/inc/oox/xls/richstring.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: richstring.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:49 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:06:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,18 @@ namespace xls {
 
 // ============================================================================
 
+/** Flags used to specify import/export mode of strings. */
+typedef sal_Int32 BiffStringFlags;
+
+const BiffStringFlags BIFF_STR_DEFAULT      = 0x0000;   /// Default string settings.
+const BiffStringFlags BIFF_STR_FORCEUNICODE = 0x0001;   /// Always use UCS-2 characters (default: try to compress). BIFF8 export only.
+const BiffStringFlags BIFF_STR_8BITLENGTH   = 0x0002;   /// 8-bit string length field (default: 16-bit).
+const BiffStringFlags BIFF_STR_SMARTFLAGS   = 0x0004;   /// Omit flags on empty string (default: read/write always). BIFF8 only.
+const BiffStringFlags BIFF_STR_KEEPFONTS    = 0x0008;   /// Keep old fonts when reading unformatted string (default: clear fonts). Import only.
+const BiffStringFlags BIFF_STR_EXTRAFONTS   = 0x0010;   /// Read trailing rich-string font array (default: nothing). BIFF2-BIFF5 import only.
+
+// ============================================================================
+
 /** Contains text data and font attributes for a part of a rich formatted string. */
 class RichStringPortion : public WorkbookHelper
 {