diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-18 20:22:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-19 11:27:24 +0000 |
| commit | 70467371485ada5a30b88968607b93dd62b3383c (patch) | |
| tree | 7d7ef6a27e47b043c5a677b0818494e705b006da /sw/inc | |
| parent | 494fa01eb08ebb251934fe1a868a702dfa19aca4 (diff) | |
convert character properties tabdialog to .ui
Change-Id: I73fc5fc19ae75971b0569b708f4104c79b9a9cc2
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/chrdlg.hrc | 1 | ||||
| -rw-r--r-- | sw/inc/globals.hrc | 1 | ||||
| -rw-r--r-- | sw/inc/helpid.h | 1 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 4 |
4 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index 5bbe3d62cab8..48f8a95d93c3 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -21,7 +21,6 @@ #include "rcid.hrc" -#define DLG_CHAR (RC_CHRDLG_BEGIN + 1) #define DLG_PARA (RC_CHRDLG_BEGIN + 2) #define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8) #define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9) diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 21c1232e0d5a..5e1a49c36965 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -157,7 +157,6 @@ #define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40) #define TP_FRM_URL (RC_GLOBALS_BEGIN + 42) -#define TP_CHAR_URL (RC_GLOBALS_BEGIN + 43) #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index bb1816b7cd03..ad8762606f8a 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -134,7 +134,6 @@ #define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV" #define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS" -#define HID_FILEDLG_CHARDLG "SW_HID_FILEDLG_CHARDLG" #define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE" #define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1" #define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index f5aa68c636d3..b672f66a688a 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -355,8 +355,8 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; //add for SwChangeDBDlg - virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg - const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; + virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; // add for SwCharDlg virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog |