Attachment #44961 for issue #63848

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

Lines 570-575 Link Here

(-)Old/dockwin.cxx (-3 / +17 lines)
570	pImp->nPos = pImp->nDockPos = 0;	570	pImp->nPos = pImp->nDockPos = 0;
571	pImp->bNewLine = FALSE;	571	pImp->bNewLine = FALSE;
572	pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);	572	pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
		573	pTimer=new Timer;
		574	pTimer->SetTimeout(50);
		575	pTimer->SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
573		576
574	// DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");	577	// DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");
575	}	578	}
Lines 606-612 Link Here
606	pImp->nLine = pImp->nDockLine = 0;	609	pImp->nLine = pImp->nDockLine = 0;
607	pImp->nPos = pImp->nDockPos = 0;	610	pImp->nPos = pImp->nDockPos = 0;
608	pImp->bNewLine = FALSE;	611	pImp->bNewLine = FALSE;
609	pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);	612	pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
		613	pTimer=new Timer;
		614	pTimer->SetTimeout(50);
		615	pTimer->SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
610		616
611	// DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");	617	// DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");
612	}	618	}
Lines 895-900 Link Here
895	{	901	{
896	ReleaseChildWindow_Impl();	902	ReleaseChildWindow_Impl();
897	delete pImp;	903	delete pImp;
		904	delete pTimer;
898	}	905	}
899		906
900	void SfxDockingWindow::ReleaseChildWindow_Impl()	907	void SfxDockingWindow::ReleaseChildWindow_Impl()
Lines 1598-1609 Link Here
1598		1605
1599	void SfxDockingWindow::Move()	1606	void SfxDockingWindow::Move()
1600	{	1607	{
		1608	pTimer->Start();
		1609	}
		1610
		1611	IMPL_LINK( SfxDockingWindow, TimerHdl, Timer*, pTimer)
		1612	{
		1613	pTimer->Stop();
1601	if ( IsReallyVisible() && IsFloatingMode() )	1614	if ( IsReallyVisible() && IsFloatingMode() )
1602	{	1615	{
1603	SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW;	1616	SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW;
1604	if ( pImp->bSplitable )	1617	if ( pImp->bSplitable )
1605	eIdent = SFX_CHILDWIN_SPLITWINDOW;	1618	eIdent = SFX_CHILDWIN_SPLITWINDOW;
1606	SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();	1619	SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
1607	pWorkWin->ConfigChild_Impl( eIdent, SFX_ALIGNDOCKINGWINDOW, pMgr->GetType() );	1620	pWorkWin->ConfigChild_Impl( eIdent, SFX_ALIGNDOCKINGWINDOW, pMgr->GetType() );
1608	}	1621	}
		1622	return 0;
1609	}	1623	}




#include <vcl/dockwin.hxx>
#endif
#include "childwin.hxx"
#include <vcl/timer.hxx> 

class SfxSplitWindow;
class SfxDockingWindow_Impl;

	Size                    aFloatSize;
	SfxChildWindow*         pMgr;
	SfxDockingWindow_Impl*  pImp;
	Timer*                  pTimer; 
	
    SAL_DLLPRIVATE SfxDockingWindow(SfxDockingWindow &); // not defined
    SAL_DLLPRIVATE void operator =(SfxDockingWindow &); // not defined

	virtual long		Notify( NotifyEvent& rNEvt );
	virtual void        FadeIn( BOOL );
    void                AutoShow( BOOL bShow = TRUE );
	DECL_LINK( TimerHdl, Timer* );

#if _SOLAR__PRIVATE
	SAL_DLLPRIVATE void Initialize_Impl();

Return to issue 63848

Lines 50-55 Link Here

(-)Old/dockwin.hxx (+3 lines)
50	#include <vcl/dockwin.hxx>	50	#include <vcl/dockwin.hxx>
51	#endif	51	#endif
52	#include "childwin.hxx"	52	#include "childwin.hxx"
		53	#include <vcl/timer.hxx>
53		54
54	class SfxSplitWindow;	55	class SfxSplitWindow;
55	class SfxDockingWindow_Impl;	56	class SfxDockingWindow_Impl;
Lines 63-68 Link Here
63	Size aFloatSize;	64	Size aFloatSize;
64	SfxChildWindow* pMgr;	65	SfxChildWindow* pMgr;
65	SfxDockingWindow_Impl* pImp;	66	SfxDockingWindow_Impl* pImp;
		67	Timer* pTimer;
66		68
67	SAL_DLLPRIVATE SfxDockingWindow(SfxDockingWindow &); // not defined	69	SAL_DLLPRIVATE SfxDockingWindow(SfxDockingWindow &); // not defined
68	SAL_DLLPRIVATE void operator =(SfxDockingWindow &); // not defined	70	SAL_DLLPRIVATE void operator =(SfxDockingWindow &); // not defined
Lines 121-126 Link Here
121	virtual long Notify( NotifyEvent& rNEvt );	123	virtual long Notify( NotifyEvent& rNEvt );
122	virtual void FadeIn( BOOL );	124	virtual void FadeIn( BOOL );
123	void AutoShow( BOOL bShow = TRUE );	125	void AutoShow( BOOL bShow = TRUE );
		126	DECL_LINK( TimerHdl, Timer* );
124		127
125	#if _SOLAR__PRIVATE	128	#if _SOLAR__PRIVATE
126	SAL_DLLPRIVATE void Initialize_Impl();	129	SAL_DLLPRIVATE void Initialize_Impl();