summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/eerdll.cxx2
-rw-r--r--editeng/source/items/textitem.cxx4
-rw-r--r--editeng/source/rtf/rtfitem.cxx4
-rw-r--r--include/editeng/wrlmitem.hxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx2
-rw-r--r--sw/source/core/bastyp/init.cxx2
-rw-r--r--sw/source/filter/ww1/w1filter.cxx29
7 files changed, 20 insertions, 25 deletions
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 8a8144cfa42f..2045105c693e 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -136,7 +136,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[28] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
ppDefItems[29] = new SvxAutoKernItem( false, EE_CHAR_PAIRKERNING );
ppDefItems[30] = new SvxKerningItem( 0, EE_CHAR_KERNING );
- ppDefItems[31] = new SvxWordLineModeItem( sal_False, EE_CHAR_WLM );
+ ppDefItems[31] = new SvxWordLineModeItem( 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 );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ad3b0dfb5f41..7e8b813e133e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -123,7 +123,7 @@ TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NO
TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0));
TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0));
TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0));
-TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(false, 0));
TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0));
TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0));
@@ -1748,7 +1748,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
// class SvxWordLineModeItem ---------------------------------------------
-SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
+SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode,
const sal_uInt16 nId ) :
SfxBoolItem( nId, bWordLineMode )
{
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 632e7c23fb0a..5baa24e125a1 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -788,7 +788,7 @@ SET_FONTALIGNMENT:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( true, PLAINID->nWordlineMode ));
}
goto ATTR_SETUNDERLINE;
@@ -883,7 +883,7 @@ ATTR_SETUNDERLINE:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( true, PLAINID->nWordlineMode ));
}
goto ATTR_SETOVERLINE;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index b37169a2ecc0..d64f2d6f070c 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
public:
TYPEINFO();
- SvxWordLineModeItem( const sal_Bool bWordLineMode /*= sal_False*/,
+ SvxWordLineModeItem( const bool bWordLineMode /*= false*/,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index bbf44639cb5c..1bc759d0e4e7 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -660,7 +660,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxWeightItem(WEIGHT_NORMAL,ITEMID_WEIGHT),
new SvxShadowedItem(false,ITEMID_SHADOWED),
- new SvxWordLineModeItem(sal_False,ITEMID_WORDLINEMODE),
+ new SvxWordLineModeItem(false,ITEMID_WORDLINEMODE),
new SvxContourItem(false,ITEMID_CONTOUR),
new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT),
new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE),
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index d0301f212808..6d3cd5a2a483 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -469,7 +469,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_UNDERLINE- POOLATTR_BEGIN ] = new SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE );
aAttrTab[ RES_CHRATR_WEIGHT- POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT );
aAttrTab[ RES_CHRATR_RSID - POOLATTR_BEGIN ] = new SvxRsidItem( 0, RES_CHRATR_RSID );
- aAttrTab[ RES_CHRATR_WORDLINEMODE- POOLATTR_BEGIN ] = new SvxWordLineModeItem( sal_False, RES_CHRATR_WORDLINEMODE );
+ aAttrTab[ RES_CHRATR_WORDLINEMODE- POOLATTR_BEGIN ] = new SvxWordLineModeItem( false, RES_CHRATR_WORDLINEMODE );
aAttrTab[ RES_CHRATR_AUTOKERN- POOLATTR_BEGIN ] = new SvxAutoKernItem( false, RES_CHRATR_AUTOKERN );
aAttrTab[ RES_CHRATR_BLINK - POOLATTR_BEGIN ] = new SvxBlinkItem( false, RES_CHRATR_BLINK );
aAttrTab[ RES_CHRATR_NOHYPHEN - POOLATTR_BEGIN ] = new SvxNoHyphenItem( true, RES_CHRATR_NOHYPHEN );
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 537293cf72d7..3659f888116b 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1107,24 +1107,19 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
rOut << SvxFontHeightItem(hpsGet() * 10, 100, RES_CHRATR_FONTSIZE);
if (fsKulGet())
switch (kulGet()) {
- case 0: {
- rOut << SvxUnderlineItem(UNDERLINE_NONE, RES_CHRATR_UNDERLINE) <<
- SvxWordLineModeItem(sal_False, RES_CHRATR_WORDLINEMODE);
- } break;
+ case 0: rOut << SvxUnderlineItem(UNDERLINE_NONE, RES_CHRATR_UNDERLINE)
+ << SvxWordLineModeItem(false, RES_CHRATR_WORDLINEMODE);
+ break;
+ case 1: rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE);
+ break;
+ case 2: rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE)
+ << SvxWordLineModeItem(true, RES_CHRATR_WORDLINEMODE);
+ break;
+ case 3: rOut << SvxUnderlineItem(UNDERLINE_DOUBLE, RES_CHRATR_UNDERLINE);
+ break;
+ case 4: rOut << SvxUnderlineItem(UNDERLINE_DOTTED, RES_CHRATR_UNDERLINE);
+ break;
default: OSL_ENSURE(false, "Chpx");
- case 1: {
- rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE);
- } break;
- case 2: {
- rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE) <<
- SvxWordLineModeItem(sal_True, RES_CHRATR_WORDLINEMODE);
- } break;
- case 3: {
- rOut << SvxUnderlineItem(UNDERLINE_DOUBLE, RES_CHRATR_UNDERLINE);
- } break;
- case 4: {
- rOut << SvxUnderlineItem(UNDERLINE_DOTTED, RES_CHRATR_UNDERLINE);
- } break;
}
if (fsIcoGet())
generated by cgit (git 2.34.1) at 2024-08-03 22:16:14 +0000