[Libreoffice-commits] .: patches/vba

[Tor Lillqvist]

 patches/vba/vba-use-ooxfilter-forcontrols.diff |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d20cc4b310133a12019ee1db69a06535f1ca8fa8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 29 11:08:49 2010 +0300

    Make vba-use-ooxfilter-forcontrols.diff apply again

diff --git a/patches/vba/vba-use-ooxfilter-forcontrols.diff b/patches/vba/vba-use-ooxfilter-forcontrols.diff
index f761158..e537ee4 100644
--- a/patches/vba/vba-use-ooxfilter-forcontrols.diff
+++ b/patches/vba/vba-use-ooxfilter-forcontrols.diff
@@ -529,9 +529,9 @@ index c71f885..d033355 100644
          refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
 @@ -4344,21 +4417,21 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
              aArgs[ 0 ] <<= mpDocShell->GetModel();
-             aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals"), aArgs );
+             aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals")), aArgs );
              mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
--            
+-
 -            SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
 -                            pVBAFlags->IsLoadWordBasicCode(),
 -                            pVBAFlags->IsLoadWordBasicStorage() );
@@ -550,9 +550,9 @@ index c71f885..d033355 100644
 -            lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aVBasic.GetVBAProjectName() );
 +            lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aBasicImporter.getProjectName() );
 + 
-             WW8Customizations aCustomisations( pTableStream, *pWwFib ); 
+             WW8Customizations aCustomisations( pTableStream, *pWwFib );
              aCustomisations.Import( mpDocShell );
- #endif 
+ #endif
 -            if( 2 & nRet )
 +            if( bRet )
              {
@@ -600,7 +600,7 @@ index 95a072f..28b6042 100644
 +
  #endif
  
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git sw/util/makefile.mk sw/util/makefile.mk
 index 3993ad0..ce1419b 100644
 --- sw/util/makefile.mk