Attachment #23062 for issue #43592

View | Details | Raw Unified | Return to issue 43592
Collapse All | Expand All

Lines 1321-1327 Link Here

(-)ooo_ooo64bit02_src.orig/sfx2/inc/sfxbasemodel.hxx (-1 / +1 lines)
1321		1321
1322	virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );	1322	virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
1323		1323
1324	virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);	1324	virtual sal_IntPtr SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
1325		1325
1326	//____________________________________________________________________________________________________	1326	//____________________________________________________________________________________________________
1327	// SfxListener	1327	// SfxListener




		{
			::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xDoc, UNO_QUERY );
            ::com::sun::star::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() );
			sal_IntPtr nHandle = xObj->getSomething( aSeq );
			if ( nHandle )
				return (SfxObjectShell*) (sal_IntPtr*) nHandle;
		}
	}

	return NULL;
}

SfxObjectShell* SfxObjectShell::CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame )




	m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener );
}

sal_IntPtr SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
{
    ::vos::OGuard aGuard( Application::GetSolarMutex() );
	if ( !impl_isDisposed() && GetObjectShell() )
	{
        SvGlobalName aName( aIdentifier );
		if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )
	 		return (sal_IntPtr)(SvObject*)GetObjectShell();
		else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )
	 		return (sal_IntPtr)(SfxObjectShell*)GetObjectShell();
	}

	return 0;

Return to issue 43592

Lines 1044-1056 Link Here

(-)ooo_ooo64bit02_src.orig/sfx2/source/doc/objxtor.cxx (-3 / +3 lines)
1044	{	1044	{
1045	::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xDoc, UNO_QUERY );	1045	::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xDoc, UNO_QUERY );
1046	::com::sun::star::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() );	1046	::com::sun::star::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() );
1047	sal_Int64 nHandle = xObj->getSomething( aSeq );	1047	sal_IntPtr nHandle = xObj->getSomething( aSeq );
1048	if ( nHandle )	1048	if ( nHandle )
1049	return (SfxObjectShell) (sal_Int32) nHandle;	1049	return (SfxObjectShell) (sal_IntPtr) nHandle;
1050	}	1050	}
1051	}	1051	}
1052		1052
1053	return 0;	1053	return NULL;
1054	}	1054	}
1055		1055
1056	SfxObjectShell* SfxObjectShell::CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame )	1056	SfxObjectShell* SfxObjectShell::CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame )

Lines 3294-3309 Link Here

(-)ooo_ooo64bit02_src.orig/sfx2/source/doc/sfxbasemodel.cxx (-3 / +3 lines)
3294	m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener );	3294	m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener );
3295	}	3295	}
3296		3296
3297	sal_Int64 SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)	3297	sal_IntPtr SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
3298	{	3298	{
3299	::vos::OGuard aGuard( Application::GetSolarMutex() );	3299	::vos::OGuard aGuard( Application::GetSolarMutex() );
3300	if ( !impl_isDisposed() && GetObjectShell() )	3300	if ( !impl_isDisposed() && GetObjectShell() )
3301	{	3301	{
3302	SvGlobalName aName( aIdentifier );	3302	SvGlobalName aName( aIdentifier );
3303	if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )	3303	if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) )
3304	return (sal_Int64)(sal_Int32)(SvObject*)GetObjectShell();	3304	return (sal_IntPtr)(SvObject*)GetObjectShell();
3305	else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )	3305	else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) )
3306	return (sal_Int64)(sal_Int32)(SfxObjectShell*)GetObjectShell();	3306	return (sal_IntPtr)(SfxObjectShell*)GetObjectShell();
3307	}	3307	}
3308		3308
3309	return 0;	3309	return 0;