Kaydet (Commit) 45540432 authored tarafından Caolán McNamara's avatar Caolán McNamara

SfxModelessDialog ResId ctor bites the dust

Change-Id: Ia1bc255de0f38c058a3ab622d87af8b346a2075f
üst 55dac4ff
...@@ -100,11 +100,9 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog ...@@ -100,11 +100,9 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); void Init(SfxBindings *pBindinx, SfxChildWindow *pCW);
protected: protected:
SfxModelessDialog( SfxBindings*, SfxChildWindow*, SfxModelessDialog( SfxBindings*, SfxChildWindow*,
Window*, const ResId& ); Window*, const OString& rID, const OUString& rUIXMLDescription );
SfxModelessDialog( SfxBindings*, SfxChildWindow*, virtual ~SfxModelessDialog();
Window*, const OString& rID, const OUString& rUIXMLDescription );
virtual ~SfxModelessDialog();
virtual bool Close() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE;
virtual void Move() SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE;
......
...@@ -322,14 +322,6 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) ...@@ -322,14 +322,6 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
return 0; return 0;
} }
SfxModelessDialog::SfxModelessDialog(SfxBindings *pBindinx,
SfxChildWindow *pCW, Window *pParent, const ResId& rResId)
: ModelessDialog(pParent, rResId)
{
Init(pBindinx, pCW);
SetHelpId("");
}
SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
SfxChildWindow *pCW, Window *pParent, const OString& rID, SfxChildWindow *pCW, Window *pParent, const OString& rID,
const OUString& rUIXMLDescription) const OUString& rUIXMLDescription)
...@@ -351,16 +343,12 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) ...@@ -351,16 +343,12 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl)); pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
} }
bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
/* [Description] /* [Description]
If a ModelessDialog is enabled its ViewFrame wil be activated. If a ModelessDialog is enabled its ViewFrame wil be activated.
This is necessary by PluginInFrames. This is necessary by PluginInFrames.
*/ */
bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
{ {
if ( rEvt.GetType() == EVENT_GETFOCUS ) if ( rEvt.GetType() == EVENT_GETFOCUS )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment