diff options
Diffstat (limited to 'cui/source/inc')
| -rw-r--r-- | cui/source/inc/chardlg.hxx | 21 | ||||
| -rw-r--r-- | cui/source/inc/cuires.hrc | 5 |
2 files changed, 9 insertions, 17 deletions
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index d01d38c3cdf2..90abbb1ed780 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -57,7 +57,6 @@ class SvxCharBasePage : public SfxTabPage { protected: SvxFontPrevWindow* m_pPreviewWin; - FixedInfo* m_pFontTypeFT; sal_Bool m_bPreviewBackgroundToCharacter; @@ -66,9 +65,6 @@ protected: virtual ~SvxCharBasePage(); - void makeWidgets(Window *pParent, const ResId& rResId, - sal_uInt16 nResIdPrewievWin, sal_uInt16 nResIdFontTypeFT); - void SetPrevFontWidthScale( const SfxItemSet& rSet ); void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); @@ -92,10 +88,7 @@ class SvxCharNamePage : public SvxCharBasePage { private: - VclVBox m_aBox; - VclGrid m_aGrid; - - FixedLine* m_pWestLine; + VclContainer* m_pWestFrame; FixedText* m_pWestFontNameFT; FontNameBox* m_pWestFontNameLB; FixedText* m_pWestFontStyleFT; @@ -105,7 +98,7 @@ private: FixedText* m_pWestFontLanguageFT; SvxLanguageBox* m_pWestFontLanguageLB; - FixedLine* m_pEastLine; + VclContainer* m_pEastFrame; FixedText* m_pEastFontNameFT; FontNameBox* m_pEastFontNameLB; FixedText* m_pEastFontStyleFT; @@ -115,7 +108,7 @@ private: FixedText* m_pEastFontLanguageFT; SvxLanguageBox* m_pEastFontLanguageLB; - FixedLine* m_pCTLLine; + VclContainer* m_pCTLFrame; FixedText* m_pCTLFontNameFT; FontNameBox* m_pCTLFontNameLB; FixedText* m_pCTLFontStyleFT; @@ -125,10 +118,6 @@ private: FixedText* m_pCTLFontLanguageFT; SvxLanguageBox* m_pCTLFontLanguageLB; - FixedLine* m_pColorFL; - FixedText* m_pColorFT; - ColorListBox* m_pColorLB; - SvxCharNamePage_Impl* m_pImpl; SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); @@ -155,12 +144,10 @@ private: }; void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); - sal_Bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - void ResetColor_Impl( const SfxItemSet& rSet ); + sal_Bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); DECL_LINK(UpdateHdl_Impl, void *); DECL_LINK( FontModifyHdl_Impl, void* ); - DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: using SfxTabPage::ActivatePage; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 85d6738a865c..f9e9571737b1 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -103,6 +103,11 @@ #define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236) #define RID_SVXSTR_CHARNAME_TRANSPARENT (RID_SVX_START + 237) #define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238) +#define RID_SVXSTR_CHARNAME_NOSTYLE (RID_SVX_START + 239) +#define RID_SVXSTR_CHARNAME_FAMILY (RID_SVX_START + 240) +#define RID_SVXSTR_CHARNAME_FONT (RID_SVX_START + 241) +#define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242) +#define RID_SVXSTR_CHARNAME_TYPEFACE (RID_SVX_START + 243) // autocor #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) |