diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-12-13 10:12:13 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-14 12:48:39 +0000 |
commit | cafa391c032dbba6869bbf56132025240c34c123 (patch) | |
tree | f36ac5d46c1fc32d838719551d0c98973ac0c8a9 /sfx2/inc/sfx2/sfxdlg.hxx | |
parent | b67866895a8d836ce2af1caa4fdeff283a9bb621 (diff) |
Related: fdo#38606 keep style dialog open when apply is clicked
i.e. don't close and reopen, just stay open
Change-Id: I11cdc492e3c4adfb75c9a0dfa52e5ba351914858
Diffstat (limited to 'sfx2/inc/sfx2/sfxdlg.hxx')
-rw-r--r-- | sfx2/inc/sfx2/sfxdlg.hxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index 3585645ddd91..0465dbbf002a 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -class SfxAbstractDialog : public VclAbstractDialog +class SfxAbstractDialog : virtual public VclAbstractDialog { public: virtual const SfxItemSet* GetOutputItemSet() const = 0; @@ -63,15 +63,21 @@ public: virtual String GetText() const = 0; }; -class SfxAbstractTabDialog : public SfxAbstractDialog +class SfxAbstractTabDialog : virtual public SfxAbstractDialog { public: virtual void SetCurPageId( sal_uInt16 nId ) = 0; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0; virtual void SetInputSet( const SfxItemSet* pInSet ) = 0; }; -class SfxAbstractInsertObjectDialog : public VclAbstractDialog +class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog +{ +public: + virtual void SetApplyHdl( const Link& rLink ) = 0; +}; + +class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog { public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; @@ -79,7 +85,7 @@ public: virtual sal_Bool IsCreateNew()=0; }; -class SfxAbstractPasteDialog : public VclAbstractDialog +class SfxAbstractPasteDialog : virtual public VclAbstractDialog { public: virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ) = 0; @@ -89,11 +95,11 @@ public: const TransferableObjectDescriptor* pDesc=0 ) = 0; }; -class SfxAbstractLinksDialog : public VclAbstractDialog +class SfxAbstractLinksDialog : virtual public VclAbstractDialog { }; -class AbstractScriptSelectorDialog : public VclAbstractDialog +class AbstractScriptSelectorDialog : virtual public VclAbstractDialog { public: virtual String GetScriptURL() const = 0; |