summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-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
4 files changed, 3 insertions, 59 deletions
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-18 23:09:53 +0000