mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cast to implementation objects failure from some vba objects

Browse Source 
old calls attempting to cast to implementation objects now fail ( and crash on access ) because we now wrap some objects via a aggregation proxy. This patch fixes this
This commit is contained in:
Markus Mohrhard
2011-04-07 17:14:41 +01:00
committed by Noel Power
parent bc617d8135
commit 48b23fbd5e
7 changed files with 89 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sc/source/ui/vba/excelvbahelper.hxx
View File

@@ -35,6 +35,7 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <ooo/vba/XHelperInterface.hpp>
#include <formula/grammar.hxx>
@@ -84,6 +85,19 @@ public:
static SfxItemSet* GetDataSet( ScCellRangesBase* pRangeObj );
};
// Extracts a implementation object ( via XUnoTunnel ) from an uno object
// by default will throw if unsuccessful.
template < typename ImplObject >
ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) throw (css::uno::RuntimeException)
{
ImplObject* pObj = NULL;
css::uno::Reference< css::lang::XUnoTunnel > xTunnel( rxWrapperIf, css::uno::UNO_QUERY );
if ( xTunnel.is() )
pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId()));
if ( bThrow && !pObj )
throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Internal error, can't exctract implementation object" ) ), rxWrapperIf );
return pObj;
}
// ============================================================================
} // namespace excel