ooo-build r15194 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 04:42:28 2009
New Revision: 15194
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15194&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-export-shape-macro-bindings-m39.diff:
	* patches/dev300/sc-export-shape-macro-bindings.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/sc-export-shape-macro-bindings-m39.diff
      - copied unchanged from r15189, /trunk/patches/dev300/sc-export-shape-macro-bindings.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-export-shape-macro-bindings.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 04:42:28 2009
@@ -1944,12 +1944,19 @@
 
 # fix nasty corruption of rountriped excel documents with shapes
 fix-shape-export-i96858.diff, i#96858
+
+[ VBAObjects <= dev300-m39 ]
+# export of macro bindings for shapes
+sc-export-shape-macro-bindings-m39.diff, n#304739, noelpwer
+
+[ VBAObjects > dev300-m39 ]
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer
+
+[ VBAObjects ]
 # export of hlink bindings for shapes
 sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
 
-
 # attributes present in the vba streams can override the default shape name
 # used for the control in the binary format
 sc-vbaimport-override-controlname.diff, n#359933, noelpwer

Modified: trunk/patches/dev300/sc-export-shape-macro-bindings.diff
==============================================================================
--- trunk/patches/dev300/sc-export-shape-macro-bindings.diff	(original)
+++ trunk/patches/dev300/sc-export-shape-macro-bindings.diff	Wed Jan 28 04:42:28 2009
@@ -1,19 +1,18 @@
 diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx
-index 1bf7c00..8518911 100644
+index e3273e2..ced9e61 100644
 --- sc/source/filter/excel/xeescher.cxx
 +++ sc/source/filter/excel/xeescher.cxx
-@@ -58,7 +58,9 @@
+@@ -62,6 +62,9 @@
  #include "xelink.hxx"
  #include "xename.hxx"
  #include "xestyle.hxx"
--
 +#include "userdat.hxx"
 +#include "drwlayer.hxx"
 +#include "svx/unoapi.hxx"
- using ::rtl::OUString;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::Reference;
-@@ -321,7 +323,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStream& rStrm )
+ 
+ #include <oox/core/tokens.hxx>
+ 
+@@ -329,7 +332,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStream& rStrm )
  
  XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
      XclObj( rRoot, EXC_OBJTYPE_UNKNOWN, true ),
@@ -22,7 +21,7 @@
      mnHeight( 0 ),
      mnState( 0 ),
      mnLineCount( 0 ),
-@@ -568,6 +570,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XS
+@@ -576,6 +579,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XS
  
  bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
  {
@@ -31,7 +30,7 @@
      String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
      if( aMacroName.Len() )
      {
-@@ -577,6 +581,7 @@ bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
+@@ -585,6 +590,7 @@ bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
          return true;
      }
      return false;
@@ -39,7 +38,7 @@
  }
  
  void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
-@@ -715,12 +720,6 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
+@@ -723,12 +729,6 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
      }
  }
  
@@ -52,7 +51,7 @@
  void XclExpTbxControlObj::WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId )
  {
      if( const XclTokenArray* pCellLink = GetCellLinkTokArr() )
-@@ -749,6 +748,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
+@@ -757,6 +757,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
  
  #endif
  
@@ -60,7 +59,7 @@
  // ----------------------------------------------------------------------------
  
  XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
-@@ -938,6 +938,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
+@@ -947,6 +948,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
      }
  }
  
@@ -68,7 +67,7 @@
  void XclExpNote::WriteBody( XclExpStream& rStrm )
  {
      // BIFF5/BIFF7 is written separately
-@@ -956,3 +957,67 @@ void XclExpNote::WriteBody( XclExpStream& rStrm )
+@@ -983,6 +985,70 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
  
  // ============================================================================
  
@@ -136,6 +135,9 @@
 +
 +// ============================================================================
 +
+ XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes )
+     : mnTab( nTab ), mrNotes( rNotes )
+ {
 diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx
 index 9ef6c91..efb9076 100644
 --- sc/source/filter/inc/xcl97esc.hxx
@@ -156,10 +158,10 @@
  class XclEscherEx : public EscherEx, protected XclExpRoot
  {
 diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
-index a3a3589..ff880b2 100644
+index 7517cb9..c0bd309 100644
 --- sc/source/filter/inc/xcl97rec.hxx
 +++ sc/source/filter/inc/xcl97rec.hxx
-@@ -289,7 +289,7 @@ public:
+@@ -285,7 +285,7 @@ public:
  
  class XclObjAny : public XclObj
  {
@@ -169,10 +171,10 @@
  
  public:
 diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx
-index 788f366..05b9cc5 100644
+index cbbad6e..8a9a143 100644
 --- sc/source/filter/inc/xeescher.hxx
 +++ sc/source/filter/inc/xeescher.hxx
-@@ -89,6 +89,34 @@ private:
+@@ -88,6 +88,34 @@ private:
      sal_uInt16          mnEntryCount;   /// Number of entries in source range.
  };
  
@@ -207,7 +209,7 @@
  // ----------------------------------------------------------------------------
  
  #if EXC_EXP_OCX_CTRL
-@@ -115,7 +143,7 @@ private:
+@@ -114,7 +142,7 @@ private:
  #else
  
  /** Represents an OBJ record for an TBX form control. */
@@ -216,7 +218,7 @@
  {
  public:
      explicit            XclExpTbxControlObj(
-@@ -129,8 +157,6 @@ public:
+@@ -128,8 +156,6 @@ public:
  private:
      virtual void        WriteSubRecs( XclExpStream& rStrm );
  
@@ -225,7 +227,7 @@
      /** Writes a subrecord containing a cell link, or nothing, if no link present. */
      void                WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId );
      /** Writes the ftSbs sub structure containing scrollbar data. */
-@@ -138,7 +164,6 @@ private:
+@@ -137,7 +163,6 @@ private:
  
  private:
      ScfInt16Vec         maMultiSel;     /// Indexes of all selected entries in a multi selection.
@@ -234,7 +236,7 @@
      sal_Int32           mnHeight;       /// Height of the control.
      sal_uInt16          mnState;        /// Checked/unchecked state.
 diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx
-index 09790ad..aaa0316 100644
+index 30a5041..3aa49c4 100644
 --- sc/source/filter/xcl97/xcl97esc.cxx
 +++ sc/source/filter/xcl97/xcl97esc.cxx
 @@ -232,7 +232,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen