Kaydet (Commit) ded5965c authored tarafından Noel Grandin's avatar Noel Grandin

editeng: sal_Bool->bool

Change-Id: I51b4ae54c2c440d38879439f74d4fea39d243004
üst 82ce4dd6
......@@ -500,14 +500,14 @@ void LinguMgrExitLstnr::AtExit()
LinguMgr::xIgnoreAll = 0;
LinguMgr::xChangeAll = 0;
LinguMgr::bExiting = sal_True;
LinguMgr::bExiting = true;
LinguMgr::pExitLstnr = 0;
}
LinguMgrExitLstnr * LinguMgr::pExitLstnr = 0;
sal_Bool LinguMgr::bExiting = sal_False;
bool LinguMgr::bExiting = false;
uno::Reference< XLinguServiceManager2 > LinguMgr::xLngSvcMgr = 0;
uno::Reference< XSpellChecker1 > LinguMgr::xSpell = 0;
uno::Reference< XHyphenator > LinguMgr::xHyph = 0;
......@@ -808,7 +808,7 @@ SvxAlternativeSpelling SvxGetAltSpelling(
aRes.aReplacement = OUString( aAltWord.copy( nL, nAltLen - nL - nR ) );
aRes.nChangedPos = (sal_Int16) nL;
aRes.nChangedLength = nLen - nL - nR;
aRes.bIsAltSpelling = sal_True;
aRes.bIsAltSpelling = true;
aRes.xHyphWord = rHyphWord;
}
return aRes;
......
......@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText /* = sal_False */ ) :
SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText /* = false */ ) :
rOutliner( rOutl ),
bOutlinerText( bOutlText ),
mpAttribsCache( NULL ),
......@@ -514,7 +514,7 @@ void SvxOutlinerForwarder::SetNumberingStartValue( sal_Int32 nPara, sal_Int32 n
}
}
sal_Bool SvxOutlinerForwarder::IsParaIsNumberingRestart( sal_Int32 nPara )
bool SvxOutlinerForwarder::IsParaIsNumberingRestart( sal_Int32 nPara )
{
if( 0 <= nPara && nPara < GetParagraphCount() )
{
......@@ -523,11 +523,11 @@ sal_Bool SvxOutlinerForwarder::IsParaIsNumberingRestart( sal_Int32 nPara )
else
{
OSL_FAIL( "SvxOutlinerForwarder::IsParaIsNumberingRestart)(), Invalid paragraph index");
return sal_False;
return false;
}
}
void SvxOutlinerForwarder::SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart )
void SvxOutlinerForwarder::SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart )
{
if( 0 <= nPara && nPara < GetParagraphCount() )
{
......@@ -589,12 +589,12 @@ void SvxTextForwarder::SetNumberingStartValue( sal_Int32, sal_Int32 )
{
}
sal_Bool SvxTextForwarder::IsParaIsNumberingRestart( sal_Int32 )
bool SvxTextForwarder::IsParaIsNumberingRestart( sal_Int32 )
{
return sal_False;
return false;
}
void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, sal_Bool )
void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, bool )
{
}
......
......@@ -50,7 +50,7 @@ struct SvxIDPropertyCombine
};
SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool, sal_Bool bConvertTwips )
SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool, bool bConvertTwips )
: m_aPropertyMap( pMap ),
_pMap(pMap), mbConvertTwips(bConvertTwips), mrItemPool( rItemPool )
{
......
......@@ -1240,7 +1240,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
}
else if( pMap->nWID == WID_PARAISNUMBERINGRESTART )
{
pForwarder->SetParaIsNumberingRestart( maSelection.nStartPara, sal_False );
pForwarder->SetParaIsNumberingRestart( maSelection.nStartPara, false );
}
else
{
......
......@@ -434,8 +434,8 @@ public:
virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara );
virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue );
virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara );
virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart );
virtual bool IsParaIsNumberingRestart( sal_Int32 nPara );
virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart );
};
/** Encapsulates the document view for the purpose of unified
......@@ -535,9 +535,9 @@ public:
*/
virtual bool Paste() = 0;
virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
virtual sal_Bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return sal_False; };
virtual bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; };
virtual bool IsShapeParaFocusable( ) { return true; };
virtual bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; };
};
#endif
......
......@@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
{
private:
Outliner& rOutliner;
sal_Bool bOutlinerText;
bool bOutlinerText;
/** this pointer may be null or point to an item set for the attribs of
the selection maAttribsSelection */
......@@ -50,7 +50,7 @@ private:
mutable sal_Int32 mnParaAttribsCache;
public:
SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText = sal_False );
SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText = false );
virtual ~SvxOutlinerForwarder();
virtual sal_Int32 GetParagraphCount() const;
......@@ -102,8 +102,8 @@ public:
virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara );
virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue );
virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara );
virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart );
virtual bool IsParaIsNumberingRestart( sal_Int32 nPara );
virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart );
/* this method flushes internal caches for this forwarder */
void flushCache();
......
......@@ -39,11 +39,11 @@ class EDITENG_DLLPUBLIC SvxItemPropertySet
mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
const SfxItemPropertyMapEntry* _pMap;
::std::vector< SvxIDPropertyCombine* > aCombineList;
sal_Bool mbConvertTwips;
bool mbConvertTwips;
SfxItemPool& mrItemPool;
public:
SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, sal_Bool bConvertTwips = sal_False );
SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, bool bConvertTwips = false );
~SvxItemPropertySet();
// Methods, which work directly with the ItemSet
......@@ -54,7 +54,7 @@ public:
::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const;
void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal ) const;
sal_Bool AreThereOwnUsrAnys() const { return ( aCombineList.empty() ? sal_False : sal_True ); }
bool AreThereOwnUsrAnys() const { return ! aCombineList.empty(); }
::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const;
void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID);
void ClearAllUsrAny();
......
......@@ -61,7 +61,7 @@ class EDITENG_DLLPUBLIC LinguMgr
::com::sun::star::linguistic2::XDictionary > xChangeAll;
static LinguMgrExitLstnr *pExitLstnr;
static sal_Bool bExiting;
static bool bExiting;
static ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > GetSpell();
......@@ -122,13 +122,13 @@ struct SvxAlternativeSpelling
xHyphWord;
sal_Int16 nChangedPos,
nChangedLength;
sal_Bool bIsAltSpelling;
bool bIsAltSpelling;
inline SvxAlternativeSpelling();
};
inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(sal_False)
nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(false)
{
}
......
......@@ -245,7 +245,7 @@ SvxTextForwarder* TextAPIEditSource::GetTextForwarder()
}
if( !pImpl->mpTextForwarder )
pImpl->mpTextForwarder = new SvxOutlinerForwarder( *pImpl->mpOutliner, 0 );
pImpl->mpTextForwarder = new SvxOutlinerForwarder( *pImpl->mpOutliner, false );
return pImpl->mpTextForwarder;
}
......
......@@ -36,7 +36,7 @@ namespace accessibility
mrWindow( rViewWindow ),
mpOutliner( &rOutliner ),
mpOutlinerView( &rOutlView ),
mTextForwarder( rOutliner, 0 ),
mTextForwarder( rOutliner, false ),
mViewForwarder( rOutlView )
{
// register as listener - need to broadcast state change messages
......
......@@ -129,7 +129,7 @@ SvxTextForwarder* SwTextAPIEditSource::GetTextForwarder()
}
if( !pImpl->mpTextForwarder )
pImpl->mpTextForwarder = new SvxOutlinerForwarder( *pImpl->mpOutliner, 0 );
pImpl->mpTextForwarder = new SvxOutlinerForwarder( *pImpl->mpOutliner, false );
return pImpl->mpTextForwarder;
}
......
......@@ -63,7 +63,7 @@ class SidebarTextEditSource : public SvxEditSource,
SidebarTextEditSource::SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl )
: SvxEditSource()
, mrSidebarTxtControl( rSidebarTxtControl )
, mTextForwarder( *(rSidebarTxtControl.GetTextView()->GetOutliner()), sal_False )
, mTextForwarder( *(rSidebarTxtControl.GetTextView()->GetOutliner()), false )
, mViewForwarder( *(rSidebarTxtControl.GetTextView()) )
{
if ( mrSidebarTxtControl.GetTextView() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment