diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 21:10:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-06 07:02:42 +0100 |
| commit | 0a8bf4b534775bb64e6baa228dce881c5c0d65a5 (patch) | |
| tree | b6753e237796855f7af63b9730a21eecdb50bc3b /sfx2 | |
| parent | 5ae49477396c1a0d7dd2d387bf46ac8c02cbeb53 (diff) | |
FloatingWindows are no longer loaded from resource files
Change-Id: I2705bbb4db52779e0065400f09604384fd9cf151
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 20 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 17 |
2 files changed, 0 insertions, 37 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index a15dd9913c23..59ea7c2ceab6 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -460,26 +460,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } - - -SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, - SfxChildWindow *pCW, - Window* pParent, - const ResId& rResId) : - FloatingWindow(pParent, rResId), - pBindings(pBindinx), - pImp( new SfxFloatingWindow_Impl ) -{ - pImp->pMgr = pCW; - pImp->bConstructed = false; - SetUniqueId( GetHelpId() ); - SetHelpId(""); - if ( pBindinx ) - pImp->StartListening( *pBindinx ); - pImp->aMoveTimer.SetTimeout(50); - pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); -} - SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, Window* pParent, diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 6aa1c9c60b06..71af4187dafe 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1174,23 +1174,6 @@ SfxPopupWindow::SfxPopupWindow( SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, - const Reference< XFrame >& rFrame, - Window* pParentWindow, - const ResId &rId ) : - FloatingWindow( pParentWindow, rId ) - , m_bFloating( false ) - , m_bCascading( false ) - , m_nId( nId ) - , m_xFrame( rFrame ) - , m_pStatusListener( 0 ) -{ - Window* pWindow = GetTopMostParentSystemWindow( this ); - if ( pWindow ) - ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); -} - -SfxPopupWindow::SfxPopupWindow( - sal_uInt16 nId, Window* pParentWindow, const OString& rID, const OUString& rUIXMLDescription, const Reference< XFrame >& rFrame ) : |