diff options
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 8 | ||||
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 14 |
2 files changed, 4 insertions, 18 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 67670bd50cf6..f718f2208498 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -100,11 +100,9 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); protected: - SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const ResId& ); - SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const OString& rID, const OUString& rUIXMLDescription ); - virtual ~SfxModelessDialog(); + SfxModelessDialog( SfxBindings*, SfxChildWindow*, + Window*, const OString& rID, const OUString& rUIXMLDescription ); + virtual ~SfxModelessDialog(); virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Move() SAL_OVERRIDE; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index e464e61a6406..a22f5fb64e8e 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -322,14 +322,6 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) return 0; } -SfxModelessDialog::SfxModelessDialog(SfxBindings *pBindinx, - SfxChildWindow *pCW, Window *pParent, const ResId& rResId) - : ModelessDialog(pParent, rResId) -{ - Init(pBindinx, pCW); - SetHelpId(""); -} - SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, SfxChildWindow *pCW, Window *pParent, const OString& rID, const OUString& rUIXMLDescription) @@ -351,16 +343,12 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl)); } - - -bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) - /* [Description] If a ModelessDialog is enabled its ViewFrame wil be activated. This is necessary by PluginInFrames. */ - +bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_GETFOCUS ) { |