Skip to content

C
core
Kaydet (Commit) fc46b5ac authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

editeng: Add CharInteropGrabBag to editeng. 

Change-Id: I91c816499f463febc536d79e4a9fd9804f74df00
üst 19594315
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 11 deletions
editeng/source/editeng/eerdll.cxx
Dosyayı görüntüle @ fc46b5ac
......@@ -39,6 +39,7 @@
#include <editeng/scriptspaceitem.hxx>
#include <editeng/numdef.hxx>
#include <svl/itempool.hxx>
#include <svl/grabbagitem.hxx>
#include <vcl/virdev.hxx>
#include <editeng/autokernitem.hxx>
......@@ -160,8 +161,9 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[50] = new SfxVoidItem( EE_FEATURE_LINEBR );
ppDefItems[51] = new SvxCharSetColorItem( Color( COL_RED ), RTL_TEXTENCODING_DONTKNOW, EE_FEATURE_NOTCONV );
ppDefItems[52] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
ppDefItems[53] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
DBG_ASSERT( EDITITEMCOUNT == 53, "ITEMCOUNT geaendert, DefItems nicht angepasst!" );
DBG_ASSERT( EDITITEMCOUNT == 54, "ITEMCOUNT geaendert, DefItems nicht angepasst!" );
// Init DefFonts:
GetDefaultFonts( *(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO - EE_ITEMS_START],
......
include/editeng/eeitem.hxx
Dosyayı görüntüle @ fc46b5ac
......@@ -79,17 +79,17 @@
#define EE_CHAR_XMLATTRIBS (EE_ITEMS_START+46)
#define EE_CHAR_OVERLINE (EE_ITEMS_START+47)
#define EE_CHAR_CASEMAP (EE_ITEMS_START+48)
#define EE_CHAR_END (EE_ITEMS_START+48)
#define EE_CHAR_GRABBAG (EE_ITEMS_START+49)
#define EE_CHAR_END (EE_ITEMS_START+49)
#define EE_FEATURE_START (EE_ITEMS_START+50)
#define EE_FEATURE_TAB (EE_ITEMS_START+50)
#define EE_FEATURE_LINEBR (EE_ITEMS_START+51)
#define EE_FEATURE_NOTCONV (EE_ITEMS_START+52)
#define EE_FEATURE_FIELD (EE_ITEMS_START+53)
#define EE_FEATURE_END (EE_ITEMS_START+53)
#define EE_FEATURE_START (EE_ITEMS_START+49)
#define EE_FEATURE_TAB (EE_ITEMS_START+49)
#define EE_FEATURE_LINEBR (EE_ITEMS_START+50)
#define EE_FEATURE_NOTCONV (EE_ITEMS_START+51)
#define EE_FEATURE_FIELD (EE_ITEMS_START+52)
#define EE_FEATURE_END (EE_ITEMS_START+52)
#define EE_ITEMS_END (EE_ITEMS_START+52)
#define EE_ITEMS_END (EE_ITEMS_START+53)
#define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 )
......
include/editeng/unotext.hxx
Dosyayı görüntüle @ fc46b5ac
......@@ -125,7 +125,9 @@ class SvxItemPropertySet;
{ OUString(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \
{ OUString(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \
{ OUString(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, ::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
{ OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }
{ OUString("CharRelief"), EE_CHAR_RELIEF, ::getCppuType((const sal_Int16*)0), 0, MID_RELIEF }, \
{ OUString("CharInteropGrabBag"), EE_CHAR_GRABBAG, ::getCppuType((css::uno::Sequence<css::beans::PropertyValue >*)0), 0, 0}
#define SVX_UNOEDIT_FONT_PROPERTIES \
{OUString(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, ::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment