ooo-build r15408 - in branches/opensuse-11-1: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Feb 24 15:21:00 2009
New Revision: 15408
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15408&view=rev

Log:
2009-02-24  Noel Power  <noel power novell com>

        * patches/dev300/apply: fix for n#478187 note: doesn't affect ooo300-m9
        but this patch is some futureproofing
        * patches/vba/vba-fix-copysheet-toend.diff:



Added:
   branches/opensuse-11-1/patches/vba/vba-fix-copysheet-toend.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Tue Feb 24 15:21:00 2009
@@ -1694,6 +1694,8 @@
 
 vba-xl-import-crash.diff, n#458985
 vba-interior-object-fix.diff, n#459479, Fong
+#  futureproofing against n#478187 note: doesn't affect ooo300-m9
+vba-fix-copysheet-toend.diff, n#478187
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Added: branches/opensuse-11-1/patches/vba/vba-fix-copysheet-toend.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/vba/vba-fix-copysheet-toend.diff	Tue Feb 24 15:21:00 2009
@@ -0,0 +1,31 @@
+diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx
+index 8e38e2a..9a26cd2 100644
+--- sc/source/ui/docshell/docsh5.cxx
++++ sc/source/ui/docshell/docsh5.cxx
+@@ -843,11 +843,16 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+ 			
+ 			StarBASIC* pStarBASIC = GetBasic();
+ 			BOOL bVbaEnabled = pStarBASIC ? pStarBASIC->isVBAEnabled() : FALSE;
++			SCTAB nTabToUse = nDestTab; 
++
++			if ( nDestTab == SC_TAB_APPEND )
++				nTabToUse = aDocument.GetMaxTableNumber() - 1;
++
+ 			if ( bVbaEnabled )
+ 			{
+ 				String sCodeName;
+ 				String sSource;
+-				aDocument.GetCodeName( nDestTab, sCodeName );
++				aDocument.GetCodeName( nTabToUse, sCodeName );
+ 				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() )
+@@ -865,7 +870,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
+ 					xLib->getByName( sModName ) >>= sModuleInfo;
+ 					sSource = sModuleInfo.ModuleSource;
+ 				} 
+-				lcl_InsertModule( *this, nDestTab, sCodeName, sSource );
++				lcl_InsertModule( *this, nTabToUse, sCodeName, sSource );
+ 			}
+ 		}
+