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 /sw/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 'sw/inc')
| -rw-r--r-- | sw/inc/helpid.h | 2 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 26dd338dce82..2f608eab459b 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -138,7 +138,6 @@ #define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW" #define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU" -#define HID_REDLINE_AUTOFMT_ACCEPT "SW_HID_REDLINE_AUTOFMT_ACCEPT" #define HID_MULTI_TOX_DLG "SW_HID_MULTI_TOX_DLG" #define HID_ASCII_FILTER "SW_HID_ASCII_FILTER" #define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" @@ -175,7 +174,6 @@ #define HID_OPTSHDWCRSR "SW_HID_OPTSHDWCRSR" #define HID_NUMPARA "SW_HID_NUMPARA" #define HID_REDLINE_OPT "SW_HID_REDLINE_OPT" -#define HID_REDLINE_ACCEPT "SW_HID_REDLINE_ACCEPT" #define HID_EDIT_FLD_DB "SW_HID_EDIT_FLD_DB" #define HID_EDIT_FLD_DOKINF "SW_HID_EDIT_FLD_DOKINF" #define HID_EDIT_FLD_VAR "SW_HID_EDIT_FLD_VAR" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index ac42c4b04410..0551921b0710 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -397,7 +397,7 @@ public: virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId ) = 0; - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0; virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId, |