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

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13856 - in trunk: . patches/dev300
Date: Tue, 9 Sep 2008 11:54:38 +0000 (UTC)
Author: noelpwer
Date: Tue Sep  9 11:54:37 2008
New Revision: 13856
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13856&view=rev

Log:

2008-09-09  Noel Power  <noel power novell com>

        * patches/dev300/cws-npower11.diff: control name attribute



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-npower11.diff

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Tue Sep  9 11:54:37 2008
@@ -2725,10 +2725,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.cxx,v
 retrieving revision 1.3
-retrieving revision 1.2.42.4
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.4
+retrieving revision 1.2.42.6
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.6
 --- sc/source/ui/vba/vbacontrol.cxx	11 Apr 2008 00:57:50 -0000	1.3
-+++ sc/source/ui/vba/vbacontrol.cxx	5 Sep 2008 14:04:20 -0000	1.2.42.4
++++ sc/source/ui/vba/vbacontrol.cxx	9 Sep 2008 10:22:25 -0000	1.2.42.6
 @@ -36,7 +36,13 @@
  #include <com/sun/star/frame/XModel.hpp>
  #include <com/sun/star/view/XControlAccess.hpp>
@@ -2836,13 +2836,16 @@
  }
  
 -void ScVbaControl::removeResouce() throw( uno::RuntimeException )
--{
++void 
++ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
+ {
 -    uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
 -    xComponent->removeEventListener( m_xEventListener );
 -    m_xControlShape = NULL;
 -    m_xProps = NULL;
--}
--
++    mpGeometryHelper.reset( pHelper );
+ }
+ 
 -
 -ScVbaControl::ScVbaControl( const uno::Reference< uno::XComponentContext >& xContext, 
 -        const uno::Reference< beans::XPropertySet >& xProps, 
@@ -2855,9 +2858,7 @@
 -}
 -
 -void ScVbaControl::SetControl( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< ::drawing::XControlShape > xControlShape )
-+void 
-+ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
- {
+-{
 -    m_xEventListener.set( new ScVbaControlListener( this ) );
 -    uno::Reference< lang::XComponent > xComponent( m_xControlShape, uno::UNO_QUERY_THROW );
 -    m_xContext.set( xContext, uno::UNO_QUERY_THROW );
@@ -2866,9 +2867,8 @@
 -    uno::Reference< awt::XControlModel > xControlModel( xControlShape->getControl(), uno::UNO_QUERY_THROW );
 -    uno::Reference< beans::XPropertySet > xProps( xControlModel, uno::UNO_QUERY_THROW );
 -    m_xProps = xProps;
-+    mpGeometryHelper.reset( pHelper );
- }
- 
+-}
+-
 -void ScVbaControl::SetControl( const uno::Reference< uno::XComponentContext > xContext, 
 -        const uno::Reference< beans::XPropertySet > xProps, 
 -        const uno::Reference< drawing::XControlShape > xControlShape )
@@ -2886,7 +2886,7 @@
  }
  
  //In design model has different behavior
-@@ -189,132 +176,267 @@ void SAL_CALL ScVbaControl::setEnabled( 
+@@ -189,132 +176,283 @@ void SAL_CALL ScVbaControl::setEnabled( 
  
  sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
  {
@@ -2991,7 +2991,7 @@
 -ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, const uno::Reference< drawing::XControlShape > xControlShape ): m_xContext( xContext ), m_xProps( xProps ), m_xControlShape( xControlShape )
 +rtl::OUString SAL_CALL 
 +ScVbaControl::getControlSource() throw (uno::RuntimeException)
-+{
+ {
 +// #FIXME I *hate* having these upstream differences
 +// but this is necessary until I manage to upstream other
 +// dependant parts
@@ -3001,7 +3001,7 @@
 +	if ( xBindable.is() )
 +	{
 +		try
- {
++		{
 +			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
 +			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
 +			uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
@@ -3013,16 +3013,18 @@
 +		catch( uno::Exception& )
 +		{
 +		}	
- }
++	}
 +	return sControlSource;
 +#else
 +	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
 +#endif
-+}
-+
+ }
+ 
+-ScVbaControl* ScVbaControlFactory::createControl( const sal_Int16 nClassId )  throw (uno::RuntimeException)
 +void SAL_CALL 
 +ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
-+{
+ {
+-    switch( nClassId )
 +#ifdef VBA_OOBUILD_HACK
 +    rtl::OUString sEmpty;
 +    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
@@ -3038,13 +3040,27 @@
 +	rtl::OUString sRowSource;
 +	uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
 +	if ( xListSink.is() )
-+	{
+     {
+-        case form::FormComponentType::COMBOBOX:
+-            return new ScVbaComboBox( m_xContext, m_xProps, m_xControlShape );
+-        case form::FormComponentType::COMMANDBUTTON:
+-            return new ScVbaButton( m_xContext, m_xControlShape );
+-        case form::FormComponentType::FIXEDTEXT:
+-            return new ScVbaLabel( m_xContext, m_xControlShape );
+-        case form::FormComponentType::TEXTFIELD:
+-            return new ScVbaTextBox( m_xContext, m_xControlShape );
+-        case form::FormComponentType::RADIOBUTTON:
+-            return new ScVbaRadioButton( m_xContext, m_xControlShape );
+-        case form::FormComponentType::LISTBOX:
+-            return new ScVbaListBox( m_xContext, m_xControlShape );
+-        default:
+-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
+-                    "Donot surpport this Control Type." ), uno::Reference< uno::XInterface >() );
 +		try
 +		{
 +			uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
 +			uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
- 
--ScVbaControl* ScVbaControlFactory::createControl( const sal_Int16 nClassId )  throw (uno::RuntimeException)
++
 +			uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
 +			table::CellRangeAddress aAddress;
 +			xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
@@ -3052,8 +3068,7 @@
 +			xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
 +		}
 +		catch( uno::Exception& )
- {
--    switch( nClassId )
++		{
 +		}	
 +	}
 +	return sRowSource;
@@ -3064,30 +3079,31 @@
 +
 +void SAL_CALL 
 +ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
-     {
--        case form::FormComponentType::COMBOBOX:
--            return new ScVbaComboBox( m_xContext, m_xProps, m_xControlShape );
--        case form::FormComponentType::COMMANDBUTTON:
--            return new ScVbaButton( m_xContext, m_xControlShape );
--        case form::FormComponentType::FIXEDTEXT:
--            return new ScVbaLabel( m_xContext, m_xControlShape );
--        case form::FormComponentType::TEXTFIELD:
--            return new ScVbaTextBox( m_xContext, m_xControlShape );
--        case form::FormComponentType::RADIOBUTTON:
--            return new ScVbaRadioButton( m_xContext, m_xControlShape );
--        case form::FormComponentType::LISTBOX:
--            return new ScVbaListBox( m_xContext, m_xControlShape );
--        default:
--            throw uno::RuntimeException( rtl::OUString::createFromAscii(
--                    "Donot surpport this Control Type." ), uno::Reference< uno::XInterface >() );
++{
 +#ifdef VBA_OOBUILD_HACK
 +    rtl::OUString sEmpty;
 +    svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
 +#else
 +	throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
 +#endif
-     }
++}
 +
++rtl::OUString SAL_CALL 
++ScVbaControl::getName() throw (uno::RuntimeException)
++{
++	rtl::OUString sName;
++	m_xProps->getPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
++	return sName;
++
++}
++
++void SAL_CALL
++ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
++{
++	m_xProps->setPropertyValue
++            (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
+     }
 +//ScVbaControlFactory
 +
 +ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
@@ -3146,8 +3162,8 @@
              throw uno::RuntimeException( rtl::OUString::createFromAscii(
 -                    "Donot surpport this Control Type." ), uno::Reference< uno::XInterface >() );
 +                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
-     }
- }
++    }
++}
 +
 +ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl,  const uno::Reference< uno::XInterface >& xParent  )  throw (uno::RuntimeException)
 +{
@@ -3208,19 +3224,19 @@
 +	{
 +		aServiceNames.realloc( 1 );
 +		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.excel.Control" ) );
-+	}
+     }
 +	return aServiceNames;
-+}
+ }
 +
 +
 Index: sc/source/ui/vba/vbacontrol.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.hxx,v
 retrieving revision 1.3
-retrieving revision 1.2.42.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
+retrieving revision 1.2.42.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.4
 --- sc/source/ui/vba/vbacontrol.hxx	11 Apr 2008 00:58:09 -0000	1.3
-+++ sc/source/ui/vba/vbacontrol.hxx	5 Sep 2008 14:04:20 -0000	1.2.42.3
++++ sc/source/ui/vba/vbacontrol.hxx	9 Sep 2008 10:22:25 -0000	1.2.42.4
 @@ -35,40 +35,34 @@
  #include <com/sun/star/uno/XComponentContext.hpp>
  #include <com/sun/star/script/XDefaultProperty.hpp>
@@ -3276,7 +3292,7 @@
      // XControl
      virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
      virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
-@@ -82,9 +76,18 @@ public:
+@@ -82,9 +76,20 @@ public:
      virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
      virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
      virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
@@ -3287,6 +3303,8 @@
 +    virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
 +    virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
 +    virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
      //remove resouce because org.openoffice.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
      virtual void removeResouce() throw( css::uno::RuntimeException );
 +    //XHelperInterface
@@ -3295,7 +3313,7 @@
  };
  
  
-@@ -92,16 +95,15 @@ class ScVbaControlFactory
+@@ -92,16 +97,15 @@ class ScVbaControlFactory
  {
  public:
      ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, 
@@ -10541,117 +10559,117 @@
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvsDhaaBj differ
+Binary files /dev/null and /tmp/cvsLqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvsEhaaBj differ
+Binary files /dev/null and /tmp/cvsMqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvsFhaaBj differ
+Binary files /dev/null and /tmp/cvsNqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvsGhaaBj differ
+Binary files /dev/null and /tmp/cvsOqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvsHhaaBj differ
+Binary files /dev/null and /tmp/cvsPqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvsIhaaBj differ
+Binary files /dev/null and /tmp/cvsQqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvsJhaaBj differ
+Binary files /dev/null and /tmp/cvsRqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvsKhaaBj differ
+Binary files /dev/null and /tmp/cvsSqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvsLhaaBj differ
+Binary files /dev/null and /tmp/cvsTqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvsMhaaBj differ
+Binary files /dev/null and /tmp/cvsUqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvsNhaaBj differ
+Binary files /dev/null and /tmp/cvsVqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvsOhaaBj differ
+Binary files /dev/null and /tmp/cvsWqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvsPhaaBj differ
+Binary files /dev/null and /tmp/cvsXqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvsQhaaBj differ
+Binary files /dev/null and /tmp/cvsYqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvsRhaaBj differ
+Binary files /dev/null and /tmp/cvsZqaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvsShaaBj differ
+Binary files /dev/null and /tmp/cvs0qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvsThaaBj differ
+Binary files /dev/null and /tmp/cvs1qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvsUhaaBj differ
+Binary files /dev/null and /tmp/cvs2qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvsVhaaBj differ
+Binary files /dev/null and /tmp/cvs3qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvsWhaaBj differ
+Binary files /dev/null and /tmp/cvs4qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvsXhaaBj differ
+Binary files /dev/null and /tmp/cvs5qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvsYhaaBj differ
+Binary files /dev/null and /tmp/cvs6qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvsZhaaBj differ
+Binary files /dev/null and /tmp/cvs7qaysL differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
@@ -14207,10 +14225,10 @@
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XControl.idl,v
 retrieving revision 1.3
-retrieving revision 1.2.4.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.3
+retrieving revision 1.2.4.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.4
 --- oovbaapi/org/openoffice/msforms/XControl.idl	11 Apr 2008 10:01:02 -0000	1.3
-+++ oovbaapi/org/openoffice/msforms/XControl.idl	5 Sep 2008 14:06:38 -0000	1.2.4.3
++++ oovbaapi/org/openoffice/msforms/XControl.idl	9 Sep 2008 10:22:00 -0000	1.2.4.4
 @@ -37,12 +37,20 @@
  
  //=============================================================================
@@ -14234,6 +14252,14 @@
  	[attribute] boolean Enabled;
  	[attribute] boolean Visible;
      //Size. there are some defferent between Mso and OOo.
+@@ -52,6 +60,7 @@ interface XControl: com::sun::star::uno:
+     //Postion
+     [attribute] double  Left;
+     [attribute] double  Top;
++	[attribute] string Name;
+ };
+ 
+ //=============================================================================
 Index: oovbaapi/org/openoffice/msforms/XGroupBox.idl
 ===================================================================
 RCS file: oovbaapi/org/openoffice/msforms/XGroupBox.idl
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]