diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-13 14:51:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-13 16:23:43 +0100 |
| commit | 7b763893e4c2571f1d8c8afef5491e0e73bff3ea (patch) | |
| tree | 8130696c9851b0c9fdfcfbacb44965653f8c9d82 /sw/inc | |
| parent | 1fd4b34a5dcf707a324bb61c1779567d1855ee42 (diff) | |
convert label dialog to .ui
Change-Id: I77ce740b1ca7178d8c5f5f2d4ce55920cf18a85b
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/envelp.hrc | 8 | ||||
| -rw-r--r-- | sw/inc/globals.hrc | 3 | ||||
| -rw-r--r-- | sw/inc/helpid.h | 1 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 6 |
4 files changed, 3 insertions, 15 deletions
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc index 6fb5624582bd..ae75783448f3 100644 --- a/sw/inc/envelp.hrc +++ b/sw/inc/envelp.hrc @@ -33,10 +33,6 @@ #define TP_ENV_FMT (RC_ENVELP_BEGIN + 3) #define TP_ENV_PRT (RC_ENVELP_BEGIN + 4) -#define TP_LAB_LAB (RC_ENVELP_BEGIN + 5) -#define TP_LAB_FMT (RC_ENVELP_BEGIN + 6) -#define TP_LAB_PRT (RC_ENVELP_BEGIN + 7) - #define DLG_MAILMERGE (RC_ENVELP_BEGIN + 8) #define DLG_SYNC_BTN (RC_ENVELP_BEGIN + 9) @@ -58,9 +54,6 @@ #define RC_LABFMT_BEGIN (RC_ENVELP_BEGIN + 50) #define RC_LABFMT_END (RC_ENVELP_BEGIN + 62) -// RC_LABPRT_BEGIN (RC_ENVELP_BEGIN + 63) -#define RC_LABPRT_END (RC_ENVELP_BEGIN + 72) - // Strings -------------------------------------------------------------------- #define STR_DATABASE_NOT_OPENED (RC_ENVLOP_BEGIN + 63) @@ -68,7 +61,6 @@ #define DLG_MERGE_FIELD_CONNECTIONS (RC_ENVLOP_BEGIN + 66) -#define STR_BTN_NEW_DOC (RC_ENVLOP_BEGIN + 67) #define STR_BTN_NEWDOC (RC_ENVLOP_BEGIN + 68) #define STR_SENDER_TOKENS (RC_ENVLOP_BEGIN + 69) // Ueberlaufpruefung ---------------------------------------------------------- diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 1d117977127c..2eb00203000a 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -176,10 +176,7 @@ #define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90) #define TP_TOX_ENTRY (RC_GLOBALS_BEGIN + 91) #define TP_TOX_STYLES (RC_GLOBALS_BEGIN + 92) -#define TP_VISITING_CARDS (RC_GLOBALS_BEGIN + 93) #define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94) -#define TP_PRIVATE_DATA (RC_GLOBALS_BEGIN + 95) -#define TP_BUSINESS_DATA (RC_GLOBALS_BEGIN + 96) #define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103) #define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104) //maximum: RC_GLOBALS_BEGIN + 120 diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 751430fcde2c..918bba2f74a7 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -330,7 +330,6 @@ #define HID_DRAW_TEXT_TOOLBOX "SW_HID_DRAW_TEXT_TOOLBOX" #define HID_NUM_TOOLBOX "SW_HID_NUM_TOOLBOX" -#define HID_LABEL_INSERT "SW_HID_LABEL_INSERT" #define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" #define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 1d372b2027de..b0578c1f444f 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -247,7 +247,7 @@ public: class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg { public: - virtual const String& GetBusinessCardStr() const = 0; + virtual const OUString& GetBusinessCardStr() const = 0; virtual Printer *GetPrt() =0; }; @@ -356,8 +356,8 @@ public: virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ) = 0; //add for SwEnvDlg - virtual AbstractSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg - SwNewDBMgr* pNewDBMgr, sal_Bool bLabel,int nResId ) = 0; + virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg + SwNewDBMgr* pNewDBMgr, bool bLabel) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg |