diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-30 21:06:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-02 12:14:43 +0100 |
| commit | 724b48d877fc157affb2b935f1bbeb37745bc683 (patch) | |
| tree | 15bf4c93573a1d76c734f050183bd4a59e8466fd | |
| parent | 653025e6f10d07d0a95f7b75d56ff457f1902e82 (diff) | |
extent .ui loading to SfxFloatingWindows
Change-Id: I3e16ef8455b35faf14838509f315cb2f70e7cb9a
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 6d46b7ad7fb0..2e4c14a1ef17 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -138,6 +138,10 @@ protected: SfxChildWindow *pCW, Window* pParent, const ResId& rResId); + SfxFloatingWindow( SfxBindings *pBindings, + SfxChildWindow *pCW, + Window* pParent, + const OString& rID, const OUString& rUIXMLDescription); virtual ~SfxFloatingWindow(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index b3cce37aaef1..e17c77f19285 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -480,7 +480,26 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } +SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, + SfxChildWindow *pCW, + Window* pParent, + const OString& rID, const OUString& rUIXMLDescription) : + FloatingWindow(pParent, rID, rUIXMLDescription), + pBindings(pBindinx), + pImp( new SfxFloatingWindow_Impl ) +{ + pImp->pMgr = pCW; + pImp->bConstructed = false; + //do we really need this odd helpid/uniqueid dance ? + SetUniqueId( GetHelpId() ); + SetHelpId(""); + + if ( pBindinx ) + pImp->StartListening( *pBindinx ); + pImp->aMoveTimer.SetTimeout(50); + pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); +} bool SfxFloatingWindow::Close() |