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

[pflin svn gnome org]

Author: pflin
Date: Fri Oct 31 06:53:50 2008
New Revision: 14436
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14436&view=rev

Log:
2008-10-31  Fong Lin  <pflin novell com>
	* patches/dev300/apply: fixed for n#439971 and n#439972.
	* patches/vba/vba-fix-basic-macro-organizer.diff.
	* patches/vba/vba-fix-ide-friendly-modulename.diff.



Added:
   trunk/patches/vba/vba-fix-basic-macro-organizer.diff
   trunk/patches/vba/vba-fix-ide-friendly-modulename.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 06:53:50 2008
@@ -1684,8 +1684,10 @@
 basic-ide-objectmodule.diff, Fong
 # display a friendly name for objectmodule tab
 basic-ide-module-object-name-combile.diff, Fong
+vba-fix-ide-friendly-modulename.diff, n#439971, Fong
 # display a friendly basic macro tree in macrochoose dialog
 vba-basic-macrochoose-dialog.diff, Fong
+vba-fix-basic-macro-organizer.diff, n#439972, Fong
 # fix bug accessing default member of userform control
 range-listBox-compare.diff, n#421939
 # fix bug comparing string that can't be converted to number

Added: trunk/patches/vba/vba-fix-basic-macro-organizer.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-basic-macro-organizer.diff	Fri Oct 31 06:53:50 2008
@@ -0,0 +1,40 @@
+diff --git basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.cxx
+index 23b890c..54fc2ea 100644
+--- basctl/source/basicide/moduldlg.cxx
++++ basctl/source/basicide/moduldlg.cxx
+@@ -636,9 +636,13 @@ void ObjectPage::CheckButtons()
+     USHORT nMode = aBasicBox.GetMode();
+ 
+ 	USHORT nDepth = pCurEntry ? aBasicBox.GetModel()->GetDepth( pCurEntry ) : 0;
+-	if ( ( !bVBAEnabled && ( nDepth == 2 ) ) 
+-        || ( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 3 ) ) )
+-		aEditButton.Enable();
++	if ( nDepth >= 2 )
++    {
++        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( nDepth == 2 ) )
++            aEditButton.Disable();
++        else
++		    aEditButton.Enable();
++    }    
+ 	else
+ 		aEditButton.Disable();
+ 
+@@ -667,10 +671,14 @@ void ObjectPage::CheckButtons()
+     }
+ 
+     // enable/disable delete button
+-	if ( ( ( !bVBAEnabled && nDepth == 2 ) || ( bVBAEnabled && ( nDepth == 3 ) && !aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
+-        && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
+-		aDelButton.Enable();
+-	else
++    if ( nDepth >= 2 && !bReadOnly && eLocation != LIBRARY_LOCATION_SHARE )
++    {
++        if( bVBAEnabled && ( nMode & BROWSEMODE_MODULES ) && ( ( nDepth == 2 ) || aLibSubName.Equals( String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ) )
++            aDelButton.Disable();
++        else
++            aDelButton.Enable();
++    }
++    else
+ 		aDelButton.Disable();
+ }
+ 

Added: trunk/patches/vba/vba-fix-ide-friendly-modulename.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-ide-friendly-modulename.diff	Fri Oct 31 06:53:50 2008
@@ -0,0 +1,41 @@
+diff --git basctl/source/basicide/basides2.cxx basctl/source/basicide/basides2.cxx
+index 981de5b..f29b272 100644
+--- basctl/source/basicide/basides2.cxx
++++ basctl/source/basicide/basides2.cxx
+@@ -66,19 +66,25 @@ namespace css = ::com::sun::star;
+ 
+ void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName )
+ {
+-	uno::Any aElement( rLib->getByName( rModName ) );
+-	script::ModuleInfo aModuleInfo;
+-	if( aElement >>= aModuleInfo )
+-	{
+-		uno::Any aObject( aModuleInfo.ModuleObject );
+-		uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
+-		if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Worksheet" ) ) )
++    try
++    {
++		uno::Any aElement( rLib->getByName( rModName ) );
++		script::ModuleInfo aModuleInfo;
++		if( aElement >>= aModuleInfo )
+ 		{
+-			uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
+-			if( xNamed.is() )
+-				rObjName = xNamed->getName();
++			uno::Any aObject( aModuleInfo.ModuleObject );
++			uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
++			if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Worksheet" ) ) )
++			{
++				uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
++				if( xNamed.is() )
++					rObjName = xNamed->getName();
++			}
+ 		}
+-	}	
++    }
++    catch( uno::Exception& )
++    {
++    }
+ }
+ 
+ IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )