summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-07 10:39:14 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-07 10:39:14 +0000
commit52de18a9add96e35461563137a6f8b4a9d08e290 (patch)
tree067907ff1968abcb25592f559b1d28fd17ec4ce4
parent25b3be376dd6731e1838840e5a928b82d7bc98b6 (diff)
fix merge issues in scripting
-rw-r--r--scripting/source/basprov/basscript.cxx42
-rw-r--r--scripting/source/basprov/basscript.hxx1
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx2
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx8
-rw-r--r--scripting/util/provider/beanshell/delzip0
5 files changed, 4 insertions, 49 deletions
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index f4a4d3a763..71914d6d78 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -165,48 +165,6 @@ namespace basprov
}
// -----------------------------------------------------------------------------
- // XInterface
- // -----------------------------------------------------------------------------
-
- IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-
- // -----------------------------------------------------------------------------
- // XTypeProvider
- // -----------------------------------------------------------------------------
-
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-
- // -----------------------------------------------------------------------------
- // OPropertySetHelper
- // -----------------------------------------------------------------------------
-
- ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper( )
- {
- return *getArrayHelper();
- }
-
- // -----------------------------------------------------------------------------
- // OPropertyArrayUsageHelper
- // -----------------------------------------------------------------------------
-
- ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper( ) const
- {
- Sequence< Property > aProps;
- describeProperties( aProps );
- return new ::cppu::OPropertyArrayHelper( aProps );
- }
-
- // -----------------------------------------------------------------------------
- // XPropertySet
- // -----------------------------------------------------------------------------
-
- Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo( ) throw (RuntimeException)
- {
- Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
- }
-
- // -----------------------------------------------------------------------------
// XScript
// -----------------------------------------------------------------------------
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 878b5622d1..f7b7e78bac 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -108,7 +108,6 @@ namespace basprov
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw (::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::RuntimeException );
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index fa4a8ff687..5762c34760 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -369,9 +369,9 @@ namespace dlgprov
}
}
rtl::OUString sDialogCodeName;
+ const Reference< XInterface >* pObjects = Objects.getConstArray();
sal_Int32 nObjCount = Objects.getLength();
Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog
- rtl::OUString sDialogCodeName;
if ( xDlgControl.is() )
{
Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 500e74d579..f71d61567f 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -69,7 +69,6 @@
#include <com/sun/star/awt/XListBox.hpp>
#include "vbamsformreturntypes.hxx"
-#include <msforms/ReturnInteger.hpp>
#include <sfx2/objsh.hxx>
#include <basic/sbstar.hxx>
@@ -584,7 +583,6 @@ ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException)
}
sal_Bool SAL_CALL
->>>>>>> stage/premerge/dev300_m98
ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException)
{
EventSupplierHash::const_iterator it = m_hEvents.find( aName );
@@ -1019,8 +1017,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
OSL_TRACE("*** trying to invoke %s ",
rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
- ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
- if ( aMacroResolvedInfo.IsResolved() )
+ ooo::vba::MacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
+ if ( aMacroResolvedInfo.mbFound )
{
if (! txInfo->ApproveRule(evt, txInfo->pPara) )
{
@@ -1038,7 +1036,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
// call basic event handlers for event
// create script url
- rtl::OUString url = aMacroResolvedInfo.ResolvedMacro();
+ rtl::OUString url = aMacroResolvedInfo.msResolvedMacro;
OSL_TRACE("resolved script = %s",
rtl::OUStringToOString( url,
diff --git a/scripting/util/provider/beanshell/delzip b/scripting/util/provider/beanshell/delzip
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/scripting/util/provider/beanshell/delzip