GNOME.org
 

ooo-build r12784 - trunk/patches/dev300

Author: jiaojh
Date: Wed Jun  4 07:24:38 2008
New Revision: 12784
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12784&view=rev

Log:
update for property.hxx


Modified:
   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	Wed Jun  4 07:24:38 2008
@@ -1,5 +1,5 @@
---- xmloff/source/forms/strings.hxx.orig	2008-06-02 14:42:04.000000000 +0800
-+++ xmloff/source/forms/strings.hxx	2008-06-02 14:54:35.000000000 +0800
+--- xmloff/source/forms/strings.hxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ xmloff/source/forms/strings.hxx	2008-06-04 15:23:11.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-06-02 14:42:04.000000000 +0800
-+++ xmloff/source/forms/formattributes.hxx	2008-06-02 14:54:35.000000000 +0800
+--- xmloff/source/forms/formattributes.hxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ xmloff/source/forms/formattributes.hxx	2008-06-04 15:23:11.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-06-02 14:42:04.000000000 +0800
-+++ xmloff/source/forms/formattributes.cxx	2008-06-02 16:07:23.000000000 +0800
+--- xmloff/source/forms/formattributes.cxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ xmloff/source/forms/formattributes.cxx	2008-06-04 15:23:11.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-06-02 14:42:04.000000000 +0800
-+++ xmloff/source/forms/elementexport.cxx	2008-06-02 14:54:35.000000000 +0800
+--- xmloff/source/forms/elementexport.cxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ xmloff/source/forms/elementexport.cxx	2008-06-04 15:23:11.000000000 +0800
 @@ -523,15 +523,15 @@ namespace xmloff
  		{
  			static sal_Int32 nBooleanPropertyAttributeIds[] =
@@ -49,19 +49,19 @@
  			};
  		#if OSL_DEBUG_LEVEL > 0
  			sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
---- toolkit/inc/toolkit/helper/property.hxx.orig	2008-06-02 14:00:51.000000000 +0800
-+++ toolkit/inc/toolkit/helper/property.hxx	2008-06-02 14:54:57.000000000 +0800
-@@ -191,6 +191,7 @@ namespace rtl {
- #define BASEPROPERTY_DIALOGSOURCEURL				132
- #define BASEPROPERTY_NOLABEL               133   // ::rtl::OUString  added for issue79712
- #define BASEPROPERTY_URL                   134  // ::rtl::OUString
-+#define BASEPROPERTY_ENABLEVISIBLE         137  // sal_Bool
- #define BASEPROPERTY_GROUPNAME             136  // ::rtl::OUString
+--- toolkit/inc/toolkit/helper/property.hxx.orig	2008-05-20 22:32:24.000000000 +0800
++++ toolkit/inc/toolkit/helper/property.hxx	2008-06-04 15:24:06.000000000 +0800
+@@ -188,6 +188,7 @@ namespace rtl {
+ #define BASEPROPERTY_URL                            134  // ::rtl::OUString
+ #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
+ #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
++#define BASEPROPERTY_VISIBLE                        137  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
---- toolkit/source/helper/property.cxx.orig	2008-06-02 13:59:52.000000000 +0800
-+++ toolkit/source/helper/property.cxx	2008-06-02 14:54:35.000000000 +0800
-@@ -270,7 +270,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
+ #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-06-04 15:23:11.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 ),
              DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
@@ -71,9 +71,9 @@
              };
  			pPropertyInfos = aImplPropertyInfos;
  			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
---- toolkit/source/awt/vclxwindow.cxx.orig	2008-06-02 14:42:04.000000000 +0800
-+++ toolkit/source/awt/vclxwindow.cxx	2008-06-03 11:44:26.000000000 +0800
-@@ -208,6 +208,8 @@ private:
+--- toolkit/source/awt/vclxwindow.cxx.orig	2008-05-14 17:47:01.000000000 +0800
++++ toolkit/source/awt/vclxwindow.cxx	2008-06-04 15:23:11.000000000 +0800
+@@ -207,6 +207,8 @@ private:
      ::vos::IMutex&                      mrMutex;
      ::toolkit::AccessibilityClient      maAccFactory;
      bool                                mbDisposed;
@@ -82,7 +82,7 @@
      ::osl::Mutex                        maListenerContainerMutex;
      ::cppu::OInterfaceContainerHelper   maWindow2Listeners;
  
-@@ -229,6 +231,15 @@ public:
+@@ -228,6 +230,15 @@ public:
      */
      VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex );
  
@@ -98,7 +98,7 @@
      /** asynchronously notifies a mouse event to the VCLXWindow's XMouseListeners
      */
      void    notifyMouseEvent( const awt::MouseEvent& _rMouseEvent, MouseEventType _nType );
-@@ -299,6 +310,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWind
+@@ -298,6 +309,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWind
      ,mrAntiImpl( _rAntiImpl )
      ,mrMutex( _rMutex )
      ,mbDisposed( false )
@@ -107,7 +107,7 @@
      ,maListenerContainerMutex( )
      ,maWindow2Listeners( maListenerContainerMutex )
  #ifdef THREADED_NOTIFICATION
-@@ -602,7 +615,12 @@ void VCLXWindow::SetWindow( Window* pWin
+@@ -600,7 +613,12 @@ void VCLXWindow::SetWindow( Window* pWin
      SetOutputDevice( pWindow );
  
      if ( GetWindow() )
@@ -120,7 +120,7 @@
  }
  
  void VCLXWindow::suspendVclEventListening( )
-@@ -1225,7 +1243,13 @@ void VCLXWindow::setVisible( sal_Bool bV
+@@ -1223,7 +1241,13 @@ void VCLXWindow::setVisible( sal_Bool bV
  			}
  		}
  */
@@ -135,7 +135,7 @@
  	}
  }
  
-@@ -1539,6 +1563,7 @@ void VCLXWindow::ImplGetPropertyIds( std
+@@ -1537,6 +1561,7 @@ void VCLXWindow::ImplGetPropertyIds( std
                           BASEPROPERTY_HELPURL,
                           BASEPROPERTY_TEXT,
                           BASEPROPERTY_PRINTABLE,
@@ -143,7 +143,7 @@
                           BASEPROPERTY_TABSTOP,
                           0);
  
-@@ -1612,6 +1637,23 @@ void VCLXWindow::setProperty( const ::rt
+@@ -1610,6 +1635,23 @@ void VCLXWindow::setProperty( const ::rt
  					setEnable( b );
  			}
  			break;
@@ -167,7 +167,7 @@
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
-@@ -2070,6 +2112,10 @@ void VCLXWindow::setProperty( const ::rt
+@@ -2068,6 +2110,10 @@ void VCLXWindow::setProperty( const ::rt
  				aProp <<= (sal_Bool) GetWindow()->IsEnabled();
  			    break;
  
@@ -178,7 +178,7 @@
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
-@@ -2363,8 +2409,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal
+@@ -2374,8 +2420,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal
  	Window* pWindow = GetWindow();
      if ( !pWindow )
          return;
@@ -189,8 +189,8 @@
  	{
  		TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
          if ( pTabPage )
---- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-06-02 13:59:52.000000000 +0800
-+++ toolkit/source/controls/unocontrolmodel.cxx	2008-06-02 14:54:35.000000000 +0800
+--- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-04-11 17:32:33.000000000 +0800
++++ toolkit/source/controls/unocontrolmodel.cxx	2008-06-04 15:23:11.000000000 +0800
 @@ -338,6 +338,7 @@ void UnoControlModel::ImplPropertyChange
              case BASEPROPERTY_SCALEIMAGE:
              case BASEPROPERTY_ENABLED:
@@ -198,9 +198,9 @@
 +            case BASEPROPERTY_ENABLEVISIBLE:
              case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
  
-             case BASEPROPERTY_GROUPNAME:
---- toolkit/source/controls/unocontrol.cxx.orig	2008-06-02 14:42:04.000000000 +0800
-+++ toolkit/source/controls/unocontrol.cxx	2008-06-03 12:09:07.000000000 +0800
+             case BASEPROPERTY_HELPTEXT:
+--- toolkit/source/controls/unocontrol.cxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ toolkit/source/controls/unocontrol.cxx	2008-06-04 15:23:11.000000000 +0800
 @@ -1286,6 +1286,18 @@ void UnoControl::createPeer( const Refer
  		}
  		//issue79712 ends
@@ -220,8 +220,8 @@
  		// Align
  		aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
  		if ( xInfo->hasPropertyByName( aPropName ) )
---- sc/source/filter/inc/xiescher.hxx.orig	2008-06-02 14:42:04.000000000 +0800
-+++ sc/source/filter/inc/xiescher.hxx	2008-06-02 15:54:23.000000000 +0800
+--- sc/source/filter/inc/xiescher.hxx.orig	2008-06-04 15:22:46.000000000 +0800
++++ sc/source/filter/inc/xiescher.hxx	2008-06-04 15:23:11.000000000 +0800
 @@ -94,6 +94,8 @@ public:
      void                SetObjData( sal_uInt16 nObjType, sal_uInt16 nObjId, sal_uInt16 nObjFlags );
      /** Sets shape data from Escher stream. */
@@ -248,9 +248,9 @@
  };
  
  // ----------------------------------------------------------------------------
---- sc/source/filter/excel/xiescher.cxx.orig	2008-06-02 13:59:52.000000000 +0800
-+++ sc/source/filter/excel/xiescher.cxx	2008-06-02 16:01:41.000000000 +0800
-@@ -297,7 +297,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
+--- sc/source/filter/excel/xiescher.cxx.orig	2008-04-11 04:16:07.000000000 +0800
++++ sc/source/filter/excel/xiescher.cxx	2008-06-04 15:23:11.000000000 +0800
+@@ -296,7 +296,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
      mnShapeBlipId( 0 ),
      mbValid( true ),
      mbAreaObj( false ),
@@ -260,7 +260,7 @@
  {
  }
  
-@@ -855,6 +856,7 @@ void XclImpTbxControlObj::DoProcessSdrOb
+@@ -790,6 +791,7 @@ void XclImpTbxControlObj::DoProcessSdrOb
  
      // control printable?
      aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), IsPrintable() );
@@ -268,7 +268,7 @@
  
      // #118053# #i51348# set internal name of the control (use name from SdrObject, if extant)
      OUString aCtrlName = rSdrObj.GetName();
-@@ -1677,6 +1679,7 @@ SdrObject* XclImpDffManager::ProcessObj(
+@@ -1552,6 +1554,7 @@ SdrObject* XclImpDffManager::ProcessObj(
  
      // set shape information from Escher stream
      xDrawObj->SetShapeData( rObjData.nShapeId, rObjData.nSpFlags, GetPropertyValue( DFF_Prop_pib ) );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]