diff options
| author | Noel Power <noel.power@suse.com> | 2013-03-27 16:05:33 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-04-04 17:29:54 +0100 |
| commit | c422543bb35af61e05ce3dffc33dd08cbf0dbcc5 (patch) | |
| tree | 3ae6d33a4a6379a66322ac97ebf9467093cc10d9 | |
| parent | prepend Validation.Formula1 results with '=' for anything not a address (diff) | |
| download | core-c422543bb35af61e05ce3dffc33dd08cbf0dbcc5.tar.gz core-c422543bb35af61e05ce3dffc33dd08cbf0dbcc5.zip | |
Remove VBA_OOBUILD_HACK ( it's preventing functionality getting compiled )
Change-Id: I53d1a7c11b0a97e4e021e37e83109e5716bfa173
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 1978899704cf..79de55159281 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -45,9 +45,7 @@ #include <com/sun/star/form/XChangeListener.hpp> #include <ooo/vba/XControlProvider.hpp> #include <ooo/vba/msforms/fmMousePointer.hpp> -#ifdef VBA_OOBUILD_HACK #include <svtools/bindablecontrolhelper.hxx> -#endif #include "vbacontrol.hxx" #include "vbacombobox.hxx" #include "vbabutton.hxx" @@ -287,10 +285,6 @@ void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width 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 -#ifdef VBA_OOBUILD_HACK rtl::OUString sControlSource; uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY ); if ( xBindable.is() ) @@ -310,26 +304,18 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException) } } return sControlSource; -#else - throw uno::RuntimeException( rtl::OUString( "getControlSource not supported" ), uno::Reference< uno::XInterface >()); // not supported -#endif } void SAL_CALL ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException) { -#ifdef VBA_OOBUILD_HACK rtl::OUString sEmpty; svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty ); -#else - throw uno::RuntimeException( rtl::OUString( "setControlSource not supported " ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported -#endif } rtl::OUString SAL_CALL ScVbaControl::getRowSource() throw (uno::RuntimeException) { -#ifdef VBA_OOBUILD_HACK rtl::OUString sRowSource; uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY ); if ( xListSink.is() ) @@ -350,20 +336,15 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException) } } return sRowSource; -#else - throw uno::RuntimeException( rtl::OUString( "getRowSource not supported" ), uno::Reference< uno::XInterface >()); // not supported -#endif } void SAL_CALL ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException) { -#ifdef VBA_OOBUILD_HACK rtl::OUString sEmpty; svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource ); #else throw uno::RuntimeException( rtl::OUString( "setRowSource not supported " ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported -#endif } rtl::OUString SAL_CALL |