ooo-build r13874 - in trunk: . patches/vba

[pflin svn gnome org]

Author: pflin
Date: Thu Sep 11 06:17:42 2008
New Revision: 13874
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13874&view=rev

Log:
2008-09-11  Fong Lin  <pflin novell com>
	* patches/vba/vba-spinbutton-in-userform.dif: make a minor change. 



Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-spinbutton-in-userform.diff

Modified: trunk/patches/vba/vba-spinbutton-in-userform.diff
==============================================================================
--- trunk/patches/vba/vba-spinbutton-in-userform.diff	(original)
+++ trunk/patches/vba/vba-spinbutton-in-userform.diff	Thu Sep 11 06:17:42 2008
@@ -1,18 +1,26 @@
---- svx/inc/svx/msocximex.hxx.orig	2008-09-08 15:38:59.000000000 +0800
-+++ svx/inc/svx/msocximex.hxx	2008-09-08 15:41:32.000000000 +0800
-@@ -1355,6 +1355,9 @@ protected:
-     bool                mbEnabled;
-     bool                mbLocked;
-     bool                mbPropThumb;
-+
-+public:
-+	rtl::OUString msCtrlSource;
- };
+--- svx/inc/svx/msocximex.hxx.orig	2008-09-10 13:54:24.000000000 +0800
++++ svx/inc/svx/msocximex.hxx	2008-09-11 13:27:15.000000000 +0800
+@@ -292,6 +292,8 @@ public:
+ 	UniString msToolTip;
+ 	UniString msParentName;
+ 	OCX_FontData aFontData;
++    rtl::OUString msCtrlSource;
++    rtl::OUString msRowSource;
+         SfxObjectShell *pDocSh;
+ protected:
  
- class OCX_ScrollBar : public OCX_SpinButton
---- svx/source/msfilter/msocximex.cxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ svx/source/msfilter/msocximex.cxx	2008-09-08 16:53:27.000000000 +0800
-@@ -3660,8 +3660,7 @@ void OCX_ContainerControl::ProcessContro
+@@ -405,8 +407,6 @@ public:
+ 	sal_uInt32 nGroupNameLen;
+ 	sal_uInt32 nUnknown10;
+ 
+-        rtl::OUString msCtrlSource;
+-        rtl::OUString msRowSource;
+ 	char *pValue;
+ 	char *pCaption;
+ 	char *pGroupName;
+--- svx/source/msfilter/msocximex.cxx.orig	2008-09-10 13:54:24.000000000 +0800
++++ svx/source/msfilter/msocximex.cxx	2008-09-11 13:30:06.000000000 +0800
+@@ -3669,8 +3669,7 @@ void OCX_ContainerControl::ProcessContro
      SotStorageStreamRef oStream = mContainedControlsStream;
  
      // can insert into OO Dialog (e.g is this a supported dialog control)??
@@ -22,26 +30,25 @@
      {
          // skip the record in the stream, discard the control
          oStream->SeekRel( rec.nSubStreamLen );
-@@ -3692,7 +3691,18 @@ void OCX_ContainerControl::ProcessContro
-                         pList->msCtrlSource = rec.sCtrlSource;
-                         pList->msRowSource = rec.sRowSource;
-                     }
-+					break;
-                 }
+@@ -3694,13 +3693,11 @@ void OCX_ContainerControl::ProcessContro
+             case LISTBOX:
+             case OPTIONBUTTON:
+             case COMBOBOX:
 +			case SPINBUTTON:
 +			case SCROLLBAR:
-+				{
-+					OCX_SpinButton* pLink = static_cast< OCX_SpinButton* >( pControl );
-+					if( pLink )
-+					{
-+						pLink->msCtrlSource = rec.sCtrlSource;
-+					}
-+					break;
-+				}
+                 {
+-                    OCX_ModernControl* pList = static_cast< OCX_ModernControl* >( pControl );
+-                    if ( pList )
+-                    {
+-                        pList->msCtrlSource = rec.sCtrlSource;
+-                        pList->msRowSource = rec.sRowSource;
+-                    }
++                    pControl->msCtrlSource = rec.sCtrlSource;
++                    pControl->msRowSource = rec.sRowSource;
+                 }
          }
          pControl->sName = rec.cName;
-         pControl->msToolTip = rec.controlTip;
-@@ -5554,7 +5564,7 @@ OCX_SpinButton::OCX_SpinButton() :
+@@ -5566,7 +5563,7 @@ OCX_SpinButton::OCX_SpinButton() :
      mbPropThumb( true )
  {
      msFormType = C2U("com.sun.star.form.component.SpinButton");
@@ -50,18 +57,17 @@
      mnBackColor = 0x8000000F;
      mnForeColor = 0x80000012;
  }
-@@ -5677,6 +5687,10 @@ sal_Bool OCX_SpinButton::Import(com::sun
+@@ -5689,6 +5686,9 @@ sal_Bool OCX_SpinButton::Import(com::sun
      aTmp <<= sal_Int16( 0 );
      rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
  
 +	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	rtl::OUString sRowSource;
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, sRowSource );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
 +
      return sal_True;
  }
  
-@@ -5844,7 +5858,7 @@ OCX_ScrollBar::OCX_ScrollBar()
+@@ -5856,7 +5856,7 @@ OCX_ScrollBar::OCX_ScrollBar()
      sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollBar" ) );
      mnMax = 32767;
      msFormType = C2U("com.sun.star.form.component.ScrollBar");
@@ -70,19 +76,18 @@
  
  }
  
-@@ -5910,6 +5924,10 @@ sal_Bool OCX_ScrollBar::Import(com::sun:
+@@ -5922,6 +5922,9 @@ sal_Bool OCX_ScrollBar::Import(com::sun:
      aTmp <<= sal_Int16( 0 );
      rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
  
 +	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	rtl::OUString sRowSource;
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, sRowSource );
++	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
 +
      return sal_True;
  }
  
---- xmlscript/source/xmldlg_imexp/exp_share.hxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/exp_share.hxx	2008-09-08 16:36:40.000000000 +0800
+--- xmlscript/source/xmldlg_imexp/exp_share.hxx.orig	2008-09-10 13:54:25.000000000 +0800
++++ xmlscript/source/xmldlg_imexp/exp_share.hxx	2008-09-10 13:54:35.000000000 +0800
 @@ -212,7 +212,9 @@ public:
          SAL_THROW( (css::uno::Exception) );
      void readProgressBarModel( StyleBag * all_styles )
@@ -94,8 +99,8 @@
          SAL_THROW( (css::uno::Exception) );
  	void readFixedHyperLinkModel( StyleBag * all_styles )
          SAL_THROW( (css::uno::Exception) );
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	2008-09-08 16:38:15.000000000 +0800
+--- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx.orig	2008-09-10 13:54:25.000000000 +0800
++++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	2008-09-10 13:54:35.000000000 +0800
 @@ -1164,7 +1164,7 @@ void ElementDescriptor::readProgressBarM
      readEvents();
  }
@@ -153,8 +158,8 @@
      readEvents();
  }
  //__________________________________________________________________________________________________
---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx.orig	2008-09-05 15:24:41.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	2008-09-08 16:39:35.000000000 +0800
+--- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx.orig	2008-09-10 13:54:25.000000000 +0800
++++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx	2008-09-10 13:54:35.000000000 +0800
 @@ -1516,7 +1516,15 @@ void SAL_CALL exportDialogModel(
                      xProps, xPropState,
                      OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scrollbar") ) );
@@ -172,8 +177,8 @@
              }
              else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
              {
---- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig	2008-09-05 15:25:18.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/imp_share.hxx	2008-09-05 15:30:38.000000000 +0800
+--- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig	2008-09-10 13:54:25.000000000 +0800
++++ xmlscript/source/xmldlg_imexp/imp_share.hxx	2008-09-10 13:54:35.000000000 +0800
 @@ -1006,6 +1006,28 @@ public:
  };
  
@@ -203,8 +208,8 @@
  class ProgressBarElement
      : public ControlElement
  {
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.orig	2008-09-05 15:25:18.000000000 +0800
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	2008-09-08 17:07:40.000000000 +0800
+--- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.orig	2008-09-10 13:54:25.000000000 +0800
++++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	2008-09-10 13:54:35.000000000 +0800
 @@ -237,10 +237,24 @@ Reference< xml::input::XElement > Scroll
  void ScrollBarElement::endElement()
  	throw (xml::sax::SAXException, RuntimeException)