diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-05 20:42:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-05 22:43:18 +0000 |
| commit | 79283929ac9b8e56516b70c8381e0c31f1c68645 (patch) | |
| tree | aabb67ee97a8c478579da8906fc8b0cef4be2447 /cui/source/inc | |
| parent | acb82cdefb2055a75e251a400a8fdc93276e98f5 (diff) | |
convert callout tabpage to .ui
Change-Id: I7f13a14d44cdb9be22cc2e9c6cad02f273729088
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/helpid.hrc | 2 | ||||
| -rw-r--r-- | cui/source/inc/labdlg.hxx | 40 |
2 files changed, 19 insertions, 23 deletions
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 7fdbb6cdfc40..c1262d59b8af 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -205,8 +205,6 @@ #define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" #define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE" -#define HID_CAPTION "CUI_HID_CAPTION" -#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE" #define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION" #define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM" diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index dcc08a88f2db..2d049d643310 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -33,27 +33,26 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3; class SvxCaptionTabPage : public SfxTabPage { private: - ValueSet aCT_CAPTTYPE; - FixedText aFT_ABSTAND; - MetricField aMF_ABSTAND; - FixedText aFT_ANSATZ; - ListBox aLB_ANSATZ; - FixedText aFT_UM; - MetricField aMF_ANSATZ; - FixedText aFT_ANSATZ_REL; - ListBox aLB_ANSATZ_REL; - FixedText aFT_LAENGE; - MetricField aMF_LAENGE; - CheckBox aCB_LAENGE; - - Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; - - OUString aStrHorzList; - OUString aStrVertList; - - short nCaptionType; + ValueSet* m_pCT_CAPTTYPE; + MetricField* m_pMF_ABSTAND; + ListBox* m_pLB_ANSATZ; + FixedText* m_pFT_UM; + MetricField* m_pMF_ANSATZ; + FixedText* m_pFT_ANSATZ_REL; + ListBox* m_pLB_ANSATZ_REL; + FixedText* m_pFT_LAENGE; + MetricField* m_pMF_LAENGE; + CheckBox* m_pCB_LAENGE; + + Image m_aBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; + + std::vector<OUString> m_aStrHorzList; + std::vector<OUString> m_aStrVertList; + std::vector<OUString> m_aLineTypes; + + short nCaptionType; sal_Int32 nGap; - short nEscDir; + short nEscDir; sal_Bool bEscRel; sal_Int32 nEscAbs; sal_Int32 nEscRel; @@ -75,7 +74,6 @@ private: public: SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); - virtual ~SvxCaptionTabPage(); static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); |