summaryrefslogtreecommitdiff
path: root/editeng/source/editeng/eerdll.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/editeng/eerdll.cxx')
-rw-r--r--editeng/source/editeng/eerdll.cxx35
1 files changed, 15 insertions, 20 deletions
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index c1491b7643..219e60353b 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -96,10 +96,10 @@ GlobalEditData::GlobalEditData()
GlobalEditData::~GlobalEditData()
{
- // DefItems zerstoeren...
- // Oder einfach stehen lassen, da sowieso App-Ende?!
+ // Destroy DefItems...
+ // Or simply keep them, since at end of excecution?!
if ( ppDefItems )
- SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, TRUE );
+ SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, sal_True );
delete pStdRefDevice;
}
@@ -110,16 +110,16 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
// Paragraph attributes:
- SvxNumRule aTmpNumRule( 0, 0, FALSE );
+ SvxNumRule aTmpNumRule( 0, 0, sal_False );
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
- ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, FALSE );
- ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, TRUE );
- ppDefItems[4] = new SvxScriptSpaceItem( TRUE, EE_PARA_ASIANCJKSPACING );
+ ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, sal_False );
+ ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True );
+ ppDefItems[4] = new SvxScriptSpaceItem( sal_True, EE_PARA_ASIANCJKSPACING );
ppDefItems[5] = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET );
- ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, FALSE );
- ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, TRUE );
+ ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, sal_False );
+ ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, sal_True );
ppDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE );
ppDefItems[9] = new SfxInt16Item( EE_PARA_OUTLLEVEL, -1 );
ppDefItems[10] = new SvxBulletItem( EE_PARA_BULLET );
@@ -140,12 +140,12 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[23] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
ppDefItems[24] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
ppDefItems[25] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
- ppDefItems[26] = new SvxContourItem( FALSE, EE_CHAR_OUTLINE );
- ppDefItems[27] = new SvxShadowedItem( FALSE, EE_CHAR_SHADOW );
+ ppDefItems[26] = new SvxContourItem( sal_False, EE_CHAR_OUTLINE );
+ ppDefItems[27] = new SvxShadowedItem( sal_False, EE_CHAR_SHADOW );
ppDefItems[28] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
- ppDefItems[29] = new SvxAutoKernItem( FALSE, EE_CHAR_PAIRKERNING );
+ ppDefItems[29] = new SvxAutoKernItem( sal_False, EE_CHAR_PAIRKERNING );
ppDefItems[30] = new SvxKerningItem( 0, EE_CHAR_KERNING );
- ppDefItems[31] = new SvxWordLineModeItem( FALSE, EE_CHAR_WLM );
+ ppDefItems[31] = new SvxWordLineModeItem( sal_False, EE_CHAR_WLM );
ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE );
ppDefItems[33] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CJK );
ppDefItems[34] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL );
@@ -160,12 +160,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[43] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK );
ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
-#ifndef SVX_LIGHT
ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
-#else
- // no need to have alien attributes persistent
- ppDefItems[46] = new SfxVoidItem( EE_CHAR_XMLATTRIBS );
-#endif // #ifndef SVX_LIGHT
ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
// Features
@@ -204,7 +199,7 @@ uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGues
{
xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
xMgr->createInstance(
- rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LanguageGuessing" )) ),
uno::UNO_QUERY );
}
}
@@ -221,7 +216,7 @@ OutputDevice* GlobalEditData::GetStdRefDevice()
return pStdRefDevice;
}
-EditResId::EditResId( USHORT nId ):
+EditResId::EditResId( sal_uInt16 nId ):
ResId( nId, *EE_DLL()->GetResMgr() )
{
}