[Libreoffice-commits] core.git: 20 commits - chart2/source cui/source editeng/source extensions/source forms/source include/editeng reportdesign/source sc/source sd/source svx/source sw/source
Noel Grandin
noel at peralex.com
Fri Feb 21 02:20:43 PST 2014
chart2/source/controller/main/ShapeController.cxx | 2
cui/source/tabpages/border.cxx | 6
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 62 +--
editeng/source/accessibility/AccessibleParaManager.cxx | 10
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 4
editeng/source/accessibility/AccessibleStringWrap.cxx | 4
editeng/source/editeng/editeng.cxx | 188 ++++++------
editeng/source/editeng/editview.cxx | 54 +--
editeng/source/editeng/eerdll.cxx | 4
editeng/source/editeng/impedit2.cxx | 4
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 16 -
editeng/source/editeng/textconv.cxx | 2
editeng/source/items/borderline.cxx | 4
editeng/source/items/charhiddenitem.cxx | 4
editeng/source/items/frmitems.cxx | 42 +-
editeng/source/items/paraitem.cxx | 18 -
editeng/source/items/textitem.cxx | 16 -
editeng/source/misc/acorrcfg.cxx | 24 -
editeng/source/misc/forbiddencharacterstable.cxx | 2
editeng/source/outliner/outleeng.cxx | 4
editeng/source/outliner/outleeng.hxx | 4
editeng/source/outliner/outliner.cxx | 18 -
editeng/source/outliner/outlvw.cxx | 32 +-
editeng/source/rtf/rtfitem.cxx | 2
editeng/source/uno/UnoForbiddenCharsTable.cxx | 4
editeng/source/uno/unoedprx.cxx | 10
extensions/source/propctrlr/fontdialog.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 2
forms/source/richtext/richtextvclcontrol.cxx | 2
forms/source/richtext/richtextviewport.cxx | 2
include/editeng/AccessibleEditableTextPara.hxx | 14
include/editeng/AccessibleParaManager.hxx | 10
include/editeng/AccessibleStringWrap.hxx | 2
include/editeng/acorrcfg.hxx | 40 +-
include/editeng/adjustitem.hxx | 14
include/editeng/autokernitem.hxx | 2
include/editeng/blinkitem.hxx | 2
include/editeng/borderline.hxx | 4
include/editeng/boxitem.hxx | 28 -
include/editeng/brushitem.hxx | 2
include/editeng/bulletitem.hxx | 8
include/editeng/charhiddenitem.hxx | 2
include/editeng/charrotateitem.hxx | 12
include/editeng/contouritem.hxx | 2
include/editeng/editdata.hxx | 4
include/editeng/editeng.hxx | 90 ++---
include/editeng/editview.hxx | 52 +--
include/editeng/forbiddencharacterstable.hxx | 2
include/editeng/hngpnctitem.hxx | 3
include/editeng/hyphenzoneitem.hxx | 14
reportdesign/source/ui/misc/UITools.cxx | 12
sc/source/core/data/column2.cxx | 2
sc/source/core/data/docpool.cxx | 4
sc/source/core/data/documen9.cxx | 2
sc/source/core/data/stlpool.cxx | 12
sc/source/core/data/stlsheet.cxx | 4
sc/source/core/tool/editutil.cxx | 18 -
sc/source/filter/excel/xehelper.cxx | 8
sc/source/filter/html/htmlexp.cxx | 2
sc/source/ui/app/inputwin.cxx | 12
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/inc/spelleng.hxx | 4
sc/source/ui/pagedlg/tphfedit.cxx | 4
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 4
sc/source/ui/view/output2.cxx | 6
sc/source/ui/view/spelleng.cxx | 8
sc/source/ui/view/viewfun4.cxx | 2
sd/source/core/drawdoc4.cxx | 6
sd/source/core/stlpool.cxx | 20 -
sd/source/filter/html/htmlex.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 6
svx/source/accessibility/AccessibleTextHelper.cxx | 2
svx/source/svdraw/svdattr.cxx | 6
svx/source/table/tablecontroller.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
svx/source/unodraw/unoshtxt.cxx | 10
sw/source/core/bastyp/init.cxx | 14
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/poolfmt.cxx | 2
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/ndtbl1.cxx | 14
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/unocore/unotbl.cxx | 4
sw/source/filter/html/swhtml.cxx | 2
sw/source/ui/app/docshini.cxx | 2
sw/source/ui/app/docstyle.cxx | 8
sw/source/ui/dbui/dbinsdlg.cxx | 8
sw/source/ui/docvw/HeaderFooterWin.cxx | 6
sw/source/ui/shells/annotsh.cxx | 2
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/tabsh.cxx | 6
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 4
sw/source/ui/uno/unotxvw.cxx | 2
sw/source/ui/utlui/uitool.cxx | 8
102 files changed, 561 insertions(+), 566 deletions(-)
New commits:
commit db0222881be20744c071be451d77a7dc4a0dbb56
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 11:57:56 2014 +0200
editeng: sal_Bool->bool
Change-Id: Ie2c8bf805461d61de2dfa2658160fd612959932c
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 2c8b98e..a696872 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1787,7 +1787,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence< PropertyValue >(), 1 );
i18n::LineBreakUserOptions aUserOptions;
- const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( LanguageTag::convertToLanguageType( aLocale ), sal_True );
+ const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( LanguageTag::convertToLanguageType( aLocale ), true );
aUserOptions.forbiddenBeginCharacters = pForbidden->beginLine;
aUserOptions.forbiddenEndCharacters = pForbidden->endLine;
aUserOptions.applyForbiddenRules = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES )).GetValue();
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 44f51b2..56bdbe8 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -30,7 +30,7 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const ::com::sun::star
m_xContext = rxContext;
}
-const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault )
+const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault )
{
com::sun::star::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
Map::iterator it = maMap.find( nLanguage );
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index e253ed9..b973f52 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -53,7 +53,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
throw RuntimeException();
const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
- const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
+ const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, false );
if(!pForbidden)
throw NoSuchElementException();
@@ -69,7 +69,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
return sal_False;
const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
- const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
+ const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, false );
return NULL != pForbidden;
}
diff --git a/include/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx
index 1068cdf..d5fbc90 100644
--- a/include/editeng/forbiddencharacterstable.hxx
+++ b/include/editeng/forbiddencharacterstable.hxx
@@ -46,7 +46,7 @@ public:
~SvxForbiddenCharactersTable() {}
Map& GetMap() { return maMap; }
- const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault );
+ const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault );
void SetForbiddenCharacters( sal_uInt16 nLanguage , const com::sun::star::i18n::ForbiddenCharacters& );
void ClearForbiddenCharacters( sal_uInt16 nLanguage );
};
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 97c06db..b982138 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -410,7 +410,7 @@ const i18n::ForbiddenCharacters*
{
const i18n::ForbiddenCharacters* pRet = 0;
if( mxForbiddenCharsTable.is() )
- pRet = mxForbiddenCharsTable->GetForbiddenCharacters( nLang, sal_False );
+ pRet = mxForbiddenCharsTable->GetForbiddenCharacters( nLang, false );
if( bLocaleData && !pRet && g_pBreakIt )
pRet = &g_pBreakIt->GetForbidden( (LanguageType)nLang );
return pRet;
commit 63a4219e6992ad089c7612da0da2f668c89de3fd
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 10:20:00 2014 +0200
editeng: sal_Bool->bool
Change-Id: I1a4b8ff5ccecc2776d1f145f8763f3dab6afb38b
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5bd3184..64b7529 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -75,7 +75,7 @@ TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(sal_False, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(sal_False, 0));
-TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(sal_False, 0));
TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0));
TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(sal_True, 0));
@@ -1424,7 +1424,7 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation(
//------------------------------------------------------------------------
SvxHangingPunctuationItem::SvxHangingPunctuationItem(
- sal_Bool bOn, const sal_uInt16 nId )
+ bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn )
{
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 920a5a7..9c9248c 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -510,7 +510,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_NOOVERFLOW:
if( PARDID->nHangPunct )
{
- pSet->Put( SvxHangingPunctuationItem( sal_False,
+ pSet->Put( SvxHangingPunctuationItem( false,
PARDID->nHangPunct ));
}
break;
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index 3cfe881..ef7831c0 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -34,8 +34,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
public:
TYPEINFO();
- SvxHangingPunctuationItem( sal_Bool bOn /*= sal_False*/,
- const sal_uInt16 nId );
+ SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index f816d6c2..5df6e83 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -543,7 +543,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] = new SwNumRuleItem( OUString() );
aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] = new SvxScriptSpaceItem( sal_True, RES_PARATR_SCRIPTSPACE );
- aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new SvxHangingPunctuationItem( sal_True, RES_PARATR_HANGINGPUNCTUATION );
+ aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new SvxHangingPunctuationItem( true, RES_PARATR_HANGINGPUNCTUATION );
aAttrTab[ RES_PARATR_FORBIDDEN_RULES - POOLATTR_BEGIN ] = new SvxForbiddenRuleItem( sal_True, RES_PARATR_FORBIDDEN_RULES );
aAttrTab[ RES_PARATR_VERTALIGN - POOLATTR_BEGIN ] = new SvxParaVertAlignItem( 0, RES_PARATR_VERTALIGN );
aAttrTab[ RES_PARATR_SNAPTOGRID - POOLATTR_BEGIN ] = new SvxParaGridItem( sal_True, RES_PARATR_SNAPTOGRID );
commit a32ed92c953b6ad39a993c530d43f5d91c34be79
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 10:01:27 2014 +0200
editeng: sal_Bool->bool
Change-Id: I64cde75157fbdcda6ac92ca4064e6ab8197114c1
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 24c32c1..f239af4 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,7 +582,7 @@ void ShapeController::executeDispatch_ParagraphDialog()
SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS,
0 );
aNewAttr.Put( aAttr );
- aNewAttr.Put( SvxHyphenZoneItem( sal_False, SID_ATTR_PARA_HYPHENZONE ) );
+ aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
aNewAttr.Put( SvxFmtSplitItem( sal_True, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index d24ae98..5bd3184 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -70,7 +70,7 @@ TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_
TYPEINIT1_FACTORY(SvxAdjustItem, SfxPoolItem, new SvxAdjustItem(SVX_ADJUST_LEFT, 0));
TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
-TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(sal_False, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
@@ -668,11 +668,11 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
// class SvxHyphenZoneItem -----------------------------------------------
-SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId ) :
+SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
bHyphen = bHyph;
- bPageEnd = sal_True;
+ bPageEnd = true;
nMinLead = nMinTrail = 0;
nMaxHyphens = 255;
}
@@ -812,9 +812,9 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
sal_Int8 _bHyphen, _bHyphenPageEnd;
sal_Int8 _nMinLead, _nMinTrail, _nMaxHyphens;
rStrm.ReadSChar( _bHyphen ).ReadSChar( _bHyphenPageEnd ).ReadSChar( _nMinLead ).ReadSChar( _nMinTrail ).ReadSChar( _nMaxHyphens );
- SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( sal_False, Which() );
- pAttr->SetHyphen( sal_Bool( _bHyphen != 0 ) );
- pAttr->SetPageEnd( sal_Bool( _bHyphenPageEnd != 0 ) );
+ SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( false, Which() );
+ pAttr->SetHyphen( _bHyphen != 0 );
+ pAttr->SetPageEnd( _bHyphenPageEnd != 0 );
pAttr->GetMinLead() = _nMinLead;
pAttr->GetMinTrail() = _nMinTrail;
pAttr->GetMaxHyphens() = _nMaxHyphens;
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 84bcec0..7d7e04b 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -34,8 +34,8 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
{
- sal_Bool bHyphen: 1;
- sal_Bool bPageEnd: 1;
+ bool bHyphen : 1;
+ bool bPageEnd : 1;
sal_uInt8 nMinLead;
sal_uInt8 nMinTrail;
sal_uInt8 nMaxHyphens;
@@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
public:
TYPEINFO();
- SvxHyphenZoneItem( const sal_Bool bHyph /*= sal_False*/,
+ SvxHyphenZoneItem( const bool bHyph /*= false*/,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
@@ -62,11 +62,11 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- inline void SetHyphen( const sal_Bool bNew ) { bHyphen = bNew; }
- inline sal_Bool IsHyphen() const { return bHyphen; }
+ inline void SetHyphen( const bool bNew ) { bHyphen = bNew; }
+ inline bool IsHyphen() const { return bHyphen; }
- inline void SetPageEnd( const sal_Bool bNew ) { bPageEnd = bNew; }
- inline sal_Bool IsPageEnd() const { return bPageEnd; }
+ inline void SetPageEnd( const bool bNew ) { bPageEnd = bNew; }
+ inline bool IsPageEnd() const { return bPageEnd; }
inline sal_uInt8 &GetMinLead() { return nMinLead; }
inline sal_uInt8 GetMinLead() const { return nMinLead; }
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1a96526..f816d6c2 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -534,7 +534,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] = new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] = new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
- pItem = new SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE );
+ pItem = new SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE );
((SvxHyphenZoneItem*)pItem)->GetMaxHyphens() = 0; // Default: 0
aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] = pItem;
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 6e3452f..a53f918 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -520,7 +520,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put(aEditAttr);
- aDlgAttr.Put( SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE) );
+ aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 2f9c543..4180f95 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -414,7 +414,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
aDlgAttr.Put(aEditAttr);
- aDlgAttr.Put( SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE) );
+ aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
commit 239820a7ac9b6e9800973270142bcf7f7a8db322
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 20 14:42:05 2014 +0200
editeng: sal_Bool->bool
Change-Id: Idc081fb757cc83a17e4f557ed1311d7722a57998
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index cf39557..343b969 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -249,7 +249,7 @@ struct ParagraphInfos
, nFirstLineHeight( 0 )
, nFirstLineTextHeight ( 0 )
, nFirstLineMaxAscent( 0 )
- , bValid( 0 )
+ , bValid( false )
{}
sal_uInt16 nParaHeight;
sal_uInt16 nLines;
@@ -261,7 +261,7 @@ struct ParagraphInfos
sal_uInt16 nFirstLineTextHeight;
sal_uInt16 nFirstLineMaxAscent;
- sal_Bool bValid; // A query during formatting is not valid!
+ bool bValid; // A query during formatting is not valid!
};
struct EECharAttrib
commit b7180bd14fb5684886f8f90dbd1fa59bf6f0193a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 20 14:17:27 2014 +0200
editeng: sal_Bool->bool
Change-Id: Ia9b76985ea0b9c511208b8283c8487c89aa67b88
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index f5f9efc..5a8f0a6 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::linguistic2;
#if (OSL_DEBUG_LEVEL > 1) || defined ( DBG_UTIL )
-static sal_Bool bDebugPaint = sal_False;
+static bool bDebugPaint = false;
#endif
static SfxItemPool* pGlobalPool=0;
@@ -107,17 +107,17 @@ EditEngine::~EditEngine()
delete pImpEditEngine;
}
-void EditEngine::EnableUndo( sal_Bool bEnable )
+void EditEngine::EnableUndo( bool bEnable )
{
pImpEditEngine->EnableUndo( bEnable );
}
-sal_Bool EditEngine::IsUndoEnabled()
+bool EditEngine::IsUndoEnabled()
{
return pImpEditEngine->IsUndoEnabled();
}
-sal_Bool EditEngine::IsInUndo()
+bool EditEngine::IsInUndo()
{
return pImpEditEngine->IsInUndo();
}
@@ -191,17 +191,17 @@ Color EditEngine::GetAutoColor() const
return pImpEditEngine->GetAutoColor();
}
-void EditEngine::EnableAutoColor( sal_Bool b )
+void EditEngine::EnableAutoColor( bool b )
{
pImpEditEngine->EnableAutoColor( b );
}
-void EditEngine::ForceAutoColor( sal_Bool b )
+void EditEngine::ForceAutoColor( bool b )
{
pImpEditEngine->ForceAutoColor( b );
}
-sal_Bool EditEngine::IsForceAutoColor() const
+bool EditEngine::IsForceAutoColor() const
{
return pImpEditEngine->IsForceAutoColor();
}
@@ -236,10 +236,10 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOri
void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos )
{
- Draw( pOutDev, rOutRect, rStartDocPos, sal_True );
+ Draw( pOutDev, rOutRect, rStartDocPos, true );
}
-void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip )
+void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, bool bClip )
{
#if defined( DBG_UTIL ) || (OSL_DEBUG_LEVEL > 1)
@@ -264,8 +264,8 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
aStartPos.Y() = aOutRect.Top() - rStartDocPos.X();
}
- sal_Bool bClipRegion = pOutDev->IsClipRegion();
- sal_Bool bMetafile = pOutDev->GetConnectMetaFile() ? sal_True : sal_False;
+ bool bClipRegion = pOutDev->IsClipRegion();
+ bool bMetafile = pOutDev->GetConnectMetaFile();
Region aOldRegion = pOutDev->GetClipRegion();
// If one existed => intersection!
@@ -281,7 +281,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
( rOutRect.GetHeight() >= (long)GetTextHeight() ) &&
( rOutRect.GetWidth() >= (long)CalcTextWidth() ) )
{
- bClip = sal_False;
+ bClip = false;
}
else
{
@@ -373,7 +373,7 @@ size_t EditEngine::GetViewCount() const
return pImpEditEngine->GetEditViews().size();
}
-sal_Bool EditEngine::HasView( EditView* pView ) const
+bool EditEngine::HasView( EditView* pView ) const
{
ImpEditEngine::ViewsType& rViews = pImpEditEngine->GetEditViews();
return std::find(rViews.begin(), rViews.end(), pView) != rViews.end();
@@ -406,7 +406,7 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
pImpEditEngine->SetValidPaperSize( rNewSize );
Size aNewSize( pImpEditEngine->GetPaperSize() );
- sal_Bool bAutoPageSize = pImpEditEngine->GetStatus().AutoPageSize();
+ bool bAutoPageSize = pImpEditEngine->GetStatus().AutoPageSize();
if ( bAutoPageSize || ( aNewSize.Width() != aOldSize.Width() ) )
{
for (size_t nView = 0; nView < pImpEditEngine->aEditViews.size(); ++nView)
@@ -451,7 +451,7 @@ bool EditEngine::IsVertical() const
return pImpEditEngine->IsVertical();
}
-void EditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
+void EditEngine::SetFixedCellHeight( bool bUseFixedCellHeight )
{
pImpEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
}
@@ -500,12 +500,12 @@ void EditEngine::SetAsianCompressionMode( sal_uInt16 n )
pImpEditEngine->SetAsianCompressionMode( n );
}
-void EditEngine::SetKernAsianPunctuation( sal_Bool b )
+void EditEngine::SetKernAsianPunctuation( bool b )
{
pImpEditEngine->SetKernAsianPunctuation( b );
}
-void EditEngine::SetAddExtLeading( sal_Bool b )
+void EditEngine::SetAddExtLeading( bool b )
{
pImpEditEngine->SetAddExtLeading( b );
}
@@ -517,14 +517,14 @@ void EditEngine::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon )
void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon)
{
- sal_Bool bSimple(sal_False);
+ bool bSimple(false);
if(pLinePolyPolygon && 1L == rPolyPolygon.count())
{
if(rPolyPolygon.getB2DPolygon(0L).isClosed())
{
// open polygon
- bSimple = sal_True;
+ bSimple = true;
}
}
@@ -955,19 +955,19 @@ void EditEngine::SetInSelectionMode(bool b)
pImpEditEngine->bInSelection = b;
}
-sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
+bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
{
DBG_ASSERT( pEditView, "no View - no cookie !" );
- sal_Bool bDone = sal_True;
+ bool bDone = true;
- sal_Bool bModified = sal_False;
- sal_Bool bMoved = sal_False;
- sal_Bool bAllowIdle = sal_True;
- sal_Bool bReadOnly = pEditView->IsReadOnly();
+ bool bModified = false;
+ bool bMoved = false;
+ bool bAllowIdle = true;
+ bool bReadOnly = pEditView->IsReadOnly();
sal_uInt16 nNewCursorFlags = 0;
- sal_Bool bSetCursorFlags = sal_True;
+ bool bSetCursorFlags = true;
EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
DBG_ASSERT( !aCurSel.IsInvalid(), "Blinde Selection in EditEngine::PostKeyEvent" );
@@ -986,14 +986,14 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
{
if ( !bReadOnly )
pEditView->Undo();
- return sal_True;
+ return true;
}
// break;
case KEYFUNC_REDO:
{
if ( !bReadOnly )
pEditView->Redo();
- return sal_True;
+ return true;
}
// break;
@@ -1037,7 +1037,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
aPos.Y() += nH;
}
}
- bDone = sal_False;
+ bDone = false;
}
break;
case KEY_F11:
@@ -1049,7 +1049,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
aInfo.append(bDebugPaint ? "On" : "Off");
InfoBox(NULL, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute();
}
- bDone = sal_False;
+ bDone = false;
}
break;
case KEY_F12:
@@ -1058,7 +1058,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
{
EditDbg::ShowEditEngineData( this );
}
- bDone = sal_False;
+ bDone = false;
}
break;
#endif
@@ -1090,7 +1090,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
{
if ( pImpEditEngine->DoVisualCursorTraveling( aCurSel.Max().GetNode() ) && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
- bSetCursorFlags = sal_False; // Will be manipulated within visual cursor move
+ bSetCursorFlags = false; // Will be manipulated within visual cursor move
aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView );
@@ -1099,7 +1099,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
pEditView->pImpEditView->CutCopy( aSelection, sal_False );
}
- bMoved = sal_True;
+ bMoved = true;
if ( nCode == KEY_HOME )
nNewCursorFlags |= GETCRSR_STARTOFLINE;
else if ( nCode == KEY_END )
@@ -1181,8 +1181,8 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
pImpEditEngine->UndoActionStart( EDITUNDO_DELETE );
aCurSel = pImpEditEngine->DeleteLeftOrRight( aCurSel, nDel, nMode );
pImpEditEngine->UndoActionEnd( EDITUNDO_DELETE );
- bModified = sal_True;
- bAllowIdle = sal_False;
+ bModified = true;
+ bAllowIdle = false;
}
}
break;
@@ -1190,7 +1190,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
{
if ( !bReadOnly && !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() )
{
- sal_Bool bShift = rKeyEvent.GetKeyCode().IsShift();
+ bool bShift = rKeyEvent.GetKeyCode().IsShift();
if ( pImpEditEngine->GetStatus().DoTabIndenting() &&
( aCurSel.Min().GetNode() != aCurSel.Max().GetNode() ) )
{
@@ -1198,7 +1198,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
}
else if ( !bShift )
{
- sal_Bool bSel = pEditView->HasSelection();
+ bool bSel = pEditView->HasSelection();
if ( bSel )
pImpEditEngine->UndoActionStart( EDITUNDO_INSERT );
if ( pImpEditEngine->GetStatus().DoAutoCorrect() )
@@ -1206,11 +1206,11 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
aCurSel = pImpEditEngine->InsertTab( aCurSel );
if ( bSel )
pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
- bModified = sal_True;
+ bModified = true;
}
}
else
- bDone = sal_False;
+ bDone = false;
}
break;
case KEY_RETURN:
@@ -1244,7 +1244,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
}
}
pImpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
- bModified = sal_True;
+ bModified = true;
}
}
}
@@ -1356,10 +1356,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
}
}
}
- bModified = sal_True;
+ bModified = true;
}
else
- bDone = sal_False;
+ bDone = false;
}
}
}
@@ -1395,7 +1395,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
}
else if ( bMoved )
{
- sal_Bool bGotoCursor = pEditView->pImpEditView->DoAutoScroll();
+ bool bGotoCursor = pEditView->pImpEditView->DoAutoScroll();
pEditView->pImpEditView->ShowCursor( bGotoCursor, sal_True );
pImpEditEngine->CallStatusHdl();
}
@@ -1444,14 +1444,14 @@ sal_uInt32 EditEngine::CalcTextWidth()
return nWidth;
}
-void EditEngine::SetUpdateMode( sal_Bool bUpdate )
+void EditEngine::SetUpdateMode( bool bUpdate )
{
pImpEditEngine->SetUpdateMode( bUpdate );
if ( pImpEditEngine->pActiveView )
pImpEditEngine->pActiveView->ShowCursor( false, false );
}
-sal_Bool EditEngine::GetUpdateMode() const
+bool EditEngine::GetUpdateMode() const
{
return pImpEditEngine->GetUpdateMode();
}
@@ -1470,7 +1470,7 @@ void EditEngine::SetText( const OUString& rText )
sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
{
- sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
+ bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
pImpEditEngine->EnableUndo( false );
pImpEditEngine->SetText( OUString() );
EditPaM aPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
@@ -1506,7 +1506,7 @@ void EditEngine::SetText( const EditTextObject& rTextObject )
pImpEditEngine->LeaveBlockNotifications();
}
-void EditEngine::ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow )
+void EditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
{
pImpEditEngine->ShowParagraph( nParagraph, bShow );
}
@@ -1639,12 +1639,12 @@ void EditEngine::SetModified()
pImpEditEngine->SetModifyFlag( sal_True );
}
-sal_Bool EditEngine::IsModified() const
+bool EditEngine::IsModified() const
{
return pImpEditEngine->IsModified();
}
-sal_Bool EditEngine::IsInSelectionMode() const
+bool EditEngine::IsInSelectionMode() const
{
return ( pImpEditEngine->IsInSelectionMode() ||
pImpEditEngine->GetSelEngine().IsInSelection() );
@@ -1714,7 +1714,7 @@ const SfxItemSet& EditEngine::GetParaAttribs( sal_Int32 nPara ) const
return pImpEditEngine->GetParaAttribs( nPara );
}
-sal_Bool EditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
+bool EditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
return pImpEditEngine->HasParaAttrib( nPara, nWhich );
}
@@ -1741,7 +1741,7 @@ SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32
return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
}
-void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void EditEngine::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
{
pImpEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
@@ -1792,12 +1792,12 @@ void EditEngine::GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList )
}
}
-void EditEngine::SetFlatMode( sal_Bool bFlat)
+void EditEngine::SetFlatMode( bool bFlat)
{
pImpEditEngine->SetFlatMode( bFlat );
}
-sal_Bool EditEngine::IsFlatMode() const
+bool EditEngine::IsFlatMode() const
{
return !( pImpEditEngine->aStatus.UseCharAttribs() );
}
@@ -1825,7 +1825,7 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
if ( ( nChanges & EE_CNTRL_USECHARATTRIBS ) ||
( nChanges & EE_CNTRL_USEPARAATTRIBS ) )
{
- sal_Bool bUseCharAttribs = ( nWord & EE_CNTRL_USECHARATTRIBS ) ? sal_True : sal_False;
+ bool bUseCharAttribs = ( nWord & EE_CNTRL_USECHARATTRIBS );
pImpEditEngine->GetEditDoc().CreateDefFont( bUseCharAttribs );
}
@@ -1834,7 +1834,7 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
}
}
- sal_Bool bSpellingChanged = nChanges & EE_CNTRL_ONLINESPELLING ? sal_True : sal_False;
+ bool bSpellingChanged = nChanges & EE_CNTRL_ONLINESPELLING;
if ( bSpellingChanged )
{
@@ -1954,18 +1954,18 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
return 0;
}
-sal_Bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
+bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
{
return pImpEditEngine->IsRightToLeft( nPara );
}
-sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
+bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
{
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
- sal_Bool bTextPos = sal_False;
+ bool bTextPos = false;
// take unrotated positions for calculation here
Point aDocPos = GetDocPos( rPaperPos );
@@ -1983,7 +1983,7 @@ sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
if ( ( aDocPos.X() >= aLineXPosStartEnd.Min() - nBorder ) &&
( aDocPos.X() <= aLineXPosStartEnd.Max() + nBorder ) )
{
- bTextPos = sal_True;
+ bTextPos = true;
}
}
}
@@ -2064,7 +2064,7 @@ void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& r
pImpEditEngine->ImpInsertFeature( aSel, rFld );
}
-void EditEngine::QuickFormatDoc( sal_Bool bFull )
+void EditEngine::QuickFormatDoc( bool bFull )
{
if ( bFull )
pImpEditEngine->FormatFullDoc();
@@ -2167,9 +2167,9 @@ LanguageType EditEngine::GetDefaultLanguage() const
return pImpEditEngine->GetDefaultLanguage();
}
-sal_Bool EditEngine::SpellNextDocument()
+bool EditEngine::SpellNextDocument()
{
- return sal_False;
+ return false;
}
EESpellState EditEngine::HasSpellErrors()
@@ -2185,7 +2185,7 @@ void EditEngine::ClearSpellErrors()
pImpEditEngine->ClearSpellErrors();
}
-void EditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
+void EditEngine::StartSpelling(EditView& rEditView, bool bMultipleDoc)
{
pImpEditEngine->StartSpelling(rEditView, bMultipleDoc);
}
@@ -2205,17 +2205,17 @@ void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPor
pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck );
}
-sal_Bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
+bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
{
return pImpEditEngine->HasConvertibleTextPortion( nLang );
}
-sal_Bool EditEngine::ConvertNextDocument()
+bool EditEngine::ConvertNextDocument()
{
- return sal_False;
+ return false;
}
-sal_Bool EditEngine::HasText( const SvxSearchItem& rSearchItem )
+bool EditEngine::HasText( const SvxSearchItem& rSearchItem )
{
return pImpEditEngine->HasText( rSearchItem );
}
@@ -2230,7 +2230,7 @@ void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const
pImpEditEngine->GetCharStretching( rX, rY );
}
-sal_Bool EditEngine::ShouldCreateBigTextObject() const
+bool EditEngine::ShouldCreateBigTextObject() const
{
sal_Int32 nTextPortions = 0;
sal_Int32 nParas = pImpEditEngine->GetEditDoc().Count();
@@ -2239,7 +2239,7 @@ sal_Bool EditEngine::ShouldCreateBigTextObject() const
ParaPortion* pParaPortion = pImpEditEngine->GetParaPortions()[nPara];
nTextPortions = nTextPortions + pParaPortion->GetTextPortions().Count();
}
- return ( nTextPortions >= pImpEditEngine->GetBigTextObjectStart() ) ? sal_True : sal_False;
+ return nTextPortions >= pImpEditEngine->GetBigTextObjectStart();
}
sal_uInt16 EditEngine::GetFieldCount( sal_Int32 nPara ) const
@@ -2291,7 +2291,7 @@ EFieldInfo EditEngine::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
bool EditEngine::UpdateFields()
{
- sal_Bool bChanges = pImpEditEngine->UpdateFields();
+ bool bChanges = pImpEditEngine->UpdateFields();
if ( bChanges )
pImpEditEngine->FormatAndUpdate();
return bChanges;
@@ -2302,7 +2302,7 @@ bool EditEngine::UpdateFieldsOnly()
return pImpEditEngine->UpdateFields();
}
-void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
+void EditEngine::RemoveFields( bool bKeepFieldText, TypeId aType )
{
if ( bKeepFieldText )
@@ -2331,16 +2331,16 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
}
}
-sal_Bool EditEngine::HasOnlineSpellErrors() const
+bool EditEngine::HasOnlineSpellErrors() const
{
sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
if ( pNode->GetWrongList() && !pNode->GetWrongList()->empty() )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void EditEngine::CompleteOnlineSpelling()
@@ -2476,10 +2476,10 @@ void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*n
{
}
-sal_Bool EditEngine::FormattingParagraph( sal_Int32 )
+bool EditEngine::FormattingParagraph( sal_Int32 )
{
- // return sal_True, if the Attribute was changed ...
- return sal_False;
+ // return true, if the Attribute was changed ...
+ return false;
}
void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
@@ -2575,7 +2575,7 @@ void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_Int32 )
// =====================================================================
// ====================== Static Methods =======================
// =====================================================================
-SfxItemPool* EditEngine::CreatePool( sal_Bool bPersistentRefCounts )
+SfxItemPool* EditEngine::CreatePool( bool bPersistentRefCounts )
{
SfxItemPool* pPool = new EditEngineItemPool( bPersistentRefCounts );
return pPool;
@@ -2632,9 +2632,9 @@ SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet )
return aFont;
}
-sal_Bool EditEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
+bool EditEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
{
- sal_Bool bDoesMove = sal_False;
+ bool bDoesMove = false;
switch ( rKeyEvent.GetKeyCode().GetCode() )
{
@@ -2648,16 +2648,16 @@ sal_Bool EditEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
case KEY_PAGEDOWN:
{
if ( !rKeyEvent.GetKeyCode().IsMod2() )
- bDoesMove = sal_True;
+ bDoesMove = true;
}
break;
}
return bDoesMove;
}
-sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
+bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
{
- sal_Bool bDoesChange = sal_False;
+ bool bDoesChange = false;
KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction();
if ( eFunc != KEYFUNC_DONTKNOW )
@@ -2667,7 +2667,7 @@ sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
case KEYFUNC_UNDO:
case KEYFUNC_REDO:
case KEYFUNC_CUT:
- case KEYFUNC_PASTE: bDoesChange = sal_True;
+ case KEYFUNC_PASTE: bDoesChange = true;
break;
default: // is then possibly edited below.
eFunc = KEYFUNC_DONTKNOW;
@@ -2678,13 +2678,13 @@ sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
switch ( rKeyEvent.GetKeyCode().GetCode() )
{
case KEY_DELETE:
- case KEY_BACKSPACE: bDoesChange = sal_True;
+ case KEY_BACKSPACE: bDoesChange = true;
break;
case KEY_RETURN:
case KEY_TAB:
{
if ( !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() )
- bDoesChange = sal_True;
+ bDoesChange = true;
}
break;
default:
@@ -2696,20 +2696,20 @@ sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
return bDoesChange;
}
-sal_Bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
+bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
{
if( EditEngine::IsPrintable( rKeyEvent.GetCharCode() ) &&
( KEY_MOD2 != (rKeyEvent.GetKeyCode().GetModifier() & ~KEY_SHIFT ) ) &&
( KEY_MOD1 != (rKeyEvent.GetKeyCode().GetModifier() & ~KEY_SHIFT ) ) )
{
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
+bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
{
- sal_Bool bValidData = sal_False;
+ bool bValidData = false;
if ( rTransferable.is() )
{
@@ -2744,7 +2744,7 @@ Link EditEngine::GetEndDropHdl() const
return pImpEditEngine->GetEndDropHdl();
}
-void EditEngine::SetFirstWordCapitalization( sal_Bool bCapitalize )
+void EditEngine::SetFirstWordCapitalization( bool bCapitalize )
{
pImpEditEngine->SetFirstWordCapitalization( bCapitalize );
}
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 20d7838..4b89a3f 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -112,12 +112,12 @@ void OutlinerEditEng::ParaAttribsChanged( sal_Int32 nPara )
pOwner->ParaAttribsChanged( nPara );
}
-sal_Bool OutlinerEditEng::SpellNextDocument()
+bool OutlinerEditEng::SpellNextDocument()
{
return pOwner->SpellNextDocument();
}
-sal_Bool OutlinerEditEng::ConvertNextDocument()
+bool OutlinerEditEng::ConvertNextDocument()
{
return pOwner->ConvertNextDocument();
}
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index cc1925f..5798e8e 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -66,11 +66,11 @@ public:
virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
virtual void ParaAttribsChanged( sal_Int32 nPara );
- virtual sal_Bool SpellNextDocument();
+ virtual bool SpellNextDocument();
virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const;
// for text conversion
- virtual sal_Bool ConvertNextDocument();
+ virtual bool ConvertNextDocument();
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index ae027cd..d018737 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -97,7 +97,7 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16
else
{
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
ImplBlockInsertionCallbacks( sal_True );
pPara = new Paragraph( nDepth );
pParaList->Insert( pPara, nAbsPos );
@@ -418,7 +418,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara )
DBG_ASSERT(pPara,"SetText:No Para");
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
ImplBlockInsertionCallbacks( sal_True );
sal_Int32 nPara = pParaList->GetAbsPos( pPara );
@@ -579,7 +579,7 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
{
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
sal_Bool bUndo = pEditEngine->IsUndoEnabled();
EnableUndo( sal_False );
@@ -616,7 +616,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
Paragraph* pPara;
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
ImplBlockInsertionCallbacks( sal_True );
sal_Int32 nPara;
@@ -763,7 +763,7 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreat
if( !IsInUndo() )
{
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
sal_Bool bUndo = bCreateUndo && IsUndoEnabled();
if ( bUndo && bUndoAction )
@@ -1131,7 +1131,7 @@ sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16
EnableUndo( sal_False );
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
Clear();
@@ -1173,7 +1173,7 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara )
{
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
Paragraph* pLastConverted = NULL;
for( sal_Int32 nPara = nFirstPara; nPara <= nLastPara; nPara++ )
@@ -1212,7 +1212,7 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount )
{
sal_Bool bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( sal_False );
+ pEditEngine->SetUpdateMode( false );
const sal_Int32 nStart = nStartPara;
@@ -1984,7 +1984,7 @@ void Outliner::Clear()
void Outliner::SetFlatMode( sal_Bool bFlat )
{
- if( bFlat != pEditEngine->IsFlatMode() )
+ if( bFlat != (pEditEngine->IsFlatMode() ? 1 : 0) )
{
for ( sal_Int32 nPara = pParaList->GetParagraphCount(); nPara; )
pParaList->GetParagraph( --nPara )->aBulSize.Width() = -1;
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 076a2ae..074d6be 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -392,7 +392,7 @@ sal_Int32 OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
{
sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
pOwner->UndoActionStart( OLUNDO_ATTR );
@@ -446,7 +446,7 @@ void OutlinerView::Indent( short nDiff )
const bool bOutlinerView = pOwner->pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER;
sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
@@ -654,7 +654,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
pOwner->UndoActionStart( OLUNDO_INSERT );
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
sal_Int32 nStart, nParaCount;
nParaCount = pOwner->pEditEngine->GetParagraphCount();
sal_uInt16 nSize = ImpInitPaste( nStart );
@@ -686,7 +686,7 @@ void OutlinerView::PasteSpecial()
{
pOwner->UndoActionStart( OLUNDO_INSERT );
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
pOwner->bPasting = sal_True;
pEditView->PasteSpecial();
@@ -829,7 +829,7 @@ void OutlinerView::ToggleBullets()
aSel.Adjust();
const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
sal_Int16 nNewDepth = -2;
const SvxNumRule* pDefaultBulletNumRule = 0;
@@ -945,7 +945,7 @@ void OutlinerView::EnableBullets()
aSel.Adjust();
const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
@@ -983,7 +983,7 @@ void OutlinerView::ApplyBulletsNumbering(
pOwner->UndoActionStart(OLUNDO_DEPTH);
const sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode(sal_False);
+ pOwner->pEditEngine->SetUpdateMode(false);
sal_Int32 nStartPara = 0;
sal_Int32 nEndPara = 0;
@@ -1125,7 +1125,7 @@ void OutlinerView::SwitchOffBulletsNumbering(
pOwner->UndoActionStart( OLUNDO_DEPTH );
const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->pEditEngine->SetUpdateMode( false );
for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; ++nPara )
{
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 164b573..8ae8f53 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -630,7 +630,7 @@ namespace frm
lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
// actually draw the content
- m_pEngine->Draw( _pDev, aPlayground, Point(), sal_True );
+ m_pEngine->Draw( _pDev, aPlayground, Point(), true );
_pDev->Pop();
}
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 4b205d2..bf7d0b5 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -97,7 +97,7 @@ namespace frm
getView().HideCursor();
sal_Bool bOldUpdateMode = getEngine().GetUpdateMode(); // TODO: guard?
- getEngine().SetUpdateMode( sal_False );
+ getEngine().SetUpdateMode( false );
getView().SetAttribs( _rAttributesToApply );
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 090dc10..f03ecb3 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -134,9 +134,9 @@ public:
private:
ImpEditEngine* pImpEditEngine;
- EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
- EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& );
- EDITENG_DLLPRIVATE sal_uInt8 PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
+ EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
+ EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& );
+ EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
EDITENG_DLLPRIVATE void CheckIdleFormatter();
@@ -195,24 +195,24 @@ public:
void SetRefMapMode( const MapMode& rMapMode );
MapMode GetRefMapMode();
- void SetUpdateMode( sal_Bool bUpdate );
- sal_Bool GetUpdateMode() const;
- void SetUpdateModeForAcc( sal_Bool bUp);
- sal_Bool GetUpdateModeForAcc( ) const;
+ void SetUpdateMode( bool bUpdate );
+ bool GetUpdateMode() const;
+ void SetUpdateModeForAcc( bool bUp);
+ bool GetUpdateModeForAcc( ) const;
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const;
Color GetAutoColor() const;
- void EnableAutoColor( sal_Bool b );
- void ForceAutoColor( sal_Bool b );
- sal_Bool IsForceAutoColor() const;
+ void EnableAutoColor( bool b );
+ void ForceAutoColor( bool b );
+ bool IsForceAutoColor() const;
void InsertView(EditView* pEditView, size_t nIndex = EE_APPEND);
EditView* RemoveView( EditView* pEditView );
EditView* RemoveView(size_t nIndex = EE_APPEND);
EditView* GetView(size_t nIndex = 0) const;
size_t GetViewCount() const;
- sal_Bool HasView( EditView* pView ) const;
+ bool HasView( EditView* pView ) const;
EditView* GetActiveView() const;
void SetActiveView(EditView* pView);
@@ -222,7 +222,7 @@ public:
void SetVertical( bool bVertical );
bool IsVertical() const;
- void SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+ void SetFixedCellHeight( bool bUseFixedCellHeight );
void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const;
@@ -236,9 +236,9 @@ public:
void SetAsianCompressionMode( sal_uInt16 nCompression );
- void SetKernAsianPunctuation( sal_Bool bEnabled );
+ void SetKernAsianPunctuation( bool bEnabled );
- void SetAddExtLeading( sal_Bool b );
+ void SetAddExtLeading( bool b );
void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon );
void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
@@ -297,27 +297,27 @@ public:
void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
- SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All );
+ SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = sal_False );
- sal_Bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
+ bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
const SfxPoolItem& GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich );
Font GetStandardFont( sal_Int32 nPara );
SvxFont GetStandardSvxFont( sal_Int32 nPara );
- void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+ void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
- void ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow = sal_True );
+ void ShowParagraph( sal_Int32 nParagraph, bool bShow = true );
::svl::IUndoManager& GetUndoManager();
::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);
void UndoActionStart( sal_uInt16 nId );
void UndoActionStart(sal_uInt16 nId, const ESelection& rSel);
void UndoActionEnd( sal_uInt16 nId );
- sal_Bool IsInUndo();
+ bool IsInUndo();
- void EnableUndo( sal_Bool bEnable );
- sal_Bool IsUndoEnabled();
+ void EnableUndo( bool bEnable );
+ bool IsUndoEnabled();
/** returns the value last used for bTryMerge while calling ImpEditEngine::InsertUndo
This is currently used in a bad but needed hack to get undo actions merged in the
@@ -326,12 +326,12 @@ public:
void ClearModifyFlag();
void SetModified();
- sal_Bool IsModified() const;
+ bool IsModified() const;
void SetModifyHdl( const Link& rLink );
Link GetModifyHdl() const;
- sal_Bool IsInSelectionMode() const;
+ bool IsInSelectionMode() const;
void StripPortions();
void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList );
@@ -339,12 +339,12 @@ public:
long GetFirstLineStartX( sal_Int32 nParagraph );
Point GetDocPosTopLeft( sal_Int32 nParagraph );
Point GetDocPos( const Point& rPaperPos ) const;
- sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
+ bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
// StartDocPos corrresponds to VisArea.TopLeft().
void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos );
- void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip );
+ void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, bool bClip );
void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
// sal_uInt32: Error code of the stream.
@@ -361,8 +361,8 @@ public:
Link GetImportHdl() const;
// Do not evaluate font formatting => For Outliner
- sal_Bool IsFlatMode() const;
- void SetFlatMode( sal_Bool bFlat );
+ bool IsFlatMode() const;
+ void SetFlatMode( bool bFlat );
void SetControlWord( sal_uInt32 nWord );
sal_uInt32 GetControlWord() const;
@@ -370,7 +370,7 @@ public:
void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
void QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void QuickMarkInvalid( const ESelection& rSel );
- void QuickFormatDoc( sal_Bool bFull = sal_False );
+ void QuickFormatDoc( bool bFull = false );
void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
void QuickInsertLineBreak( const ESelection& rSel );
void QuickInsertText(const OUString& rText, const ESelection& rSel);
@@ -412,18 +412,18 @@ public:
void SetDefaultLanguage( LanguageType eLang );
LanguageType GetDefaultLanguage() const;
- sal_Bool HasOnlineSpellErrors() const;
+ bool HasOnlineSpellErrors() const;
void CompleteOnlineSpelling();
- sal_Bool ShouldCreateBigTextObject() const;
+ bool ShouldCreateBigTextObject() const;
// For fast Pre-Test without view:
EESpellState HasSpellErrors();
void ClearSpellErrors();
- sal_Bool HasText( const SvxSearchItem& rSearchItem );
+ bool HasText( const SvxSearchItem& rSearchItem );
//initialize sentence spelling
- void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc);
+ void StartSpelling(EditView& rEditView, bool bMultipleDoc);
//spell and return a sentence
bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking );
// put spell position to start of current sentence
@@ -432,17 +432,17 @@ public:
void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck );
// for text conversion (see also HasSpellErrors)
- sal_Bool HasConvertibleTextPortion( LanguageType nLang );
- virtual sal_Bool ConvertNextDocument();
+ bool HasConvertibleTextPortion( LanguageType nLang );
+ virtual bool ConvertNextDocument();
bool UpdateFields();
bool UpdateFieldsOnly();
- void RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL );
+ void RemoveFields( bool bKeepFieldText, TypeId aType = NULL );
sal_uInt16 GetFieldCount( sal_Int32 nPara ) const;
EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const;
- sal_Bool IsRightToLeft( sal_Int32 nPara ) const;
+ bool IsRightToLeft( sal_Int32 nPara ) const;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
CreateTransferable( const ESelection& rSelection ) const;
@@ -481,8 +481,8 @@ public:
const Color& rOverlineColor,
const Color& rTextLineColor);
virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const;
- virtual sal_Bool FormattingParagraph( sal_Int32 nPara );
- virtual sal_Bool SpellNextDocument();
+ virtual bool FormattingParagraph( sal_Int32 nPara );
+ virtual bool SpellNextDocument();
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
@@ -492,17 +492,17 @@ public:
virtual Rectangle GetBulletArea( sal_Int32 nPara );
- static SfxItemPool* CreatePool( sal_Bool bLoadRefCounts = sal_True );
+ static SfxItemPool* CreatePool( bool bLoadRefCounts = true );
static SfxItemPool& GetGlobalItemPool();
- static sal_Bool DoesKeyChangeText( const KeyEvent& rKeyEvent );
- static sal_Bool DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
- static sal_Bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
+ static bool DoesKeyChangeText( const KeyEvent& rKeyEvent );
+ static bool DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
+ static bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont );
static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont );
static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
- static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
- static sal_Bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
+ static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
+ static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
virtual SdrObject* GetCurTextObj() { return NULL; }
/** sets a link that is called at the beginning of a drag operation at an edit view */
void SetBeginDropHdl( const Link& rLink );
@@ -513,7 +513,7 @@ public:
Link GetEndDropHdl() const;
/// specifies if auto-correction should capitalize the first word or not (default is on)
- void SetFirstWordCapitalization( sal_Bool bCapitalize );
+ void SetFirstWordCapitalization( bool bCapitalize );
EditDoc& GetEditDoc();
const EditDoc& GetEditDoc() const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index e203878..45c2d6d 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -492,7 +492,7 @@ long ScColumn::GetNeededSize(
( pEngine->GetParagraphCount() > 1 || ( bBreak && pEngine->GetLineCount(0) > 1 ) ) )
{
pEngine->SetControlWord( nCtrl | EE_CNTRL_FORMAT100 );
- pEngine->QuickFormatDoc( sal_True );
+ pEngine->QuickFormatDoc( true );
long nSecondValue = pDev->LogicToPixel(Size( 0, pEngine->GetTextHeight() ), aHMMMode).Height();
if ( nSecondValue > nValue )
nValue = nSecondValue;
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index a916744..4e7ff26 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -503,9 +503,9 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, bool bRememberC
SetParaAttribs( j, rNewSet );
}
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
if ( bUndo )
- EnableUndo( sal_True );
+ EnableUndo( true );
}
void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, bool bTakeOwnership )
@@ -548,7 +548,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
if ( pDefaults )
SetDefaults( *pDefaults, false );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
@@ -560,7 +560,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
EditEngine::SetText( rTextObject );
SetDefaults( rSet, bRememberCopy );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
@@ -572,7 +572,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
EditEngine::SetText( rTextObject );
SetDefaults( pSet, bTakeOwnership );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::SetText( const OUString& rText )
@@ -584,7 +584,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
if ( pDefaults )
SetDefaults( *pDefaults, false );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
@@ -596,7 +596,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
EditEngine::SetText( rText );
SetDefaults( rSet, bRememberCopy );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
@@ -608,7 +608,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
EditEngine::SetText( rText );
SetDefaults( pSet, bTakeOwnership );
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
void ScEditEngineDefaulter::RepeatDefaults()
@@ -691,7 +691,7 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
}
}
if ( bUpdateMode )
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
}
ScTabEditEngine::ScTabEditEngine( ScDocument* pDoc )
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index b46c5fe..f94e816 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -579,7 +579,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
// formatted cell
ScEditEngineDefaulter& rEE = rRoot.GetEditEngine();
sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
- rEE.SetUpdateMode( sal_True );
+ rEE.SetUpdateMode( true );
// default items
const SfxItemSet& rItemSet = pCellAttr ? pCellAttr->GetItemSet() : rRoot.GetDoc().GetDefPattern()->GetItemSet();
@@ -604,7 +604,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
{
EditEngine& rEE = rRoot.GetDrawEditEngine();
sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
- rEE.SetUpdateMode( sal_True );
+ rEE.SetUpdateMode( true );
// create the string
rEE.SetText( pParaObj->GetTextObject() );
xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen );
@@ -632,7 +632,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
XclExpStringRef xString;
EditEngine& rEE = rRoot.GetDrawEditEngine();
sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
- rEE.SetUpdateMode( sal_True );
+ rEE.SetUpdateMode( true );
rEE.SetText( rEditObj );
xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen );
rEE.SetUpdateMode( bOldUpdateMode );
@@ -692,7 +692,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
// edit engine
sal_Bool bOldUpdateMode = mrEE.GetUpdateMode();
- mrEE.SetUpdateMode( sal_True );
+ mrEE.SetUpdateMode( true );
mrEE.SetText( *pTextObj );
// font information
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 78bd44b..f9e4af0 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1188,7 +1188,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
if ( bFields )
{
sal_Bool bOldUpdateMode = rEngine.GetUpdateMode();
- rEngine.SetUpdateMode( sal_True ); // no portions if not formatted
+ rEngine.SetUpdateMode( true ); // no portions if not formatted
for ( sal_Int32 nPar=0; nPar < nParas; nPar++ )
{
if ( nPar > 0 )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 3168f95..375cd20 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1399,7 +1399,7 @@ void ScMultiTextWnd::InitEditEngine()
if ( pHdl ) //! Testen, ob's der richtige InputHdl ist?
bFilled = pHdl->GetTextAndFields( *pEditEngine );
- pEditEngine->SetUpdateMode( sal_True );
+ pEditEngine->SetUpdateMode( true );
// aString ist die Wahrheit...
if (bFilled && pEditEngine->GetText() == aString)
@@ -1780,7 +1780,7 @@ void ScTextWnd::StartEditEngine()
if ( pHdl ) //! Testen, ob's der richtige InputHdl ist?
bFilled = pHdl->GetTextAndFields( *pEditEngine );
- pEditEngine->SetUpdateMode( sal_True );
+ pEditEngine->SetUpdateMode( true );
// aString ist die Wahrheit...
if (bFilled && pEditEngine->GetText() == aString)
@@ -2010,7 +2010,7 @@ void ScTextWnd::MakeDialogEditView()
if ( bIsRTL )
lcl_ModifyRTLDefaults( *pSet );
pEditEngine->SetDefaults( pSet );
- pEditEngine->SetUpdateMode( sal_True );
+ pEditEngine->SetUpdateMode( true );
pEditView = new EditView( pEditEngine, this );
pEditEngine->InsertView( pEditView, EE_APPEND );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 72ae27c..4ffdebb 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1107,7 +1107,7 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
// #i61702# if the content isn't accessed, there's no need to set the UpdateMode again
if ( bUpdateMode && !bLoseContent )
- rEngine.SetUpdateMode(sal_True);
+ rEngine.SetUpdateMode(true);
}
else
{
diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index ae73be8..e62c228 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -112,7 +112,7 @@ public:
protected:
/** Callback from edit engine to check the next cell. */
- virtual sal_Bool SpellNextDocument();
+ virtual bool SpellNextDocument();
/** Returns true, if the current text contains a spelling error. */
virtual bool NeedsConversion();
@@ -146,7 +146,7 @@ public:
protected:
/** Callback from edit engine to convert the next cell. */
- virtual sal_Bool ConvertNextDocument();
+ virtual bool ConvertNextDocument();
/** Returns true, if the current text contains text to convert. */
virtual bool NeedsConversion();
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 5e09b94..1a934bb 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2168,7 +2168,7 @@ static void lcl_ScaleFonts( EditEngine& rEngine, long nPercent )
}
if ( bUpdateMode )
- rEngine.SetUpdateMode( sal_True );
+ rEngine.SetUpdateMode( true );
}
static long lcl_GetEditSize( EditEngine& rEngine, bool bWidth, bool bSwap, long nAttrRotate )
@@ -4999,7 +4999,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
else if ( mbUseStyleColor && mbForceAutoColor )
lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine
- pEngine->SetUpdateMode( sal_True ); // after SetText, before CalcTextWidth/GetTextHeight
+ pEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight
long nEngineWidth = (long) pEngine->CalcTextWidth();
long nEngineHeight = pEngine->GetTextHeight();
@@ -5239,7 +5239,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
else
pEngine->SetPaperSize(aPaperSize);
- pEngine->SetUpdateMode( sal_True );
+ pEngine->SetUpdateMode( true );
}
}
else
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 2cda634..8ac4636 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -294,7 +294,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView )
}
}
-sal_Bool ScSpellingEngine::SpellNextDocument()
+bool ScSpellingEngine::SpellNextDocument()
{
return FindNextConversionCell();
}
@@ -398,7 +398,7 @@ void ScTextConversionEngine::ConvertAll( EditView& rEditView )
}
}
-sal_Bool ScTextConversionEngine::ConvertNextDocument()
+bool ScTextConversionEngine::ConvertNextDocument()
{
return FindNextConversionCell();
}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index f58c4dc..e3590fe 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1283,7 +1283,7 @@ OUString HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_Int32 nP
// TODO: MALTE!!!
EditEngine& rEditEngine = *(EditEngine*)&pOutliner->GetEditEngine();
bool bOldUpdateMode = rEditEngine.GetUpdateMode();
- rEditEngine.SetUpdateMode(sal_True);
+ rEditEngine.SetUpdateMode(true);
Paragraph* pPara = pOutliner->GetParagraph(nPara);
if(NULL == pPara)
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 256f0ec..ec998ab 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -111,7 +111,7 @@ SfxItemPool* GetAnnotationPool()
static SfxItemPool* mpAnnotationPool = 0;
if( mpAnnotationPool == 0 )
{
- mpAnnotationPool = EditEngine::CreatePool( sal_False );
+ mpAnnotationPool = EditEngine::CreatePool( false );
mpAnnotationPool->SetPoolDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT));
Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() );
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index c26d5aa..ae8627e 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -390,7 +390,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
pEditEngine = new EditEngine (mpEditEngineItemPool);
- pEditEngine->EnableUndo (sal_True);
+ pEditEngine->EnableUndo (true);
pEditEngine->SetDefTab (sal_uInt16(
Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX"))));
@@ -443,8 +443,8 @@ void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor)
DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
DBG_ASSERT(mpEditEngineItemPool!=NULL, "EditEngineItemPool missing");
mpEditEngine->SetBackgroundColor(aColor);
- mpEditEngine->EnableAutoColor(sal_False);
- mpEditEngine->ForceAutoColor(sal_False);
+ mpEditEngine->EnableAutoColor(false);
+ mpEditEngine->ForceAutoColor(false);
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 3e47bda..eb3dcb3 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -607,9 +607,9 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
mpOutliner->SetTextObjNoInit( pTextObj );
if( mbIsLocked )
{
- ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False );
+ ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( false );
mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled();
- ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( sal_False );
+ ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( false );
}
if ( !m_xLinguServiceManager.is() )
@@ -904,9 +904,9 @@ void SvxTextEditSourceImpl::lock()
mbIsLocked = true;
if( mpOutliner )
{
- ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False );
+ ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( false );
mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled();
- ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( sal_False );
+ ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( false );
}
}
@@ -922,7 +922,7 @@ void SvxTextEditSourceImpl::unlock()
if( mpOutliner )
{
- ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_True );
+ ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( true );
((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( mbOldUndoMode );
}
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 0a4cc5c..d94eb35 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -540,7 +540,7 @@ void SwDoc::InitDrawModel()
pSdrPool->SetPoolDefaultItem(SdrShadowXDistItem((300 * 72) / 127));
pSdrPool->SetPoolDefaultItem(SdrShadowYDistItem((300 * 72) / 127));
}
- SfxItemPool *pEEgPool = EditEngine::CreatePool( sal_False );
+ SfxItemPool *pEEgPool = EditEngine::CreatePool( false );
pSdrPool->SetSecondaryPool( pEEgPool );
if ( !GetAttrPool().GetFrozenIdRanges () )
GetAttrPool().FreezeIdRanges();
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 8857760..7aa8d57 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -433,7 +433,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
case FN_FORMAT_RESET: // delete hard text attributes
{
pOLV->RemoveAttribsKeepLanguages( true );
- pOLV->GetEditView().GetEditEngine()->RemoveFields(sal_True);
+ pOLV->GetEditView().GetEditEngine()->RemoveFields(true);
rReq.Done();
}
break;
commit 7e06ccad8f4d654585f3aa6dbdf2933370d60756
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 20 11:55:27 2014 +0200
editeng: sal_Bool->bool
Change-Id: I36cb765d87ddef1fba3447a3ea90e5285cbcd678
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index ed8c54d..f5f9efc 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -431,7 +431,7 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
pImpEditEngine->UpdateViews( pImpEditEngine->GetActiveView() );
if ( pImpEditEngine->GetUpdateMode() && pImpEditEngine->GetActiveView() )
- pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False );
+ pImpEditEngine->pActiveView->ShowCursor( false, false );
}
}
}
@@ -1448,7 +1448,7 @@ void EditEngine::SetUpdateMode( sal_Bool bUpdate )
{
pImpEditEngine->SetUpdateMode( bUpdate );
if ( pImpEditEngine->pActiveView )
- pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False );
+ pImpEditEngine->pActiveView->ShowCursor( false, false );
}
sal_Bool EditEngine::GetUpdateMode() const
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index fdedb5f..cd1badd 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -193,12 +193,12 @@ void EditView::Invalidate()
}
}
-void EditView::SetReadOnly( sal_Bool bReadOnly )
+void EditView::SetReadOnly( bool bReadOnly )
{
pImpEditView->bReadOnly = bReadOnly;
}
-sal_Bool EditView::IsReadOnly() const
+bool EditView::IsReadOnly() const
{
return pImpEditView->bReadOnly;
}
@@ -236,7 +236,7 @@ void EditView::SetSelection( const ESelection& rESel )
pImpEditView->DrawSelection();
pImpEditView->SetEditSelection( aNewSelection );
pImpEditView->DrawSelection();
- sal_Bool bGotoCursor = pImpEditView->DoAutoScroll();
+ bool bGotoCursor = pImpEditView->DoAutoScroll();
ShowCursor( bGotoCursor );
}
@@ -253,7 +253,7 @@ ESelection EditView::GetSelection() const
return aSelection;
}
-sal_Bool EditView::HasSelection() const
+bool EditView::HasSelection() const
{
return pImpEditView->HasSelection();
}
@@ -331,7 +331,7 @@ Cursor* EditView::GetCursor() const
return pImpEditView->pCursor;
}
-void EditView::InsertText( const OUString& rStr, sal_Bool bSelect )
+void EditView::InsertText( const OUString& rStr, bool bSelect )
{
EditEngine* pEE = PIMPE;
@@ -360,22 +360,22 @@ void EditView::InsertText( const OUString& rStr, sal_Bool bSelect )
pEE->FormatAndUpdate( this );
}
-sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
{
return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
}
-sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
+bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
{
return pImpEditView->MouseButtonUp( rMouseEvent );
}
-sal_Bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent )
+bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent )
{
return pImpEditView->MouseButtonDown( rMouseEvent );
}
-sal_Bool EditView::MouseMove( const MouseEvent& rMouseEvent )
+bool EditView::MouseMove( const MouseEvent& rMouseEvent )
{
return pImpEditView->MouseMove( rMouseEvent );
}
@@ -385,14 +385,14 @@ void EditView::Command( const CommandEvent& rCEvt )
pImpEditView->Command( rCEvt );
}
-void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor )
+void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
{
if ( pImpEditView->pEditEngine->HasView( this ) )
{
// The control word is more important:
if ( !pImpEditView->DoAutoScroll() )
- bGotoCursor = sal_False;
+ bGotoCursor = false;
pImpEditView->ShowCursor( bGotoCursor, bForceVisCursor );
}
}
@@ -421,7 +421,7 @@ void EditView::SetAttribs( const SfxItemSet& rSet )
PIMPE->FormatAndUpdate( this );
}
-void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
+void EditView::RemoveAttribsKeepLanguages( bool bRemoveParaAttribs )
{
pImpEditView->DrawSelection();
@@ -441,7 +441,7 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
PIMPE->FormatAndUpdate( this );
}
-void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void EditView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich )
{
pImpEditView->DrawSelection();
@@ -475,7 +475,7 @@ void EditView::Redo()
PIMPE->Redo( this );
}
-sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
{
EditSelection aOldSel( pImpEditView->GetEditSelection() );
pImpEditView->DrawSelection();
@@ -490,7 +490,7 @@ sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextForm
}
pImpEditView->SetEditSelection( aNewSel );
- sal_Bool bGotoCursor = pImpEditView->DoAutoScroll();
+ bool bGotoCursor = pImpEditView->DoAutoScroll();
ShowCursor( bGotoCursor );
return rInput.GetError();
@@ -600,7 +600,7 @@ void EditView::InsertText( const EditTextObject& rTextObject )
PIMPE->FormatAndUpdate( this );
}
-void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, sal_Bool bUseSpecial )
+void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, bool bUseSpecial )
{
PIMPE->UndoActionStart( EDITUNDO_INSERT );
pImpEditView->DeleteSelected();
@@ -613,7 +613,7 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d
PIMPE->FormatAndUpdate( this );
}
-void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
+void EditView::SetEditEngineUpdateMode( bool bUpdate )
{
PIMPEE->SetUpdateMode( bUpdate, this );
}
@@ -646,12 +646,12 @@ const SfxStyleSheet* EditView::GetStyleSheet() const
return const_cast< EditView* >( this )->GetStyleSheet();
}
-sal_Bool EditView::IsInsertMode() const
+bool EditView::IsInsertMode() const
{
return pImpEditView->IsInsertMode();
}
-void EditView::SetInsertMode( sal_Bool bInsert )
+void EditView::SetInsertMode( bool bInsert )
{
pImpEditView->SetInsertMode( bInsert );
}
@@ -692,7 +692,7 @@ void EditView::CompleteAutoCorrect( Window* pFrameWin )
}
}
-EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc )
+EESpellState EditView::StartSpeller( bool bMultipleDoc )
{
if ( !PIMPEE->GetSpeller().is() )
return EE_SPELL_NOSPELLER;
@@ -711,7 +711,7 @@ EESpellState EditView::StartThesaurus()
void EditView::StartTextConversion(
LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
- sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
+ sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
{
PIMPEE->Convert( this, nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
}
@@ -722,9 +722,9 @@ sal_Int32 EditView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
return PIMPEE->StartSearchAndReplace( this, rSearchItem );
}
-sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
+bool EditView::IsCursorAtWrongSpelledWord( bool bMarkIfWrong )
{
- sal_Bool bIsWrong = sal_False;
+ bool bIsWrong = false;
if ( !HasSelection() )
{
EditPaM aPaM = pImpEditView->GetEditSelection().Max();
@@ -733,7 +733,7 @@ sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
return bIsWrong;
}
-sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
+bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong )
{
Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) );
aPos = pImpEditView->GetDocPos( aPos );
@@ -1021,15 +1021,15 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
}
}
-sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType )
+bool EditView::SelectCurrentWord( sal_Int16 nWordType )
{
EditSelection aCurSel( pImpEditView->GetEditSelection() );
pImpEditView->DrawSelection();
aCurSel = PIMPE->SelectWord(aCurSel.Max(), nWordType);
pImpEditView->SetEditSelection( aCurSel );
pImpEditView->DrawSelection();
- ShowCursor( sal_True, sal_False );
- return aCurSel.HasRange() ? sal_True : sal_False;
+ ShowCursor( true, false );
+ return aCurSel.HasRange();
}
void EditView::InsertField( const SvxFieldItem& rFld )
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 0c93fab..7ab6412 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -324,7 +324,7 @@ sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pVie
pView->pImpEditView->DrawSelection();
pView->pImpEditView->SetEditSelection( aNewSelection );
pView->pImpEditView->DrawSelection();
- pView->ShowCursor( sal_True, sal_True );
+ pView->ShowCursor( true, true );
}
else if ( rMEvt.GetClicks() == 3 )
{
@@ -337,7 +337,7 @@ sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pVie
pView->pImpEditView->DrawSelection();
pView->pImpEditView->SetEditSelection( aNewSelection );
pView->pImpEditView->DrawSelection();
- pView->ShowCursor( sal_True, sal_True );
+ pView->ShowCursor( true, true );
}
}
return sal_True;
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 71512d2..4c3dbd8 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1490,7 +1490,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
aCurSel.Min() = aCurSel.Max();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
}
EESpellState eState = pSpellInfo->eState;
delete pSpellInfo;
@@ -1615,7 +1615,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
aCurSel.Min() = aCurSel.Max();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
}
delete pConvInfo;
pConvInfo = 0;
@@ -1817,7 +1817,7 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang,
pEditView->pImpEditView->DrawSelection();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
rConvTxt = aRes;
if ( !rConvTxt.isEmpty() )
@@ -1887,7 +1887,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
pEditView->pImpEditView->DrawSelection();
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
return xSpellAlt;
}
@@ -2490,7 +2490,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
pEditView->pImpEditView->SetEditSelection( aCurSel );
pEditView->pImpEditView->DrawSelection();
pEditView->InsertText( pDlg->GetWord() );
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
}
delete pDlg;
@@ -2555,7 +2555,7 @@ sal_Int32 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxSe
else
{
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
}
}
return nFound;
@@ -2582,14 +2582,14 @@ sal_Bool ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEdi
{
// First, set the minimum, so the whole word is in the visible range.
pEditView->pImpEditView->SetEditSelection( aFoundSel.Min() );
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
pEditView->pImpEditView->SetEditSelection( aFoundSel );
}
else
pEditView->pImpEditView->SetEditSelection( aSel.Max() );
pEditView->pImpEditView->DrawSelection();
- pEditView->ShowCursor( sal_True, sal_False );
+ pEditView->ShowCursor( true, false );
return bFound;
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 515f1fe..e124f6f 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -548,7 +548,7 @@ void TextConvWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttri
OUString aSelTxt1( m_pEditView->GetSelected() );
#endif
// replace old text and select new text
- m_pEditView->InsertText( rNewText, sal_True );
+ m_pEditView->InsertText( rNewText, true );
#ifdef DEBUG
OUString aSelTxt2( m_pEditView->GetSelected() );
#endif
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e0e39ad..076a2ae 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -211,7 +211,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
ESelection aTmpSel(nTemp,0,nTemp,0);
pEditView->SetSelection( aTmpSel );
}
- pEditView->ShowCursor( sal_True, sal_True );
+ pEditView->ShowCursor( true, true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
bKeyProcessed = sal_True;
}
@@ -229,7 +229,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
// Position the cursor
ESelection aTmpSel(nTemp,0,nTemp,0);
pEditView->SetSelection( aTmpSel );
- pEditView->ShowCursor( sal_True, sal_True );
+ pEditView->ShowCursor( true, true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
bKeyProcessed = sal_True;
}
@@ -564,7 +564,7 @@ void OutlinerView::Indent( short nDiff )
if ( bUpdate )
{
- pEditView->SetEditEngineUpdateMode( sal_True );
+ pEditView->SetEditEngineUpdateMode( true );
pEditView->ShowCursor();
}
@@ -660,11 +660,11 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
sal_uInt16 nSize = ImpInitPaste( nStart );
pEditView->InsertText( rParaObj.GetTextObject() );
ImpPasted( nStart, nParaCount, nSize);
- pEditView->SetEditEngineUpdateMode( sal_True );
+ pEditView->SetEditEngineUpdateMode( true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( sal_True, sal_True );
+ pEditView->ShowCursor( true, true );
}
@@ -698,9 +698,9 @@ void OutlinerView::PasteSpecial()
pOwner->ImplSetLevelDependendStyleSheet( nPara );
}
- pEditView->SetEditEngineUpdateMode( sal_True );
+ pEditView->SetEditEngineUpdateMode( true );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( sal_True, sal_True );
+ pEditView->ShowCursor( true, true );
}
}
@@ -1509,7 +1509,7 @@ void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUStri
// replace word ...
rEditView.InsertText( rSynonmText );
- rEditView.ShowCursor( sal_True, sal_False );
+ rEditView.ShowCursor( true, false );
}
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index 943628e..a3f69c4 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -54,7 +54,7 @@ namespace frm
{
Control::GetFocus();
m_pView->SetSelectionMode( EE_SELMODE_STD );
- m_pView->ShowCursor( sal_True );
+ m_pView->ShowCursor( true );
}
//--------------------------------------------------------------------
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 5b62c30..45a7c9d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -98,21 +98,21 @@ public:
void Invalidate();
Pair Scroll( long nHorzScroll, long nVertScroll, sal_uInt8 nRangeCheck = RGCHK_NEG );
- void ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True );
+ void ShowCursor( bool bGotoCursor = true, bool bForceVisCursor = true );
void HideCursor();
void SetSelectionMode( EESelectionMode eMode );
- void SetReadOnly( sal_Bool bReadOnly );
- sal_Bool IsReadOnly() const;
+ void SetReadOnly( bool bReadOnly );
+ bool IsReadOnly() const;
- sal_Bool HasSelection() const;
+ bool HasSelection() const;
ESelection GetSelection() const;
void SetSelection( const ESelection& rNewSel );
- sal_Bool SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ bool SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
- sal_Bool IsInsertMode() const;
- void SetInsertMode( sal_Bool bInsert );
+ bool IsInsertMode() const;
+ void SetInsertMode( bool bInsert );
void ReplaceSelected( const OUString& rStr );
OUString GetSelected();
@@ -134,13 +134,13 @@ public:
Cursor* GetCursor() const;
- void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False );
+ void InsertText( const OUString& rNew, bool bSelect = false );
- sal_Bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+ bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
- sal_Bool MouseButtonUp( const MouseEvent& rMouseEvent );
- sal_Bool MouseButtonDown( const MouseEvent& rMouseEvent );
- sal_Bool MouseMove( const MouseEvent& rMouseEvent );
+ bool MouseButtonUp( const MouseEvent& rMouseEvent );
+ bool MouseButtonDown( const MouseEvent& rMouseEvent );
+ bool MouseMove( const MouseEvent& rMouseEvent );
void Command( const CommandEvent& rCEvt );
void Cut();
@@ -159,11 +159,11 @@ public:
const SfxItemSet& GetEmptyItemSet();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list