ooo-build r13635 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Wed Aug 20 13:07:52 2008
New Revision: 13635
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13635&view=rev

Log:
2008-08-20  Fong Lin  <pflin novell com>
	* patches/vba/basic-ide-objectmodule.diff:
	* patches/dev300/apply: not allow to delete or rename objectmodule in IDE.



Added:
   trunk/patches/vba/basic-ide-objectmodule.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 20 13:07:52 2008
@@ -1560,6 +1560,8 @@
 #some userform import issues including improved identification
 #of the progressbar activex control
 userform-activex-identify.diff
+#disable to delete or rename objectmodule name in basic ide
+basic-ide-objectmodule.diff, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: trunk/patches/vba/basic-ide-objectmodule.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/basic-ide-objectmodule.diff	Wed Aug 20 13:07:52 2008
@@ -0,0 +1,41 @@
+--- basctl/source/basicide/bastypes.cxx.orig	2008-08-20 18:25:53.000000000 +0800
++++ basctl/source/basicide/bastypes.cxx	2008-08-19 18:40:27.000000000 +0800
+@@ -60,6 +60,7 @@
+ #include <com/sun/star/script/XLibraryContainer2.hpp>
+ #endif
+ #include <com/sun/star/script/XLibraryContainerPassword.hpp>
++#include <com/sun/star/script/ModuleType.hpp>
+ 
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star;
+@@ -640,8 +641,30 @@ void __EXPORT BasicIDETabBar::Command( c
+                 aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
+                 aPopup.RemoveDisabledEntries();
+             }
++			
++			// disable to delete or remove object modules in IDE
++			BasicManager* pBasMgr = aDocument.getBasicManager();
++			if ( pBasMgr )
++			{
++				StarBASIC* pBasic = pBasMgr->GetLib( aOULibName );
++				if( pBasic )
++				{
++					IDEWindowTable& aIDEWindowTable = pIDEShell->GetIDEWindowTable();
++					IDEBaseWindow* pWin = aIDEWindowTable.Get( GetCurPageId() );
++					if( pWin && pWin->ISA( ModulWindow ) )
++					{
++						SbModule* pActiveModule = (SbModule*)pBasic->FindModule( pWin->GetName() );
++						if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::Document ) )
++						{
++							aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE );
++							aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
++						}
++					}
++				}
++			}
+         }
+ 
++
+         SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+ 	    SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
+         if ( pDispatcher )