diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-21 17:17:52 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-23 14:28:42 +0000 |
commit | 8655095a4910ca795dfd182e6796d9375727a694 (patch) | |
tree | 3472e1c3cea9539fc2785c8db99a421a10e93694 /svx/inc | |
parent | 3c5c43cf2aa354a98f28a466647f4d463cdfdc85 (diff) |
try and beat this weird SvxAcceptChgCtr into something sanish
a) convert to .ui
b) The accept/reject changes dialogs now have a "close" button and the
accept/reject etc buttons are relocated into the main dialog button area rather
than as direct children of the view page. They now get disabled on switching to
the non-view page.
c) Merges the sc redline changes dialog, the sw redline changes dialog and the
sw autocorrect changes dialog
Change-Id: If0ba376c3f2d36709aeeed995fa9901741434c40
Diffstat (limited to 'svx/inc')
-rw-r--r-- | svx/inc/svx/ctredlin.hxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index d6d5f7b27243..f7b71ec62ff4 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -351,42 +351,38 @@ public: void SetUndoClickHdl( const Link& rLink ) { UndoClickLk = rLink; } const Link& GetUndoAllClickHdl() const { return UndoClickLk; } + + virtual void ActivatePage(); + virtual void DeactivatePage(); }; //================================================================== // Redlining - Control (Accept- Changes) //================================================================== -class SVX_DLLPUBLIC SvxAcceptChgCtr : public Control +class SVX_DLLPUBLIC SvxAcceptChgCtr + : public TabControl + , public VclBuilderContainer { private: - Link aMinSizeLink; - TabControl aTCAccept; SvxTPFilter* pTPFilter; SvxTPView* pTPView; - Size aMinSize; - -protected: - virtual void Resize(); + sal_uInt16 m_nViewPageId; + sal_uInt16 m_nFilterPageId; public: - SvxAcceptChgCtr( Window* pParent, const ResId& rResId ); + SvxAcceptChgCtr(Window* pParent); ~SvxAcceptChgCtr(); - Size GetMinSizePixel() const; - void ShowFilterPage(); void ShowViewPage(); SvxTPFilter* GetFilterPage(); SvxTPView* GetViewPage(); SvxRedlinTable* GetViewTable(); - - void SetMinSizeHdl( const Link& rLink ) { aMinSizeLink= rLink; } - const Link& GetMinSizeHdl() const { return aMinSizeLink; } }; |