applied_patches/0424-vba-disable-toolbar+customizationimport.diff

   1 diff --git svx/inc/svx/xflbmsxy.hxx svx/inc/svx/xflbmsxy.hxx
   2 index 39f1f67..1b09bb6 100644
   3 diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx
   4 index e25ff74..60667ed 100644
   5 --- svx/source/msfilter/msvbasic.cxx
   6 +++ svx/source/msfilter/msvbasic.cxx
   7 @@ -952,6 +952,9 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
   8      SvStorageStreamRef xDir = rxVBAStorage->OpenSotStream(
   9                      String( RTL_CONSTASCII_USTRINGPARAM( "dir" ) ),
  10                                         STREAM_STD_READ | STREAM_NOCREATE );
  11 +// disable read and import of Dir stream bits, e.g. project references and
  12 +// project name for 3.1 ( a bit unstable yet )
  13 +#if 0
  14      // decompress the stream
  15      std::auto_ptr< SvMemoryStream > xCmpDir;
  16      xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
  17 @@ -959,6 +962,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
  18      DirDumper dDump;
  19      dDump.read( xCmpDir.get() );
  20      dDump.import( *this );
  21 +#endif
  22         if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
  23         {
  24                 DBG_WARNING("Not able to find vba project, cannot find macros");
  25 diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
  26 index c8ecc43..385de9b 100644
  27 --- sw/source/filter/ww8/ww8par.cxx
  28 +++ sw/source/filter/ww8/ww8par.cxx
  29 @@ -4189,8 +4189,12 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
  30              mpDocShell->SetIsTemplate( pWwFib->fDot ); // point at tgc record
  31              const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
  32              maTracer.EnterEnvironment(sw::log::eMacros);
  33 +// dissable below for 3.1 at the moment, 'cause it's kinda immature
  34 +// similarly the project reference in svx/source/msvba
  35 +#if 0
  36              // Read Global templates
  37              ReadGlobalTemplateSettings();
  38 +#endif
  39              // Create and insert Excel vba Globals
  40              uno::Any aGlobs;
  41              aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
  42 @@ -4202,8 +4206,12 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
  43              String s1(CREATE_CONST_ASC("Macros"));
  44              String s2(CREATE_CONST_ASC("VBA"));
  45              int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
  46 +// dissable below for 3.1 at the moment, 'cause it's kinda immature
  47 +// similarly the project reference in svx/source/msvba
  48 +#if 0
  49              WW8Customizations aCustomisations( pTableStream, *pWwFib );
  50              aCustomisations.Import( mpDocShell );
  51 +#endif
  52              if( 2 & nRet )
  53              {
  54                  maTracer.Log(sw::log::eContainsVisualBasic);