diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-21 15:54:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-21 16:46:12 +0000 |
| commit | 38302b308559b8e34916a07ea3a160085c596c2e (patch) | |
| tree | ea288c40d34202626bb08a6b8aee9a9bccee00c6 /svx/inc | |
| parent | 4870fc155ff789a1d002eebe3d2bd7e199ea0e28 (diff) | |
split up redline dialog and adapt redline view code
Change-Id: Ib185eacbd0b4123ec947d116076358794bf42d46
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/helpid.hrc | 9 | ||||
| -rw-r--r-- | svx/inc/svx/ctredlin.hxx | 30 | ||||
| -rw-r--r-- | svx/inc/svx/svxids.hrc | 1 |
3 files changed, 8 insertions, 32 deletions
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index afd948425edf..dab6dc899ce5 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -154,15 +154,6 @@ #define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" #define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" #define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" -#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW" -#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER" -#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE" -#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE" -#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT" -#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL" -#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT" -#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL" -#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" #define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" #define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" #define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 2ce91fc95709..d6d5f7b27243 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -304,30 +304,18 @@ private: Link RejectAllClickLk; Link UndoClickLk; - SvxSimpleTableContainer m_aViewDataContainer; - SvxRedlinTable aViewData; - PushButton PbAccept; - PushButton PbReject; - PushButton PbAcceptAll; - PushButton PbRejectAll; - PushButton PbUndo; - String aTitle1; - String aTitle2; - String aTitle3; - String aTitle4; - String aTitle5; - long nDistance; - Size aMinSize; + SvxRedlinTable* m_pViewData; + PushButton* m_pAccept; + PushButton* m_pReject; + PushButton* m_pAcceptAll; + PushButton* m_pRejectAll; + PushButton* m_pUndo; DECL_LINK( PbClickHdl, PushButton* ); - -protected: - - void Resize(); - public: - SvxTPView( Window * pParent); + SvxTPView(Window * pParent); + ~SvxTPView(); void InsertWriterHeader(); void InsertCalcHeader(); @@ -349,8 +337,6 @@ public: void HideUndo() {ShowUndo(sal_False);} sal_Bool IsUndoVisible(); - Size GetMinSizePixel(); - void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; } const Link& GetAcceptClickHdl() const { return AcceptClickLk; } diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index d18dfcfa8ab9..10275b45f4f8 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -620,7 +620,6 @@ #define SID_FM_NEW ( SID_SVX_START + 638 ) #define SID_FM_DELETE ( SID_SVX_START + 639 ) #define SID_FM_NEW_FORM ( SID_SVX_START + 640 ) -#define SID_REDLIN_VIEW_PAGE ( SID_SVX_START + 643 ) #define SID_3D_WIN ( SID_SVX_START + 644 ) #define SID_3D_STATE ( SID_SVX_START + 645 ) #define SID_3D_INIT ( SID_SVX_START + 646 ) |