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

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13975 - in trunk: . patches/dev300
Date: Sat, 20 Sep 2008 07:45:11 +0000 (UTC)
Author: noelpwer
Date: Sat Sep 20 07:45:11 2008
New Revision: 13975
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13975&view=rev

Log:
2008-09-19  Noel Power  <noel power novell com>

        * patches/dev300/cws-npower11.diff: simple userform controls  collection



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	Sat Sep 20 07:45:11 2008
@@ -96,11 +96,17 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/makefile.mk,v
 retrieving revision 1.6
-retrieving revision 1.5.42.9
-diff -u -p -u -p -b -w -B -r1.6 -r1.5.42.9
+retrieving revision 1.5.42.10
+diff -u -p -u -p -b -w -B -r1.6 -r1.5.42.10
 --- sc/source/ui/vba/makefile.mk	11 Apr 2008 00:46:57 -0000	1.6
-+++ sc/source/ui/vba/makefile.mk	16 Sep 2008 17:55:19 -0000	1.5.42.9
-@@ -88,8 +88,10 @@ SLOFILES= \
++++ sc/source/ui/vba/makefile.mk	19 Sep 2008 18:34:47 -0000	1.5.42.10
+@@ -83,13 +83,16 @@ SLOFILES= \
+ 		$(SLO)$/vbacombobox.obj \
+ 		$(SLO)$/vbavalidation.obj \
+                 $(SLO)$/vbacontrol.obj \
++                $(SLO)$/vbacontrols.obj \
+                 $(SLO)$/vbaoleobject.obj \
+                 $(SLO)$/vbaoleobjects.obj \
                  $(SLO)$/vbabutton.obj \
                  $(SLO)$/vbalabel.obj \
                  $(SLO)$/vbatextbox.obj \
@@ -111,7 +117,7 @@
                  $(SLO)$/vbapropvalue.obj \
                  $(SLO)$/vbapane.obj \
                  $(SLO)$/vbashape.obj \
-@@ -111,8 +113,26 @@ SLOFILES= \
+@@ -111,8 +114,26 @@ SLOFILES= \
                  $(SLO)$/vbaformatconditions.obj \
                  $(SLO)$/vbastyle.obj \
                  $(SLO)$/vbastyles.obj \
@@ -3488,6 +3494,309 @@
  };
  
  #endif//SC_VBA_CONTROL_HXX
+Index: sc/source/ui/vba/vbacontrols.cxx
+===================================================================
+RCS file: sc/source/ui/vba/vbacontrols.cxx
+diff -N sc/source/ui/vba/vbacontrols.cxx
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/vba/vbacontrols.cxx	19 Sep 2008 18:34:47 -0000	1.1.2.1
+@@ -0,0 +1,227 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#include "vbacontrols.hxx"
++#include "vbacontrol.hxx"
++#include <cppuhelper/implbase2.hxx>
++#include <com/sun/star/awt/XControlContainer.hpp>
++#include <hash_map>
++
++using namespace com::sun::star;
++using namespace org::openoffice;
++
++
++typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
++
++typedef  std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
++    ::std::equal_to< ::rtl::OUString >  > ControlIndexMap;
++typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
++
++class ControlArrayWrapper : public ArrayWrapImpl
++{
++    uno::Reference< awt::XControlContainer > mxDialog;
++    uno::Sequence< ::rtl::OUString > msNames;
++    ControlVec mControls;
++    ControlIndexMap mIndices;
++
++    rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
++    {
++        uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
++        rtl::OUString sName;
++        xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
++        return sName;
++    }
++
++public:
++
++    ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
++    {
++        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
++        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
++    
++        msNames.realloc( sXControls.getLength() );
++        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
++        {
++            uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
++            msNames[ i ] = getControlName( xCtrl );
++            mControls.push_back( xCtrl );
++            mIndices[ msNames[ i ] ] = i;
++        }
++    }
++    
++    // XElementAccess
++    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
++    {
++        return awt::XControl::static_type(0);
++    }
++    
++    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
++    {
++        return mControls.size();
++    }
++    
++    // XNameAcess 
++    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( !hasByName( aName ) )
++            throw container::NoSuchElementException();
++        return getByIndex( mIndices[ aName ] );
++    }
++    
++    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
++    {
++        return msNames;
++    }
++    
++    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
++    {
++        ControlIndexMap::iterator it = mIndices.find( aName );
++        return it != mIndices.end();
++    }
++    
++    // XElementAccess
++    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException)
++    {
++        return mControls.size();
++    }
++    
++    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
++    {
++        if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
++            throw lang::IndexOutOfBoundsException();
++        return uno::makeAny( mControls[ Index ] );
++    }
++};
++
++
++class ControlsEnumWrapper : public EnumerationHelper_BASE
++{
++    uno::Reference<vba::XHelperInterface > m_xParent;
++    uno::Reference<uno::XComponentContext > m_xContext;
++    uno::Reference<container::XIndexAccess > m_xIndexAccess;
++    uno::Reference<awt::XControl > m_xDlg;
++    sal_Int32 nIndex;
++
++public:
++
++    ControlsEnumWrapper(  const uno::Reference< vba::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
++
++    virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException)
++    {
++        return ( nIndex < m_xIndexAccess->getCount() );
++    }
++
++    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
++    {
++        if ( nIndex < m_xIndexAccess->getCount() )
++        {
++            uno::Reference< frame::XModel > xModel;
++            uno::Reference< uno::XInterface > xControl;
++            m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
++            // Create control from awt::XControl
++            ScVbaControlFactory aFac( m_xContext, xControl,  xModel );
++            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( m_xDlg->getModel() ) );
++            return uno::makeAny( xVBAControl );
++        }
++        throw container::NoSuchElementException();
++    }
++
++};
++
++
++uno::Reference<container::XIndexAccess >
++lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
++{
++    return new ControlArrayWrapper( xDlg );
++}
++
++ScVbaControls::ScVbaControls( const uno::Reference< vba::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
++                const css::uno::Reference< awt::XControl >& xDialog )
++            : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
++{
++    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
++}
++
++uno::Reference< container::XEnumeration >
++ScVbaControls::createEnumeration() throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
++    if ( !xEnum.is() )
++        throw uno::RuntimeException();
++    return xEnum;
++}
++
++uno::Any
++ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
++{
++    // Create control from awt::XControl
++    uno::Reference< awt::XControl > xControl;
++    aSource >>= xControl;
++    uno::Reference< frame::XModel > xModel;
++    ScVbaControlFactory aFac( mxContext, xControl,  xModel );
++    uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( mxDialog->getModel() ) );
++    return uno::makeAny( xVBAControl );
++}
++
++void SAL_CALL 
++ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
++{
++    uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
++    while ( xEnum->hasMoreElements() )
++    {
++        uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
++        xControl->setLeft( xControl->getLeft() + cx );
++        xControl->setTop( xControl->getTop() + cy ); 
++    }
++}
++
++uno::Type
++ScVbaControls::getElementType() throw (uno::RuntimeException)
++{
++    return org::openoffice::msforms::XControl::static_type(0);
++}
++rtl::OUString& 
++ScVbaControls::getServiceImplName()
++{
++	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
++	return sImplName;
++}
++
++uno::Sequence< rtl::OUString > 
++ScVbaControls::getServiceNames()
++{
++	static uno::Sequence< rtl::OUString > aServiceNames;
++	if ( aServiceNames.getLength() == 0 )
++	{
++		aServiceNames.realloc( 1 );
++		aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.excel.Controls" ) );
++	}
++	return aServiceNames;
++}
+Index: sc/source/ui/vba/vbacontrols.hxx
+===================================================================
+RCS file: sc/source/ui/vba/vbacontrols.hxx
+diff -N sc/source/ui/vba/vbacontrols.hxx
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ sc/source/ui/vba/vbacontrols.hxx	19 Sep 2008 18:34:47 -0000	1.1.2.1
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef SC_VBA_CONTROLS_HXX
++#define SC_VBA_CONTROLS_HXX
++
++#include <cppuhelper/implbase1.hxx>
++#include <org/openoffice/msforms/XControls.hpp>
++#include <com/sun/star/awt/XControl.hpp>
++
++#include "vbacollectionimpl.hxx"
++#include "vbahelper.hxx"
++
++typedef CollTestImplHelper< oo::msforms::XControls > ControlsImpl_BASE;
++
++class ScVbaControls : public ControlsImpl_BASE
++{
++	css::uno::Reference< css::awt::XControl > mxDialog;
++protected:
++	virtual rtl::OUString& getServiceImplName();
++	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
++public:
++    ScVbaControls( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, 
++                    const css::uno::Reference< css::awt::XControl >& xDialog );
++    // XControls
++     virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
++    // XEnumerationAccess
++    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
++    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
++
++    // ScVbaCollectionBaseImpl
++    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
++    
++};
++#endif //SC_VBA_OLEOBJECTS_HXX
++
 Index: sc/source/ui/vba/vbaframe.cxx
 ===================================================================
 RCS file: sc/source/ui/vba/vbaframe.cxx
@@ -9183,8 +9492,8 @@
 RCS file: sc/source/ui/vba/vbauserform.cxx
 diff -N sc/source/ui/vba/vbauserform.cxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sc/source/ui/vba/vbauserform.cxx	5 Sep 2008 14:04:23 -0000	1.1.2.2
-@@ -0,0 +1,218 @@
++++ sc/source/ui/vba/vbauserform.cxx	19 Sep 2008 18:34:47 -0000	1.1.2.3
+@@ -0,0 +1,228 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -9228,6 +9537,7 @@
 +#include <basic/sbstar.hxx>
 +#include <basic/sbmeth.hxx>
 +#include "unonames.hxx"
++#include "vbacontrols.hxx"
 +
 +using namespace ::org::openoffice;
 +using namespace ::com::sun::star;
@@ -9377,6 +9687,15 @@
 +{
 +	return sal_False;
 +}
++uno::Any SAL_CALL 
++ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
++{
++	uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
++	uno::Reference< vba::XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
++	if ( index.hasValue() )
++		return uno::makeAny( xControls->Item( index, uno::Any() ) );
++	return uno::makeAny( xControls );
++}
 +
 +::sal_Bool SAL_CALL 
 +ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
@@ -9408,7 +9727,7 @@
 RCS file: sc/source/ui/vba/vbauserform.hxx
 diff -N sc/source/ui/vba/vbauserform.hxx
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sc/source/ui/vba/vbauserform.hxx	5 Sep 2008 14:04:24 -0000	1.1.2.2
++++ sc/source/ui/vba/vbauserform.hxx	19 Sep 2008 18:34:47 -0000	1.1.2.3
 @@ -0,0 +1,78 @@
 +/*************************************************************************
 + *
@@ -9482,7 +9801,7 @@
 +    virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
 +    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException);
 +    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException);
-+
++    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
 +    //XHelperInterface
 +    virtual rtl::OUString& getServiceImplName();
 +    virtual css::uno::Sequence<rtl::OUString> getServiceNames();
@@ -11087,117 +11406,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/cvshla4mK differ
+Binary files /dev/null and /tmp/cvsjQa4Tk 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/cvsila4mK differ
+Binary files /dev/null and /tmp/cvskQa4Tk 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/cvsjla4mK differ
+Binary files /dev/null and /tmp/cvslQa4Tk 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/cvskla4mK differ
+Binary files /dev/null and /tmp/cvsmQa4Tk 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/cvslla4mK differ
+Binary files /dev/null and /tmp/cvsnQa4Tk 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/cvsmla4mK differ
+Binary files /dev/null and /tmp/cvsoQa4Tk 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/cvsnla4mK differ
+Binary files /dev/null and /tmp/cvspQa4Tk 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/cvsola4mK differ
+Binary files /dev/null and /tmp/cvsqQa4Tk 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/cvspla4mK differ
+Binary files /dev/null and /tmp/cvsrQa4Tk 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/cvsqla4mK differ
+Binary files /dev/null and /tmp/cvssQa4Tk 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/cvsrla4mK differ
+Binary files /dev/null and /tmp/cvstQa4Tk 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/cvssla4mK differ
+Binary files /dev/null and /tmp/cvsuQa4Tk 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/cvstla4mK differ
+Binary files /dev/null and /tmp/cvsvQa4Tk 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/cvsula4mK differ
+Binary files /dev/null and /tmp/cvswQa4Tk 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/cvsvla4mK differ
+Binary files /dev/null and /tmp/cvsxQa4Tk 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/cvswla4mK differ
+Binary files /dev/null and /tmp/cvsyQa4Tk 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/cvsxla4mK differ
+Binary files /dev/null and /tmp/cvszQa4Tk 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/cvsyla4mK differ
+Binary files /dev/null and /tmp/cvsAQa4Tk 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/cvszla4mK differ
+Binary files /dev/null and /tmp/cvsBQa4Tk 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/cvsAla4mK differ
+Binary files /dev/null and /tmp/cvsCQa4Tk 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/cvsBla4mK differ
+Binary files /dev/null and /tmp/cvsDQa4Tk 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/cvsCla4mK differ
+Binary files /dev/null and /tmp/cvsEQa4Tk 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/cvsDla4mK differ
+Binary files /dev/null and /tmp/cvsFQa4Tk differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
@@ -14737,11 +15056,11 @@
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XComboBox.idl,v
 retrieving revision 1.3
-retrieving revision 1.2.8.3
-diff -u -p -u -p -b -w -B -r1.3 -r1.2.8.3
+retrieving revision 1.2.8.4
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.8.4
 --- oovbaapi/org/openoffice/msforms/XComboBox.idl	11 Apr 2008 10:00:49 -0000	1.3
-+++ oovbaapi/org/openoffice/msforms/XComboBox.idl	15 Sep 2008 19:19:47 -0000	1.2.8.3
-@@ -44,6 +44,8 @@ module org {  module openoffice {  modul
++++ oovbaapi/org/openoffice/msforms/XComboBox.idl	19 Sep 2008 18:34:15 -0000	1.2.8.4
+@@ -44,8 +44,11 @@ module org {  module openoffice {  modul
  interface XComboBox: ::com::sun::star::uno::XInterface
  {
  	[attribute] any Value;
@@ -14749,7 +15068,10 @@
 +	[attribute, readonly ] long ListCount;
  	[attribute] string Text;
  	void AddItem( [in] any pvargItem, [in] any pvargIndex );
++	void removeItem( [in] any index );
  	void Clear();
+ };
+ 
 Index: oovbaapi/org/openoffice/msforms/XControl.idl
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XControl.idl,v
@@ -14789,6 +15111,64 @@
  };
  
  //=============================================================================
+Index: oovbaapi/org/openoffice/msforms/XControls.idl
+===================================================================
+RCS file: oovbaapi/org/openoffice/msforms/XControls.idl
+diff -N oovbaapi/org/openoffice/msforms/XControls.idl
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ oovbaapi/org/openoffice/msforms/XControls.idl	19 Sep 2008 18:34:15 -0000	1.1.2.1
+@@ -0,0 +1,51 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_msforms_XControls_idl__
++#define __org_openoffice_msforms_XControls_idl__
++
++#ifndef __org_openoffice_vba_XHelperInterface_idl__
++#include <org/openoffice/vba/XHelperInterface.idl>
++#endif
++#ifndef  __org_openoffice_vba_XCollection_idl__
++#include <org/openoffice/vba/XCollection.idl>
++#endif
++module org { module openoffice { module msforms {
++
++interface XControl;
++
++interface XControls 
++{
++    interface org::openoffice::vba::XCollection;
++    void Move( [in] double cx, [in] double cy );
++};
++}; }; };
++
++
++#endif
 Index: oovbaapi/org/openoffice/msforms/XGroupBox.idl
 ===================================================================
 RCS file: oovbaapi/org/openoffice/msforms/XGroupBox.idl
@@ -15454,8 +15834,8 @@
 RCS file: oovbaapi/org/openoffice/msforms/XUserForm.idl
 diff -N oovbaapi/org/openoffice/msforms/XUserForm.idl
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ oovbaapi/org/openoffice/msforms/XUserForm.idl	22 Apr 2008 19:51:00 -0000	1.1.2.1
-@@ -0,0 +1,57 @@
++++ oovbaapi/org/openoffice/msforms/XUserForm.idl	19 Sep 2008 18:34:15 -0000	1.1.2.2
+@@ -0,0 +1,58 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -15509,6 +15889,7 @@
 +    void Hide();
 +    void RePaint();
 +    void UnloadObject();
++    any Controls( [in] any index );
 +};
 +}; }; };
 +
@@ -15517,11 +15898,11 @@
 ===================================================================
 RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/makefile.mk,v
 retrieving revision 1.4
-retrieving revision 1.3.4.5
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.5
+retrieving revision 1.3.4.6
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.6
 --- oovbaapi/org/openoffice/msforms/makefile.mk	11 Apr 2008 10:03:53 -0000	1.4
-+++ oovbaapi/org/openoffice/msforms/makefile.mk	5 Sep 2008 14:06:38 -0000	1.3.4.5
-@@ -60,7 +60,16 @@ IDLFILES=\
++++ oovbaapi/org/openoffice/msforms/makefile.mk	19 Sep 2008 18:34:15 -0000	1.3.4.6
+@@ -60,7 +60,17 @@ IDLFILES=\
  	XFillFormat.idl \
  	XPictureFormat.idl \
  	XShapeRange.idl \
@@ -15536,6 +15917,7 @@
 +	XPages.idl \
 +	XSpinButton.idl \
 +	XImage.idl \
++	XControls.idl \
  
  # ------------------------------------------------------------------
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]