summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-04-05 09:04:42 +0100
committerNoel Power <noel.power@suse.com>2013-04-05 09:06:29 +0100
commitc2ac410fe6b709b1e75a5a7165e3233a8fb4f98b (patch)
treefb14ee2477febff359e92f27285b49e5d7437bbd
parent975192e72eacbc2ab53c94a394eca11bb3a60728 (diff)
Revert "Added and fixed various vba API"
-rw-r--r--oovbaapi/ooo/vba/excel/XOLEObject.idl1
-rw-r--r--oovbaapi/ooo/vba/excel/XValidation.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XComboBox.idl1
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx17
-rw-r--r--sc/source/ui/vba/vbaoleobject.hxx4
-rw-r--r--sc/source/ui/vba/vbavalidation.cxx40
-rw-r--r--sc/source/ui/vba/vbavalidation.hxx1
-rw-r--r--svtools/inc/svtools/bindablecontrolhelper.hxx2
-rw-r--r--svtools/source/misc/bindablecontrolhelper.cxx7
-rw-r--r--vbahelper/Library_msforms.mk1
-rw-r--r--vbahelper/source/msforms/vbacombobox.cxx10
-rw-r--r--vbahelper/source/msforms/vbacombobox.hxx2
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx56
13 files changed, 12 insertions, 131 deletions
diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index af1a8d1e23d8..9eb3bc2601cd 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -38,7 +38,6 @@ interface XOLEObject
[attribute] double Top;
[attribute] double Height;
[attribute] double Width;
- [attribute] string LinkedCell;
};
//=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index a6549a9ecebf..873ca6dea846 100644
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -41,7 +41,6 @@ interface XValidation
[attribute] string ErrorMessage;
[attribute, readonly] string Formula1;
[attribute, readonly] string Formula2;
- [attribute, readonly] long Type;
void Delete();
void Add( [in] any Type, [in] any AlertStyle, [in] any Operator, [in] any Formula1, [in] any Formula2);
};
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index ac1b5701539d..02ee4982ff70 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -44,7 +44,6 @@ interface XComboBox
[attribute] boolean Locked;
[attribute, readonly] long TextLength;
[attribute, readonly] XNewFont Font;
- [attribute] string LinkedCell;
void AddItem( [in] any pvargItem, [in] any pvargIndex );
void removeItem( [in] any index );
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index 8824921ac73d..e02d7e0e99cb 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -25,10 +25,7 @@
#include <ooo/vba/XControlProvider.hpp>
#include "vbaoleobject.hxx"
-#include <svx/svdobj.hxx>
-#include "drwlayer.hxx"
-#include "excelvbahelper.hxx"
-#include <svtools/bindablecontrolhelper.hxx>
+
using namespace com::sun::star;
using namespace ooo::vba;
@@ -41,7 +38,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen
uno::Reference< container::XChild > xChild( xControlModel, uno::UNO_QUERY_THROW );
xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
- uno::Reference<frame::XModel> xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) );
@@ -128,16 +125,6 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
m_xControl->setWidth( _width );
}
-rtl::OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException)
-{
- return m_xControl->getControlSource();
-}
-
-void SAL_CALL ScVbaOLEObject::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException)
-{
- m_xControl->setControlSource( _linkedcell );
-}
-
rtl::OUString
ScVbaOLEObject::getServiceImplName()
{
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index 40596383caf2..48bcaf3541ac 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -45,7 +45,6 @@ public:
virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
-
virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
@@ -54,8 +53,7 @@ public:
virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException);
+
};
#endif //SC_VBA_OLEOBJECT_HXX
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index c42d97f2d902..1ba1724ed179 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -317,46 +317,6 @@ ScVbaValidation::getFormula2() throw (uno::RuntimeException)
return xCond->getFormula2();
}
-sal_Int32 SAL_CALL
-ScVbaValidation::getType() throw (uno::RuntimeException)
-{
- uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- sheet::ValidationType nValType = sheet::ValidationType_ANY;
- xProps->getPropertyValue( STYPE ) >>= nValType;
- sal_Int32 nExcelType = excel::XlDVType::xlValidateList; // pick a default
- if ( xProps.is() )
- {
- switch ( nValType )
- {
- case sheet::ValidationType_LIST:
- nExcelType = excel::XlDVType::xlValidateList;
- break;
- case sheet::ValidationType_ANY: // not ANY not really a great match for anything I fear:-(
- nExcelType = excel::XlDVType::xlValidateInputOnly;
- break;
- case sheet::ValidationType_CUSTOM:
- nExcelType = excel::XlDVType::xlValidateCustom;
- break;
- case sheet::ValidationType_WHOLE:
- nExcelType = excel::XlDVType::xlValidateWholeNumber;
- break;
- case sheet::ValidationType_DECIMAL:
- nExcelType = excel::XlDVType::xlValidateDecimal;
- break;
- case sheet::ValidationType_DATE:
- nExcelType = excel::XlDVType::xlValidateDate;
- break;
- case sheet::ValidationType_TIME:
- nExcelType = excel::XlDVType::xlValidateTime;
- break;
- case sheet::ValidationType_TEXT_LEN:
- nExcelType = excel::XlDVType::xlValidateTextLength;
- break;
- };
- }
- return nExcelType;
-}
-
rtl::OUString
ScVbaValidation::getServiceImplName()
{
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index ea236a31c085..0acd975de31c 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -51,7 +51,6 @@ public:
virtual void SAL_CALL setErrorMessage( const ::rtl::OUString& _errormessage ) throw (css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ;
virtual ::rtl::OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
// Methods
virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException);
diff --git a/svtools/inc/svtools/bindablecontrolhelper.hxx b/svtools/inc/svtools/bindablecontrolhelper.hxx
index d9e4e7d7aa28..15d0d0db1603 100644
--- a/svtools/inc/svtools/bindablecontrolhelper.hxx
+++ b/svtools/inc/svtools/bindablecontrolhelper.hxx
@@ -40,7 +40,7 @@ namespace svt
BindableControlHelper(); // never implemented
public:
- SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
+ SVT_DLLPUBLIC static void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource );
};
//........................................................................
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index e5cd428f14ba..9c577477aad7 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -71,7 +71,7 @@ bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< fram
void
-BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab )
+BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource )
{
// XBindable etc.
uno::Reference< lang::XMultiServiceFactory > xFac;
@@ -91,8 +91,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno
{
// we need this service to properly convert XL notation also
// Should be easy to extend
- xConvertor->setPropertyValue( C2U( "ReferenceSheet" ), uno::makeAny( nRefTab ) );
- xConvertor->setPropertyValue( C2U( "XLA1Representation" ), uno::makeAny( rsCtrlSource ) );
+ xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) );
xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
}
@@ -124,7 +123,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno
{
// we need this service to properly convert XL notation also
// Should be easy to extend
- xConvertor->setPropertyValue( C2U( "XLA1Representation" ), uno::makeAny( rsRowSource ) );
+ xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) );
xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress;
}
}
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index ac9c7bd7cb38..63d0f67aeb5c 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_use_libraries,msforms,\
svl \
svt \
svx \
- svxcore \
tk \
tl \
vbahelper \
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index dbdabc2d471d..b78dea3111f8 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -277,16 +277,6 @@ void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeEx
ScVbaControl::setLocked( bLocked );
}
-rtl::OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException)
-{
- return ScVbaControl::getControlSource();
-}
-
-void SAL_CALL ScVbaComboBox::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException)
-{
- ScVbaControl::setControlSource( _linkedcell );
-}
-
uno::Sequence< OUString >
ScVbaComboBox::getServiceNames()
{
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 06adc9df929a..f71f9c169953 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -69,8 +69,6 @@ public:
virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException);
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (css::uno::RuntimeException);
// Methods
virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index b788368b8df4..075c26c8ab23 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -56,10 +56,6 @@
#include <vbahelper/helperdecl.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/form/XFormsSupplier.hpp>
-#include <svx/svdobj.hxx>
-
using namespace com::sun::star;
using namespace ooo::vba;
@@ -306,7 +302,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException)
table::CellAddress aAddress;
xProps->getPropertyValue( "BoundCell" ) >>= aAddress;
xConvertor->setPropertyValue( "Address" , uno::makeAny( aAddress ) );
- xConvertor->getPropertyValue( "XLA1Representation" ) >>= sControlSource;
+ xConvertor->getPropertyValue( "XL_A1_Representation" ) >>= sControlSource;
}
catch(const uno::Exception&)
{
@@ -319,40 +315,7 @@ void SAL_CALL
ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::RuntimeException)
{
OUString sEmpty;
- // afaik this is only relevant for Excel documents ( and we need to set up a
- // reference tab in case no Sheet is specified in "_controlsource"
- // Can't use the active sheet either, code may of course access
- uno::Reference< drawing::XDrawPagesSupplier > xSupplier( m_xModel, uno::UNO_QUERY_THROW );
- uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
- sal_Int32 nLen = xIndex->getCount();
- bool bMatched = false;
- sal_Int16 nRefTab = 0;
- for ( sal_Int32 index = 0; index < nLen; ++index )
- {
- try
- {
- uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
- uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
- // get the www-standard container
- uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
- sal_Int32 nCntrls = xFormControls->getCount();
- for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
- {
- uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
- bMatched = ( m_xProps == xControl );
- if ( bMatched )
- {
- nRefTab = index;
- break;
- }
- }
- }
- catch( uno::Exception& ) {}
- if ( bMatched )
- break;
- }
-
- svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty, sal_uInt16( nRefTab ) );
+ svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
}
OUString SAL_CALL
@@ -371,7 +334,7 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException)
table::CellRangeAddress aAddress;
xProps->getPropertyValue( "CellRange" ) >>= aAddress;
xConvertor->setPropertyValue( "Address" , uno::makeAny( aAddress ) );
- xConvertor->getPropertyValue( "XLA1Representation" ) >>= sRowSource;
+ xConvertor->getPropertyValue( "XL_A1_Representation" ) >>= sRowSource;
}
catch(const uno::Exception&)
{
@@ -736,21 +699,12 @@ void ScVbaControl::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeExcep
sal_Bool ScVbaControl::getAutoSize() throw (uno::RuntimeException)
{
- bool bIsResizeEnabled = false;
- uno::Reference< uno::XInterface > xIf( m_xControl, uno::UNO_QUERY_THROW );
- SdrObject* pObj = SdrObject::getSdrObjectFromXShape( xIf );
- if ( pObj )
- bIsResizeEnabled = !pObj->IsResizeProtect();
- return bIsResizeEnabled;
+ return sal_False;
}
// currently no implementation for this
-void ScVbaControl::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException)
+void ScVbaControl::setAutoSize( sal_Bool /*bAutoSize*/ ) throw (uno::RuntimeException)
{
- uno::Reference< uno::XInterface > xIf( m_xControl, uno::UNO_QUERY_THROW );
- SdrObject* pObj = SdrObject::getSdrObjectFromXShape( xIf );
- if ( pObj )
- pObj->SetResizeProtect( !bAutoSize );
}
sal_Bool ScVbaControl::getLocked() throw (uno::RuntimeException)