diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-02 22:42:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-03 15:58:26 +0100 |
| commit | 77ce41f2571c3158f00e2b632ce006059282c462 (patch) | |
| tree | 8fec039e7eaca527e45c2cd050208e81b70157c1 /sfx2 | |
| parent | 2f60a1bdabac11e985dbcc6265dd8b97ef1ca6fd (diff) | |
convert RID_SVXTBX_UNDO_REDO_CTRL floating window to .ui
Change-Id: I88a5e0aec20170dfb71bf28cb35e860773657937
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 25781db35c10..090feb2ebab9 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1125,8 +1125,6 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } } - - SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, const Reference< XFrame >& rFrame, @@ -1143,13 +1141,9 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } - - -SfxPopupWindow::SfxPopupWindow( - sal_uInt16 nId, - const Reference< XFrame >& rFrame, - const ResId &rId ) : - FloatingWindow( SfxGetpApp()->GetTopWindow(), rId ) +SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUString& rUIXMLDescription, + const css::uno::Reference<css::frame::XFrame> &rFrame) + : FloatingWindow(SfxGetpApp()->GetTopWindow(), rID, rUIXMLDescription, rFrame) , m_bFloating( false ) , m_bCascading( false ) , m_nId( nId ) @@ -1161,8 +1155,6 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } - - SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, const Reference< XFrame >& rFrame, @@ -1197,8 +1189,6 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } - - SfxPopupWindow::~SfxPopupWindow() { if ( m_xStatusListener.is() ) |