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

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Jul  2 10:15:11 2008
New Revision: 13022
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13022&view=rev

Log:
2008-07-02  Noel Power  <noel power novell com>

        * patches/dev300/xl-import-formradiobutton.diff: rewrote a
        * little
        after I realized I could access the ObjectManager directly



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/xl-import-formradiobutton.diff

Modified: trunk/patches/dev300/xl-import-formradiobutton.diff
==============================================================================
--- trunk/patches/dev300/xl-import-formradiobutton.diff	(original)
+++ trunk/patches/dev300/xl-import-formradiobutton.diff	Wed Jul  2 10:15:11 2008
@@ -2,32 +2,6 @@
 index 43de9ef..749b1fd 100644
 --- sc/source/filter/excel/xiescher.cxx
 +++ sc/source/filter/excel/xiescher.cxx
-@@ -101,6 +101,7 @@
- #include "xichart.hxx"
- #include "xicontent.hxx"
- 
-+#include "xlescher.hxx"
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
- using ::com::sun::star::uno::Reference;
-@@ -305,7 +306,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
- {
- }
- 
--XclImpDrawObjRef XclImpDrawObjBase::ReadObjCmo( XclImpStream& rStrm )
-+XclImpDrawObjRef XclImpDrawObjBase::ReadObjCmo( XclImpObjectManager& rObjMgr, XclImpStream& rStrm )
- {
-     XclImpDrawObjRef xDrawObj;
- 
-@@ -338,7 +339,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObjCmo( XclImpStream& rStrm )
-         case EXC_OBJ_CMO_COMBOBOX:
-         case EXC_OBJ_CMO_SPIN:
-         case EXC_OBJ_CMO_SCROLLBAR:
--            xDrawObj.reset( new XclImpTbxControlObj( rStrm.GetRoot() ) );
-+            xDrawObj.reset( new XclImpTbxControlObj( rObjMgr, rStrm.GetRoot() ) );
-         break;
-         case EXC_OBJ_CMO_PICTURE:
-             xDrawObj.reset( new XclImpOleObj( rStrm.GetRoot() ) );
 @@ -650,23 +651,31 @@ ScfPropertySet XclImpControlObjHelper::GetControlPropSet() const
      return ScfPropertySet( mxCtrlModel );
  }
@@ -90,7 +64,7 @@
  
          NamedValue aValue;
          aValue.Name = CREATE_OUSTRING( SC_UNONAME_CELLRANGE );
-@@ -735,13 +754,27 @@ void XclImpControlObjHelper::ConvertSheetLinks( const XclImpRoot& rRoot, SdrObje
+@@ -735,13 +754,26 @@ void XclImpControlObjHelper::ConvertSheetLinks( const XclImpRoot& rRoot, SdrObje
          if( xEntrySource.is() )
              xEntrySink->setListEntrySource( xEntrySource );
      }
@@ -110,11 +84,9 @@
  
  // ----------------------------------------------------------------------------
  
--XclImpTbxControlObj::XclImpTbxControlObj( const XclImpRoot& rRoot ) :
-+XclImpTbxControlObj::XclImpTbxControlObj( XclImpObjectManager& rObjMgr, const XclImpRoot& rRoot ) :
+ XclImpTbxControlObj::XclImpTbxControlObj( const XclImpRoot& rRoot ) :
      XclImpDrawingObj( rRoot, true ),
      XclImpControlObjHelper( EXC_CTRL_BINDPOSITION ),
-+    mrObjManager( rObjMgr ),
 +    mbGroupLeader( false ),
      mnState( EXC_OBJ_CBLS_STATE_UNCHECK ),
      mnSelEntry( 0 ),
@@ -152,7 +124,7 @@
 -                case EXC_OBJ_CBLS_STATE_UNCHECK:    nApiState = 0;                  break;
 -                case EXC_OBJ_CBLS_STATE_CHECK:      nApiState = 1;                  break;
 -                case EXC_OBJ_CBLS_STATE_TRI:        nApiState = bCheckBox ? 2 : 1;  break;
-+                XclImpTbxControlObj* pTbxObj = dynamic_cast< XclImpTbxControlObj* >( mrObjManager.FindDrawObj( mNextRBInGroupId ).get() );
++                XclImpTbxControlObj* pTbxObj = dynamic_cast< XclImpTbxControlObj* >( GetObjectManager().FindDrawObj( mNextRBInGroupId ).get() );
 +                if ( ( pTbxObj && pTbxObj->mbGroupLeader ) )
 +                {
 +                    // Group has terminated
@@ -166,7 +138,7 @@
 +                    do 
 +                    {
 +                        pTbxObj->ApplyGroupingBits( *pLeader, nRefVal++ );
-+                        pTbxObj = dynamic_cast< XclImpTbxControlObj* >( mrObjManager.FindDrawObj( pTbxObj->mNextRBInGroupId ).get() );
++                        pTbxObj = dynamic_cast< XclImpTbxControlObj* >( GetObjectManager().FindDrawObj( pTbxObj->mNextRBInGroupId ).get() );
 +                    } while ( pTbxObj && !pTbxObj->mbGroupLeader );
 +                } 
 +               
@@ -247,28 +219,10 @@
  // ----------------------------------------------------------------------------
  
  XclImpOleObj::XclImpOleObj( const XclImpRoot& rRoot ) :
-@@ -2143,7 +2233,7 @@ void XclImpObjectManager::ReadObj8( XclImpStream& rStrm )
-             break;
-             case EXC_ID_OBJ_FTCMO:
-                 DBG_ASSERT( !xDrawObj, "XclImpObjectManager::ReadObj8 - multiple FTCMO subrecords" );
--                xDrawObj = XclImpDrawObjBase::ReadObjCmo( rStrm );
-+                xDrawObj = XclImpDrawObjBase::ReadObjCmo( *this, rStrm );
-                 bLoop = xDrawObj.is();
-             break;
-             default:
 diff --git sc/source/filter/inc/xiescher.hxx sc/source/filter/inc/xiescher.hxx
 index b66314b..ea8a91b 100644
 --- sc/source/filter/inc/xiescher.hxx
 +++ sc/source/filter/inc/xiescher.hxx
-@@ -84,7 +84,7 @@ public:
-     virtual             ~XclImpDrawObjBase();
- 
-     /** Reads the FTCMO subrecord (common object data) in an OBJ record, returns a new object. */
--    static XclImpDrawObjRef ReadObjCmo( XclImpStream& rStrm );
-+    static XclImpDrawObjRef ReadObjCmo( XclImpObjectManager& rObjMrg, XclImpStream& rStrm );
-     /** Reads the contents of the specified subrecord of an OBJ record from stream. */
-     virtual void        ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
-     /** Reads the client anchor from an msofbtClientAnchor Escher record. */
 @@ -242,6 +242,9 @@ protected:
      ScfPropertySet      GetControlPropSet() const;
      /** Tries to set a spreadsheet cell link and source range link at the passed form control. */
@@ -279,16 +233,7 @@
  
  private:
      XControlModelRef    mxCtrlModel;    /// Model of the created form control object.
-@@ -256,7 +259,7 @@ private:
- class XclImpTbxControlObj : public XclImpDrawingObj, public XclImpControlObjHelper
- {
- public:
--    explicit            XclImpTbxControlObj( const XclImpRoot& rRoot );
-+    explicit            XclImpTbxControlObj( XclImpObjectManager& rObjMgr, const XclImpRoot& rRoot );
- 
-     /** Reads the contents of the specified subrecord of an OBJ record from stream. */
-     virtual void        ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
-@@ -283,8 +286,15 @@ private:
+@@ -283,8 +286,14 @@ private:
      void                ReadSbs( XclImpStream& rStrm );
      /** Reads the contents of the ftGboData sub structure in an OBJ record. */
      void                ReadGboData( XclImpStream& rStrm );
@@ -298,7 +243,6 @@
  private:
 +    void SetCBRBCommonProps() const;
 +    void ApplyGroupingBits( XclImpTbxControlObj& rTbxObj, sal_Int32 nRefVal );
-+    XclImpObjectManager&  mrObjManager;
 +    bool                mbGroupLeader;  /// Identifies start of group
 +    XclObjId            mNextRBInGroupId;    /// 
      ScfInt16Vec         maMultiSel;     /// Indexes of all selected entries in a multi selection.