Attachment #16969 for issue #23519

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

Lines 138-144 Link Here

(-)inc/fmview.hxx (-1 / +3 lines)
138	virtual SdrModel* GetMarkedObjModel() const;	138	virtual SdrModel* GetMarkedObjModel() const;
139	virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);	139	virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
140		140
141	/** grab the focus to the first form control on the view	141	BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
		142
		143	/** grab the focus to the first form control on the view
142	@param _bForceSync	144	@param _bForceSync
143	<TRUE/> if the handling should be done synchronously.	145	<TRUE/> if the handling should be done synchronously.
144	*/	146	*/




    m_pTextShell->SetControlActivationHandler( _rHdl );
}

//------------------------------------------------------------------------
void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
{
    // catch simple double clicks
    if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) )
    {
        if ( _rViewEvent.eHit == SDRHIT_MARKEDOBJECT )
        {
            if ( onlyControlsAreMarked() )
                ShowSelectionProperties( sal_True );
        }
    }
}

//==============================================================================
//==============================================================================
SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint)





	return bRet;
}

// -----------------------------------------------------------------------------
BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
{
    BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );

    if ( pFormShell && pFormShell->GetImpl() )
    {
        SdrViewEvent aViewEvent;
        PickAnything( _rMEvt, SDRMOUSEBUTTONDOWN, aViewEvent );
        pFormShell->GetImpl()->handleMouseButtonDown( aViewEvent );
    }

    return bReturn;
}

// -----------------------------------------------------------------------------
FmFormObj* FmFormView::getMarkedGrid() const
{

Lines 293-298 Link Here

(-)source/inc/fmshimp.hxx (-1 / +5 lines)
293	typedef FmXFormShell_Base_Disambiguation FmXFormShell_BASE;	293	typedef FmXFormShell_Base_Disambiguation FmXFormShell_BASE;
294	typedef ::utl::ConfigItem FmXFormShell_CFGBASE;	294	typedef ::utl::ConfigItem FmXFormShell_CFGBASE;
295		295
		296	struct SdrViewEvent;
296	class FmXFormShell :public FmXFormShell_BASE	297	class FmXFormShell :public FmXFormShell_BASE
297	,public FmXFormShell_CFGBASE	298	,public FmXFormShell_CFGBASE
298	,public ::svxform::OStaticDataAccessTools	299	,public ::svxform::OStaticDataAccessTools
Lines 519-525 Link Here
519	const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject	520	const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject
520	);	521	);
521		522
522	sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}	523	/// handles a MouseButtonDown event of the FmFormView
		524	void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
		525
		526	sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
523	sal_Bool hasDatabaseBar() const {return m_bDatabaseBar;}	527	sal_Bool hasDatabaseBar() const {return m_bDatabaseBar;}
524	sal_Bool canNavigate() const {return m_xNavigationController.is();}	528	sal_Bool canNavigate() const {return m_xNavigationController.is();}
525		529

Return to issue 23519

Lines 4008-4013 Link Here

(-)source/form/fmshimp.cxx (+14 lines)
4008	m_pTextShell->SetControlActivationHandler( _rHdl );	4008	m_pTextShell->SetControlActivationHandler( _rHdl );
4009	}	4009	}
4010		4010
		4011	//------------------------------------------------------------------------
		4012	void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
		4013	{
		4014	// catch simple double clicks
		4015	if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) )
		4016	{
		4017	if ( _rViewEvent.eHit == SDRHIT_MARKEDOBJECT )
		4018	{
		4019	if ( onlyControlsAreMarked() )
		4020	ShowSelectionProperties( sal_True );
		4021	}
		4022	}
		4023	}
		4024
4011	//==============================================================================	4025	//==============================================================================
4012	//==============================================================================	4026	//==============================================================================
4013	SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint)	4027	SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint)

Lines 720-725 Link Here

(-)source/form/fmview.cxx (+16 lines)
720		720
721	return bRet;	721	return bRet;
722	}	722	}
		723
		724	// -----------------------------------------------------------------------------
		725	BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
		726	{
		727	BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
		728
		729	if ( pFormShell && pFormShell->GetImpl() )
		730	{
		731	SdrViewEvent aViewEvent;
		732	PickAnything( _rMEvt, SDRMOUSEBUTTONDOWN, aViewEvent );
		733	pFormShell->GetImpl()->handleMouseButtonDown( aViewEvent );
		734	}
		735
		736	return bReturn;
		737	}
		738
723	// -----------------------------------------------------------------------------	739	// -----------------------------------------------------------------------------
724	FmFormObj* FmFormView::getMarkedGrid() const	740	FmFormObj* FmFormView::getMarkedGrid() const
725	{	741	{