GNOME.org
 

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

Author: jiaojh
Date: Mon May  5 10:00:12 2008
New Revision: 12467
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12467&view=rev

Log:
    * patches/dev300/form-control-visibility.diff:
      update for dev300-m10.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/form-control-visibility.diff

Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff	(original)
+++ trunk/patches/dev300/form-control-visibility.diff	Mon May  5 10:00:12 2008
@@ -1,5 +1,5 @@
---- xmloff/source/forms/strings.hxx.orig	2008-04-11 06:12:05.000000000 +0800
-+++ xmloff/source/forms/strings.hxx	2008-04-30 17:36:12.000000000 +0800
+--- xmloff/source/forms/strings.hxx.orig	2008-05-05 18:14:36.000000000 +0800
++++ xmloff/source/forms/strings.hxx	2008-05-05 18:15:32.000000000 +0800
 @@ -114,6 +114,7 @@ namespace xmloff
  	XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP,			"Tabstop" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_STATE,				"State" );
@@ -8,8 +8,8 @@
  	XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH,		"MaxTextLen" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT,			"LineCount" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX,			"TabIndex" );
---- xmloff/source/forms/formattributes.hxx.orig	2008-04-11 06:03:59.000000000 +0800
-+++ xmloff/source/forms/formattributes.hxx	2008-04-30 17:36:12.000000000 +0800
+--- xmloff/source/forms/formattributes.hxx.orig	2008-05-05 18:14:36.000000000 +0800
++++ xmloff/source/forms/formattributes.hxx	2008-05-05 18:15:32.000000000 +0800
 @@ -69,6 +69,7 @@ namespace xmloff
  	#define CCA_VALUE					0x00200000
      #define CCA_ORIENTATION             0x00400000
@@ -18,8 +18,8 @@
  
  	// flags for database control atttributes
  	#define DA_BOUND_COLUMN				0x00000001
---- xmloff/source/forms/formattributes.cxx.orig	2008-04-11 06:03:42.000000000 +0800
-+++ xmloff/source/forms/formattributes.cxx	2008-04-30 17:36:12.000000000 +0800
+--- xmloff/source/forms/formattributes.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ xmloff/source/forms/formattributes.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -60,6 +60,7 @@ namespace xmloff
  			case CCA_CURRENT_SELECTED: 	return "current-selected";
  			case CCA_CURRENT_VALUE: 	return "current-value";
@@ -28,8 +28,8 @@
  			case CCA_DROPDOWN: 			return "dropdown";
  			case CCA_FOR: 				return "for";
  			case CCA_IMAGE_DATA: 		return "image-data";
---- xmloff/source/forms/elementexport.cxx.orig	2008-04-11 06:00:18.000000000 +0800
-+++ xmloff/source/forms/elementexport.cxx	2008-04-30 17:36:12.000000000 +0800
+--- xmloff/source/forms/elementexport.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ xmloff/source/forms/elementexport.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -523,15 +523,15 @@ namespace xmloff
  		{
  			static sal_Int32 nBooleanPropertyAttributeIds[] =
@@ -49,8 +49,8 @@
  			};
  		#if OSL_DEBUG_LEVEL > 0
  			sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
---- toolkit/inc/toolkit/helper/property.hxx.orig	2008-04-11 17:05:01.000000000 +0800
-+++ toolkit/inc/toolkit/helper/property.hxx	2008-04-30 17:36:12.000000000 +0800
+--- toolkit/inc/toolkit/helper/property.hxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ toolkit/inc/toolkit/helper/property.hxx	2008-05-05 18:15:32.000000000 +0800
 @@ -191,6 +191,7 @@ namespace rtl {
  #define BASEPROPERTY_DIALOGSOURCEURL				132
  #define BASEPROPERTY_NOLABEL               133   // ::rtl::OUString  added for issue79712
@@ -59,8 +59,8 @@
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
---- toolkit/source/helper/property.cxx.orig	2008-04-11 17:36:59.000000000 +0800
-+++ toolkit/source/helper/property.cxx	2008-04-30 17:36:12.000000000 +0800
+--- toolkit/source/helper/property.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ toolkit/source/helper/property.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -269,7 +269,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
  			DECL_PROP_3		( "RowHeight",				TREE_ROWHEIGHT,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID ),
  			DECL_PROP_2		( "InvokesStopNodeEditing",	TREE_INVOKESSTOPNODEEDITING, sal_Bool,		BOUND, MAYBEDEFAULT ),
@@ -71,9 +71,9 @@
              };
  			pPropertyInfos = aImplPropertyInfos;
  			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
---- toolkit/source/awt/vclxwindow.cxx.orig	2008-04-11 17:22:21.000000000 +0800
-+++ toolkit/source/awt/vclxwindow.cxx	2008-04-30 17:36:12.000000000 +0800
-@@ -1539,6 +1539,8 @@ void VCLXWindow::ImplGetPropertyIds( std
+--- toolkit/source/awt/vclxwindow.cxx.orig	2008-05-05 11:01:12.000000000 +0800
++++ toolkit/source/awt/vclxwindow.cxx	2008-05-05 18:15:32.000000000 +0800
+@@ -1542,6 +1542,8 @@ void VCLXWindow::ImplGetPropertyIds( std
                           BASEPROPERTY_TABSTOP,
                           0);
  
@@ -82,7 +82,7 @@
      // lovely hack from:
      // void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId )
      std::list< sal_uInt16 >::const_iterator iter;
-@@ -1609,6 +1611,13 @@ void VCLXWindow::setProperty( const ::rt
+@@ -1612,6 +1614,13 @@ void VCLXWindow::setProperty( const ::rt
  					setEnable( b );
  			}
  			break;
@@ -96,7 +96,7 @@
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
-@@ -2067,6 +2076,10 @@ void VCLXWindow::setProperty( const ::rt
+@@ -2070,6 +2079,10 @@ void VCLXWindow::setProperty( const ::rt
  				aProp <<= (sal_Bool) GetWindow()->IsEnabled();
  			    break;
  
@@ -107,8 +107,8 @@
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
---- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-04-11 17:32:33.000000000 +0800
-+++ toolkit/source/controls/unocontrolmodel.cxx	2008-04-30 17:36:12.000000000 +0800
+--- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ toolkit/source/controls/unocontrolmodel.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -338,6 +338,7 @@ void UnoControlModel::ImplPropertyChange
              case BASEPROPERTY_SCALEIMAGE:
              case BASEPROPERTY_ENABLED:
@@ -117,8 +117,8 @@
              case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
  
              case BASEPROPERTY_HELPTEXT:
---- toolkit/source/controls/unocontrol.cxx.orig	2008-04-11 17:29:19.000000000 +0800
-+++ toolkit/source/controls/unocontrol.cxx	2008-04-30 17:36:12.000000000 +0800
+--- toolkit/source/controls/unocontrol.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ toolkit/source/controls/unocontrol.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -1286,6 +1286,19 @@ void UnoControl::createPeer( const Refer
  		}
  		//issue79712 ends
@@ -139,8 +139,8 @@
  		// Align
  		aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
  		if ( xInfo->hasPropertyByName( aPropName ) )
---- sc/source/filter/inc/xlescher.hxx.orig	2008-04-30 11:16:54.000000000 +0800
-+++ sc/source/filter/inc/xlescher.hxx	2008-04-30 17:36:12.000000000 +0800
+--- sc/source/filter/inc/xlescher.hxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ sc/source/filter/inc/xlescher.hxx	2008-05-05 18:15:32.000000000 +0800
 @@ -96,6 +96,7 @@ const sal_uInt16 EXC_OBJ_CMO_UNKNOWN    
  
  // ftCmo: flags
@@ -149,17 +149,17 @@
  
  // ftPioGrbit: flags
  const sal_uInt16 EXC_OBJ_PIO_MANUALSIZE     = 0x0001;
---- sc/source/filter/inc/xiescher.hxx.orig	2008-04-30 11:16:52.000000000 +0800
-+++ sc/source/filter/inc/xiescher.hxx	2008-04-30 17:36:12.000000000 +0800
-@@ -104,6 +104,7 @@ public:
-     /** If set, the SdrObject will be created or processed, but not be inserted into the draw page. */
-     inline void         SetSkipInsertSdr() { mbInsSdr = false; }
-     inline void         SetObjectName( const String sName ) { maObjectName = sName; }
+--- sc/source/filter/inc/xiescher.hxx.orig	2008-05-05 11:01:01.000000000 +0800
++++ sc/source/filter/inc/xiescher.hxx	2008-05-05 18:17:45.000000000 +0800
+@@ -94,6 +94,7 @@ public:
+     void                SetObjData( sal_uInt16 nObjType, sal_uInt16 nObjId, sal_uInt16 nObjFlags );
+     /** Sets shape data from Escher stream. */
+     void                SetShapeData( sal_uInt32 nShapeId, sal_uInt32 nShapeFlags, sal_uInt32 nShapeBlipId );
 +    inline void         SetVisible( const sal_uInt32 nObjVisible ) { mnObjVisible = nObjVisible; }
- 
-     /** Returns the Calc sheet index of this object. */
-     inline SCTAB        GetScTab() const { return maObjId.mnScTab; }
-@@ -128,6 +129,7 @@ public:
+     /** Sets whether this is an area object (then its width and height must be greater than 0). */
+     inline void         SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
+     /** Sets the object anchor explicitly. */
+@@ -126,6 +127,7 @@ public:
      inline bool         IsInsertSdr() const { return mbInsSdr; }
      /** Returns true, if Escher object is printable. */
      inline bool         IsPrintable() const { return ::get_flag( mnObjFlags, EXC_OBJ_CMO_PRINTABLE ); }
@@ -167,7 +167,7 @@
  
      /** Returns true, if the passed size is valid for this object. */
      bool                IsValidSize( const Rectangle& rAnchorRect ) const;
-@@ -165,6 +167,7 @@ private:
+@@ -162,6 +164,7 @@ private:
      bool                mbValid;        /// true = Object is valid, do processing and insertion.
      bool                mbAreaObj;      /// true = Width and height must be greater than 0.
      bool                mbInsSdr;       /// true = Insert the SdrObject into draw page.
@@ -175,8 +175,8 @@
  };
  
  // ----------------------------------------------------------------------------
---- sc/source/filter/excel/xiescher.cxx.orig	2008-04-30 11:16:54.000000000 +0800
-+++ sc/source/filter/excel/xiescher.cxx	2008-04-30 17:36:12.000000000 +0800
+--- sc/source/filter/excel/xiescher.cxx.orig	2008-05-05 18:14:37.000000000 +0800
++++ sc/source/filter/excel/xiescher.cxx	2008-05-05 18:15:32.000000000 +0800
 @@ -296,7 +296,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
      mnShapeBlipId( 0 ),
      mbValid( true ),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]