[ooo-build-commit] .: patches/vba

[Noel Power]

 patches/vba/vba-fixup-moduleinfo.diff |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 9207cc16dbbf1563e1e5e7fcd4f72df7953662c0
Author: Noel Power <noel.power at novell.com>
Date:   Thu Feb 25 00:15:20 2010 +0000

    fix trivial ( but hard to track ) bug when copying sheets via ui or api
    
    * patches/vba/vba-fixup-moduleinfo.diff:

diff --git a/patches/vba/vba-fixup-moduleinfo.diff b/patches/vba/vba-fixup-moduleinfo.diff
index 51beab8..2de88e3 100644
--- a/patches/vba/vba-fixup-moduleinfo.diff
+++ b/patches/vba/vba-fixup-moduleinfo.diff
@@ -1251,7 +1251,7 @@ index 9955730..264b48a 100644
          }
          rDocShell.Broadcast( ScTablesHint( SC_TAB_DELETED, nTab ) );
 diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx
-index 672dbcc..7961883 100644
+index 672dbcc..8f251c5 100644
 --- sc/source/ui/docshell/docsh5.cxx
 +++ sc/source/ui/docshell/docsh5.cxx
 @@ -72,7 +72,7 @@
@@ -1263,7 +1263,16 @@ index 672dbcc..7961883 100644
  
  // ---------------------------------------------------------------------------
  
-@@ -885,7 +885,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+@@ -854,6 +854,8 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+         if (bRecord)
+             aDocument.BeginDrawUndo();			// drawing layer must do its own undo actions
+ 
++        String sSrcCodeName;
++        aDocument.GetCodeName( nSrcTab, sSrcCodeName )
+         if (!aDocument.CopyTab( nSrcTab, nDestTab ))
+         {
+             //!	EndDrawUndo?
+@@ -885,7 +887,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
  				aLibName = GetBasicManager()->GetName();
  				pStarBASIC = GetBasicManager()->GetLib( aLibName );
  			}
@@ -1272,7 +1281,7 @@ index 672dbcc..7961883 100644
  			SCTAB nTabToUse = nDestTab; 
  
  			if ( nDestTab == SC_TAB_APPEND )
-@@ -895,7 +895,6 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+@@ -895,7 +897,6 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
  			{
  				String sCodeName;
  				String sSource;
@@ -1280,10 +1289,12 @@ index 672dbcc..7961883 100644
  				com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibContainer = GetBasicContainer();
  				com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xLib;
      				if( xLibContainer.is() )
-@@ -907,12 +906,11 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+@@ -905,14 +906,11 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+     				}
+     				if( xLib.is() )
      				{
- 					String sSrcCodeName;
- 					aDocument.GetCodeName( nSrcTab, sSrcCodeName );
+-					String sSrcCodeName;
+-					aDocument.GetCodeName( nSrcTab, sSrcCodeName );
 -					rtl::OUString sModName = sSrcCodeName;
 -					com::sun::star::script::ModuleInfo sModuleInfo;
 -					xLib->getByName( sModName ) >>= sModuleInfo;