sc/source/ui/docshell/docsh5.cxx | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 62d1f855ce3b630f109efb8437237602590715fe
Author: Eike Rathke <er...@redhat.com>
Date: Tue May 8 10:49:28 2012 +0200
resolved rhbz#819118 catch exception from VBA lib container
If in an imported Excel document with VBA a sheet to be copied does not have
a document object in the VBAProject container (whyever that may be the case)
the getByName() rightly throws a NoSuchElement exception. Catch that.
Signed-off-by: Michael Meeks <michael.me...@suse.com>
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index b965d50..53fda62 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -949,15 +949,21 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB
nDestTab, sal_Bool bCopy, s
nTabToUse = aDocument.GetMaxTableNumber() - 1;
rtl::OUString sCodeName;
rtl::OUString sSource;
- Reference< XNameContainer > xLib;
- if( xLibContainer.is() )
+ try
{
- com::sun::star::uno::Any aLibAny =
xLibContainer->getByName( aLibName );
- aLibAny >>= xLib;
+ Reference< XNameContainer > xLib;
+ if( xLibContainer.is() )
+ {
+ com::sun::star::uno::Any aLibAny =
xLibContainer->getByName( aLibName );
+ aLibAny >>= xLib;
+ }
+ if( xLib.is() )
+ {
+ xLib->getByName( sSrcCodeName ) >>= sSource;
+ }
}
- if( xLib.is() )
+ catch ( const com::sun::star::uno::Exception& )
{
- xLib->getByName( sSrcCodeName ) >>= sSource;
}
VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
