oovbaapi/ooo/vba/excel/XOLEObject.idl | 1 oovbaapi/ooo/vba/excel/XValidation.idl | 1 oovbaapi/ooo/vba/msforms/XComboBox.idl | 1 sc/inc/viewuno.hxx | 3 - sc/source/ui/unoobj/viewuno.cxx | 49 +---------------- sc/source/ui/vba/vbaapplication.cxx | 15 ----- sc/source/ui/vba/vbaapplication.hxx | 2 sc/source/ui/vba/vbaoleobject.cxx | 17 ----- sc/source/ui/vba/vbaoleobject.hxx | 4 - sc/source/ui/vba/vbarange.cxx | 4 - sc/source/ui/vba/vbarange.hxx | 1 sc/source/ui/vba/vbavalidation.cxx | 59 -------------------- sc/source/ui/vba/vbavalidation.hxx | 1 svtools/inc/svtools/bindablecontrolhelper.hxx | 2 svtools/source/misc/bindablecontrolhelper.cxx | 7 +- vbahelper/Library_msforms.mk | 1 vbahelper/source/msforms/vbacombobox.cxx | 10 --- vbahelper/source/msforms/vbacombobox.hxx | 2 vbahelper/source/msforms/vbacontrol.cxx | 74 ++------------------------ vbahelper/source/vbahelper/vbacommandbars.cxx | 4 - 20 files changed, 21 insertions(+), 237 deletions(-)
New commits: commit ad5ab71bdbc50f4d6e9b3ebdfbceb7229718cc1c Author: Noel Power <[email protected]> Date: Fri Apr 5 09:07:37 2013 +0100 Revert "fix 'Visible' property for XControlShape(s) Foreach support for CommandBars" This reverts commit 5a588c257056b2e9f0b324b1904b1e568c762a94. diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 78fbf41..f97ee77 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -188,14 +188,7 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException) { sal_Bool bVisible( sal_True ); - uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ); - if ( xControlShape.is() ) - { - uno::Reference< beans::XPropertySet > xProps( m_xControl, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue ( "Visible" ) >>= bVisible; - } - else - m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible; + m_xProps->getPropertyValue( "EnableVisible" ) >>= bVisible; return bVisible; } @@ -203,12 +196,6 @@ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeE { uno::Any aValue( bVisible ); m_xProps->setPropertyValue( "EnableVisible" , aValue); - uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ); - if ( xControlShape.is() ) - { - uno::Reference< beans::XPropertySet > xProps( m_xControl, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue ( "Visible", aValue ); - } } double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException) { diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index a1515fb..e8a2000 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -63,10 +63,6 @@ public: { uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl ); uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False ) ); - // Strange, shouldn't the Enumeration support match/share the - // iteration code? ( e.g. ScVbaCommandBars::Item(...) ) - // and we at least should return here ( something ) it seems - return uno::makeAny( xCommandBar ); } else return nextElement(); commit f1b7edc1e728f0ac0ed93e93b69b0f42c30f5d04 Author: Noel Power <[email protected]> Date: Fri Apr 5 09:06:01 2013 +0100 Revert "fix selection change event firing" This reverts commit 4624a195238f27d9c7784aa3a710e479cb371ac6. diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 6411979..da2f96c 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -205,8 +205,7 @@ private: void EndMouseListening(); void StartActivationListening(); void EndActivationListening(); - bool mbLeftMousePressed; - bool mbPendingSelectionChanged; + ScTabViewObj(); // disabled public: ScTabViewObj(ScTabViewShell* pViewSh); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index b54a4ce..b9f9541 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -463,9 +463,7 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : aMouseClickHandlers( 0 ), aActivationListeners( 0 ), nPreviousTab( 0 ), - bDrawSelModeSet(false), - mbLeftMousePressed(false ), - mbPendingSelectionChanged(false) + bDrawSelModeSet(false) { if (pViewSh) nPreviousTab = pViewSh->GetViewData()->GetTabNo(); @@ -1186,17 +1184,13 @@ bool ScTabViewObj::IsMouseListening() const SCTAB nTab = pViewData->GetTabNo(); return pDoc->HasSheetEventScript( nTab, SC_SHEETEVENT_RIGHTCLICK, true ) || - pDoc->HasSheetEventScript( nTab, SC_SHEETEVENT_DOUBLECLICK, true ) || - pDoc->HasSheetEventScript( nTab, SC_SHEETEVENT_SELECT, true ); - + pDoc->HasSheetEventScript( nTab, SC_SHEETEVENT_DOUBLECLICK, true ); } sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) throw (::uno::RuntimeException) { sal_Bool bReturn(false); - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) - mbLeftMousePressed = true; uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y)); if (!aMouseClickHandlers.empty() && xTarget.is()) @@ -1287,26 +1281,6 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) sal_Bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException) { - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) - { - try - { - mbPendingSelectionChanged = false; - ScTabViewShell* pViewSh = GetViewShell(); - ScViewData* pViewData = pViewSh->GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents( pDoc->GetVbaEventProcessor(), uno::UNO_SET_THROW ); - uno::Sequence< uno::Any > aArgs( 1 ); - aArgs[ 0 ] <<= getSelection(); - xVbaEvents->processVbaEvent( ScSheetEvents::GetVbaSheetEventId( SC_SHEETEVENT_SELECT ), aArgs ); - } - catch( uno::Exception& ) - { - } - mbLeftMousePressed = false; - } - sal_Bool bReturn(false); if (!aMouseClickHandlers.empty()) @@ -1772,24 +1746,7 @@ void ScTabViewObj::SelectionChanged() /*ErrCode eRet =*/ pDocSh->CallXScript( *pScript, aParams, aRet, aOutArgsIndex, aOutArgs ); } } - if ( !mbLeftMousePressed ) // selection still in progress - { - mbPendingSelectionChanged = false; - try - { - uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents( pDoc->GetVbaEventProcessor(), uno::UNO_SET_THROW ); - uno::Sequence< uno::Any > aArgs( 1 ); - aArgs[ 0 ] <<= getSelection(); - xVbaEvents->processVbaEvent( ScSheetEvents::GetVbaSheetEventId( SC_SHEETEVENT_SELECT ), aArgs ); - } - catch( uno::Exception& ) - { - } - } - else - { - mbPendingSelectionChanged = true; - } + // Removed Sun/Oracle code intentionally, it doesn't work properly ( selection should be fired after mouse release ) } diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 075c26c..78fbf41 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -188,14 +188,11 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException) { sal_Bool bVisible( sal_True ); - m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible; uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ); if ( xControlShape.is() ) { - bool bEnableVisible = bVisible; uno::Reference< beans::XPropertySet > xProps( m_xControl, uno::UNO_QUERY_THROW ); xProps->getPropertyValue ( "Visible" ) >>= bVisible; - bVisible = bVisible && bEnableVisible; } else m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible; commit 60b6ce1d9c56416e2f8b5d4ffd4187bf7d479527 Author: Noel Power <[email protected]> Date: Fri Apr 5 09:04:53 2013 +0100 Revert "squash NoSuchElementExceptions when modifying keybindings" This reverts commit 276914e9cedfa28cc4461e9020c51c6e982f3a94. diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index db8bcaf..f15f0ab 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1297,21 +1297,6 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) -{ - try - { - // Perhaps we can catch some excel specific - // related behaviour here - VbaApplicationBase::OnKey( Key, Procedure ); - } - catch( container::NoSuchElementException& ) - { - // #TODO special handling for unhandled - // bindings - } -} - rtl::OUString ScVbaApplication::getServiceImplName() { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 7541178..072bd0c 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -96,7 +96,7 @@ public: virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException); virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnKey( const ::rtl::OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException); virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException); commit c2ac410fe6b709b1e75a5a7165e3233a8fb4f98b Author: Noel Power <[email protected]> Date: Fri Apr 5 09:04:42 2013 +0100 Revert "Added and fixed various vba API" This reverts commit 57b8dcc4323f736f51f9ed8334affeb042efbca4. diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl index af1a8d1..9eb3bc2 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 a6549a9..873ca6d 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 ac1b570..02ee498 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 8824921..e02d7e0 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 4059638..48bcaf3 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 c42d97f..1ba1724 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 ea236a3..0acd975 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 d9e4e7d..15d0d0d 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 e5cd428..9c57747 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 ac9c7bd..63d0f67 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 dbdabc2..b78dea3 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 06adc9d..f71f9c1 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 b788368..075c26c 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) commit 975192e72eacbc2ab53c94a394eca11bb3a60728 Author: Noel Power <[email protected]> Date: Fri Apr 5 09:04:06 2013 +0100 Revert "prepend Validation.Formula1 results with '=' for anything not a address" This reverts commit b23f3059af8724cf6c1b19a4835e1bca3522ab2c. diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index abbe31e..8b77f27 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1146,7 +1146,7 @@ public: }; bool -ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) +getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ) { ScDocument* pDoc = NULL; @@ -1221,7 +1221,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S } sal_uInt16 nFlags = 0; - if ( !ScVbaRange::getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv, aChar ) ) + if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv, aChar ) ) return false; bool bTabFromReferrer = !( nFlags & SCA_TAB_3D ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 7c3a3d9..ff4c618 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -285,7 +285,6 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException); - static bool getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); // XErrorQuery diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 7431370..c42d97f 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -28,9 +28,6 @@ #include <ooo/vba/excel/XlDVAlertStyle.hpp> #include "unonames.hxx" -#include "rangelst.hxx" -#include "excelvbahelper.hxx" -#include "vbarange.hxx" using namespace ::ooo::vba; using namespace ::com::sun::star; @@ -310,21 +307,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un ScVbaValidation::getFormula1() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); - rtl::OUString sString = xCond->getFormula1(); - - sal_uInt16 nFlags = 0; - ScRangeList aCellRanges; - formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1; - - ScDocShell* pDocSh = excel::GetDocShellFromRange( m_xRange ); - // in calc validation formula is either a range or formula - // that results in range. - // In VBA both formula and address can have a leading '=' - // in result of getFormula1, however it *seems* that a named range or - // real formula has to (or is expected to) have the '=' - if ( pDocSh && !ScVbaRange::getCellRangesForAddress( nFlags, sString, pDocSh, aCellRanges, eConv ) ) - sString = "=" + sString; - return sString; + return xCond->getFormula1(); } ::rtl::OUString SAL_CALL _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
