fix two VBA patches to apply again

2 files changed, 11 insertions, 45 deletions

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index fb11e796c..b4fe47a63 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -1314,7 +1314,7 @@ index 18b36c4..049447a 100644
  using ::rtl::OUString;
  
  // defined in docfunc.cxx ( really this needs a new name )
-@@ -244,14 +249,41 @@ void ImportExcel8::ReadBasic( void )
+@@ -244,13 +244,41 @@
          bool bLoadCode = pFilterOpt->IsLoadExcelBasicCode();
          bool bLoadExecutable = pFilterOpt->IsLoadExcelBasicExecutable();
          bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
@@ -1327,14 +1327,13 @@ index 18b36c4..049447a 100644
  
              if ( !bAsComment )
              {
--                ScDocument& rDoc = GetDoc();
 +                try
 +                {
 +                    uno::Reference< lang::XComponent > xComponent( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+                    
++
 +                    uno::Reference< document::XImporter > xImporter( ScfApiHelper::CreateInstance( CREATE_OUSTRING( "com.sun.star.comp.xls.SimpleExcelVBAProjFilter" ) ), uno::UNO_QUERY_THROW );
 +                    xImporter->setTargetDocument( xComponent );
-+        
++
 +                    MediaDescriptor aMediaDesc;
 +                    SfxMedium& rMedium = GetMedium();
 +                    SfxItemSet* pItemSet = rMedium.GetItemSet();
@@ -1347,7 +1346,7 @@ index 18b36c4..049447a 100644
 +                    }
 +                    aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
 +                    aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler();
-+        
++
 +                    // call the filter
 +                    uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
 +                    xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
@@ -2960,39 +2959,6 @@ index fa6d50a..7d72e8b 100644
  struct LanguageDependentProp
  {
      const char* pPropName;
-@@ -119,32 +123,6 @@ namespace
-         return s_aLanguageDependentProperties;
-     }
- 
--    static uno::Reference< graphic::XGraphic > lcl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
--    {
--        uno::Reference< graphic::XGraphic > xGraphic;
--        if ( !_rURL.getLength() )
--            return xGraphic;
--
--        try
--        {
--            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
--            uno::Reference< graphic::XGraphicProvider > xProvider;
--            if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
--            {
--                uno::Sequence< beans::PropertyValue > aMediaProperties(1);
--                aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
--                aMediaProperties[0].Value <<= _rURL;
--                xGraphic = xProvider->queryGraphic( aMediaProperties );
--            }
--        }
--        catch( const Exception& )
--        {
--            DBG_UNHANDLED_EXCEPTION();
--        }
--
--        return xGraphic;
--    }
--
-     static ::rtl::OUString lcl_GetStringProperty( const ::rtl::OUString& sProperty, const Reference< XPropertySet >& xSet )
-     {
-         ::rtl::OUString sValue;
 @@ -262,14 +240,91 @@ static const ::rtl::OUString& getStepPropertyName( )
      return s_sStepProperty;
  }
@@ -5618,7 +5584,7 @@ index fbe68fe..c74ee06 100644
  
  
  using namespace ::com::sun::star;
-@@ -49,66 +41,6 @@ using ::rtl::OUString;
+@@ -49,66 +49,6 @@
  namespace xmlscript
  {
  
@@ -5672,7 +5638,7 @@ index fbe68fe..c74ee06 100644
 -                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
 -                OSL_TRACE("**** cell range source list %s",
 -                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
--                if ( sAddress.getLength() > 0 );
+-                if ( sAddress.getLength() > 0 )
 -                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
 -            }
 -            catch( uno::Exception& )
diff --git a/patches/vba/vba-msvbahelper-splitbuilt.diff b/patches/vba/vba-msvbahelper-splitbuilt.diff
index 97120309c..082daa413 100644
--- a/patches/vba/vba-msvbahelper-splitbuilt.diff
+++ b/patches/vba/vba-msvbahelper-splitbuilt.diff
@@ -835,16 +835,16 @@ index 53dc7d2..89f10fc 100644
          return;
      lang::EventObject aEvent;
      evt.Arguments[ 0 ] >>= aEvent;
-@@ -1097,8 +1102,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
-             
+@@ -1024,8 +1024,8 @@
+
              OSL_TRACE("*** trying to invoke %s ",
                  rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
--            ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); 
+-            ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
 -            if ( aMacroResolvedInfo.IsResolved() )
-+            Reference< script::XVBAMacroResolvedInfo > xMacroResolvedInfo = m_xMacroHelper->resolveVBAMacro( m_xModel, sToResolve, sal_False ); 
++            Reference< script::XVBAMacroResolvedInfo > xMacroResolvedInfo = m_xMacroHelper->resolveVBAMacro( m_xModel, sToResolve, sal_False );
 +            if ( xMacroResolvedInfo->getResolved() )
              {
-                 //liuchen 2009-6-8
+
                  if (! txInfo->ApproveRule(evt, txInfo->pPara) )
 @@ -1117,7 +1122,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
                      // call basic event handlers for event