strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove some stray instances of lcl_getObject ( now implemented in ModuleInfoHelper::getObjectName )

Browse source
This commit is contained in:
npower Developer 2010-04-20 10:31:03 +01:00
parent 7780dbea50
commit cb2bcac347
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
basctl/source/basicide/baside2.cxx
View file

@ -108,8 +108,6 @@ DBG_NAME( ModulWindow )
TYPEINIT1( ModulWindow , IDEBaseWindow );
void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName );
void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle, bool bOutput )
{
short nLeftMargin = LMARGPRN;
@ -1417,7 +1415,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
if( xLib.is() )
{
String sObjName;
lcl_getObjectName( xLib, aModName, sObjName );
ModuleInfoHelper::getObjectName( xLib, aModName, sObjName );
if( sObjName.Len() )
{
aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");

25
basctl/source/basicide/basides2.cxx
View file

@ -60,29 +60,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
namespace css = ::com::sun::star;
void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, const String& rModName, String& rObjName )
{
try
{
uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY );
if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) )
{
script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName );
uno::Any aObject( aModuleInfo.ModuleObject );
uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.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 )
{
ShowObjectDialog( FALSE, TRUE );
@ -306,7 +283,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
// display a nice friendly name in the ObjectModule tab,
// combining the objectname and module name, e.g. Sheet1 ( Financials )
String sObjName;
lcl_getObjectName( xLib, rModName, sObjName );
ModuleInfoHelper::getObjectName( xLib, rModName, sObjName );
if( sObjName.Len() )
{
aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");