summaryrefslogtreecommitdiff
path: root/vbahelper/source
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-08-24 20:46:27 +0100
committerNoel Power <noel.power@suse.com>2012-08-26 09:49:24 +0100
commit44dc8746f3d521b73123522f345d0f676622c2b3 (patch)
treed15b49ee6e23701fe0f1bbfc1c624ae0988aedf8 /vbahelper/source
parent6573690587f63f6402e24e2db2e986570a2490f0 (diff)
remove VBA_OOBUILD_HACK and friends
Change-Id: I5c21a407bcae1b668976b94a757d564120973b1a
Diffstat (limited to 'vbahelper/source')
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx18
1 files changed, 0 insertions, 18 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index b0425993d77d..6b1b5bba68c9 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -36,9 +36,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"
@@ -281,7 +279,6 @@ 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() )
@@ -301,26 +298,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() )
@@ -341,20 +330,13 @@ 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