[Libreoffice-commits] core.git: 7 commits - editeng/source include/editeng include/svx reportdesign/source sc/source sd/source starmath/source svx/source sw/source
Noel Grandin
noel at peralex.com
Sun Mar 2 23:00:30 PST 2014
editeng/source/editeng/eerdll.cxx | 2
editeng/source/items/textitem.cxx | 4
editeng/source/items/xmlcnitm.cxx | 4
editeng/source/misc/unolingu.cxx | 6
editeng/source/rtf/rtfitem.cxx | 4
editeng/source/uno/unoedprx.cxx | 102 +++++--------
editeng/source/uno/unofored.cxx | 30 +--
editeng/source/uno/unoforou.cxx | 46 ++---
editeng/source/uno/unoipset.cxx | 2
editeng/source/uno/unotext.cxx | 88 +++++------
editeng/source/uno/unotext2.cxx | 2
editeng/source/uno/unoviwou.cxx | 24 +--
include/editeng/unoedprx.hxx | 46 ++---
include/editeng/unoedsrc.hxx | 68 ++++----
include/editeng/unofored.hxx | 16 +-
include/editeng/unoforou.hxx | 26 +--
include/editeng/unoipset.hxx | 6
include/editeng/unolingu.hxx | 6
include/editeng/unotext.hxx | 36 ++--
include/editeng/unoviwou.hxx | 12 -
include/editeng/wrlmitem.hxx | 2
include/editeng/xmlcnitm.hxx | 4
include/svx/unoshtxt.hxx | 2
reportdesign/source/ui/misc/UITools.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 67 +++-----
sd/source/core/text/textapi.cxx | 2
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 8 -
sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2
starmath/source/accessibility.cxx | 72 ++++-----
starmath/source/accessibility.hxx | 34 ++--
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 16 +-
svx/source/unodraw/unoshtxt.cxx | 2
sw/source/core/bastyp/init.cxx | 2
sw/source/core/fields/textapi.cxx | 2
sw/source/filter/ww1/w1filter.cxx | 29 +--
sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 2
36 files changed, 377 insertions(+), 401 deletions(-)
New commits:
commit ded5965ce8098c1d46078be37264b15ca8b5a3f1
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 3 08:56:11 2014 +0200
editeng: sal_Bool->bool
Change-Id: I51b4ae54c2c440d38879439f74d4fea39d243004
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 4b49b33..5746459 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -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;
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 6f52000..e6204f4 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -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 )
{
}
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 6975695..2222d8e 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -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 )
{
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 9d3f7c0..c9a3ecc 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -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
{
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 5f4a786..d12372c 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -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
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 5b9c719..b26f2c4 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -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();
diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx
index 583abdb..01b8c0e 100644
--- a/include/editeng/unoipset.hxx
+++ b/include/editeng/unoipset.hxx
@@ -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();
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 621deb9..8ed168f 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -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)
{
}
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index b8d874d..3a35ee6 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -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;
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index f5e4942..03ad431 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -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
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index daec767..c5ded17 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -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;
}
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index a6d39d0..b833bc7 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -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() )
commit 82ce4dd60785cf08f7844d20fd8051d6b30c3bf1
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 15:42:50 2014 +0200
editeng: sal_Bool->bool
Change-Id: Icfda5e8e774b9b5a6c3d99b636e4ce772b93139d
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 04b6ffd..aa49d90e 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -302,7 +302,7 @@ sal_Bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex&
-SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( sal_False )
+SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( false )
{
}
@@ -363,7 +363,7 @@ SvxViewForwarder* SvxEditSourceAdapter::GetViewForwarder()
return NULL;
}
-SvxAccessibleTextEditViewAdapter* SvxEditSourceAdapter::GetEditViewForwarderAdapter( sal_Bool bCreate )
+SvxAccessibleTextEditViewAdapter* SvxEditSourceAdapter::GetEditViewForwarderAdapter( bool bCreate )
{
if( mbEditSourceValid && mpAdaptee.get() )
{
@@ -410,19 +410,19 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap
if( pAdaptee.get() )
{
mpAdaptee = pAdaptee;
- mbEditSourceValid = sal_True;
+ mbEditSourceValid = true;
}
else
{
// do a lazy delete (prevents us from deleting the broadcaster
// from within a broadcast in
// AccessibleTextHelper_Impl::Notify)
- mbEditSourceValid = sal_False;
+ mbEditSourceValid = false;
}
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-sal_Bool SvxEditSourceAdapter::IsValid() const
+bool SvxEditSourceAdapter::IsValid() const
{
return mbEditSourceValid;
}
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 5fe0f6f..a459c8b 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -147,14 +147,14 @@ public:
SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC
virtual SvxViewForwarder* GetViewForwarder();
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
- SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( sal_Bool bCreate = sal_False ); // covariant return types don't work on MSVC
+ SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( bool bCreate = false ); // covariant return types don't work on MSVC
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee );
SAL_WNODEPRECATED_DECLARATIONS_POP
- sal_Bool IsValid() const;
+ bool IsValid() const;
private:
// declared, but not defined
@@ -170,7 +170,7 @@ private:
mutable SfxBroadcaster maDummyBroadcaster;
- sal_Bool mbEditSourceValid;
+ bool mbEditSourceValid;
};
#endif
commit ec960fd3dea0c5b28f8dd1b3bd2b6e3afb4bc1cd
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 15:24:29 2014 +0200
editeng: sal_Bool->bool
Change-Id: I767aa3d25f6d18e8a6e23b4d3f8d038d581ac292
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index b6581bc..9d3f7c0 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -405,7 +405,7 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
sal_Int32 nLen = aConverted.getLength();
if (nLen)
- GoRight( nLen, sal_True );
+ GoRight( nLen, true );
}
}
@@ -501,7 +501,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM
}
}
-sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ )
+bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ )
{
switch( pMap->nWID )
{
@@ -511,7 +511,7 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
if(aValue >>= aDesc)
{
SvxUnoFontDescriptor::FillItemSet( aDesc, rNewSet );
- return sal_True;
+ return true;
}
}
break;
@@ -520,9 +520,9 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
{
uno::Reference< container::XIndexReplace > xRule;
if( !aValue.hasValue() || ((aValue >>= xRule) && !xRule.is()) )
- return sal_True;
+ return true;
- return sal_False;
+ return false;
}
case WID_NUMLEVEL:
@@ -537,7 +537,7 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
if(! pForwarder->SetDepth( pSelection->nStartPara, nLevel ) )
throw lang::IllegalArgumentException();
- return sal_True;
+ return true;
}
}
}
@@ -551,7 +551,7 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
if( aValue >>= nStartValue )
{
pForwarder->SetNumberingStartValue( pSelection->nStartPara, nStartValue );
- return sal_True;
+ return true;
}
}
}
@@ -565,7 +565,7 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
if( aValue >>= bParaIsNumberingRestart )
{
pForwarder->SetParaIsNumberingRestart( pSelection->nStartPara, bParaIsNumberingRestart );
- return sal_True;
+ return true;
}
}
}
@@ -577,13 +577,13 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S
{
SfxBoolItem aItem( EE_PARA_BULLETSTATE, bBullet );
rNewSet.Put(aItem);
- return sal_True;
+ return true;
}
}
break;
default:
- return sal_False;
+ return false;
}
throw lang::IllegalArgumentException();
@@ -683,7 +683,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
}
}
-sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ )
+bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ )
throw( uno::RuntimeException )
{
switch( pMap->nWID )
@@ -750,10 +750,10 @@ sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const S
break;
default:
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// is not (yet) supported
@@ -1104,9 +1104,9 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
return aRet;
}
-sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, beans::PropertyState& rState)
+bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, beans::PropertyState& rState)
{
- sal_Bool bUnknownPropertyFound = sal_False;
+ bool bUnknownPropertyFound = false;
if(pSet && pMap)
{
SfxItemState eItemState = SFX_ITEM_UNKNOWN;
@@ -1146,7 +1146,7 @@ sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, cons
}
break;
default:
- bUnknownPropertyFound = sal_True;
+ bUnknownPropertyFound = true;
break;
}
@@ -1365,7 +1365,7 @@ void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
maSelection.nStartPos = maSelection.nEndPos;
}
-sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
+bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
{
CheckSelection( maSelection, mpEditSource );
@@ -1373,7 +1373,7 @@ sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
maSelection.nStartPos == maSelection.nEndPos );
}
-sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
+bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, bool Expand) throw()
{
CheckSelection( maSelection, mpEditSource );
@@ -1381,12 +1381,12 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
sal_uInt16 nNewPos = maSelection.nEndPos;
sal_Int32 nNewPar = maSelection.nEndPara;
- sal_Bool bOk = sal_True;
+ bool bOk = true;
SvxTextForwarder* pForwarder = NULL;
while ( nCount > nNewPos && bOk )
{
if ( nNewPar == 0 )
- bOk = sal_False;
+ bOk = false;
else
{
if ( !pForwarder )
@@ -1411,7 +1411,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
return bOk;
}
-sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, sal_Bool Expand) throw()
+bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, bool Expand) throw()
{
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -1421,13 +1421,13 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, sal_Bool Expand) throw(
sal_Int32 nNewPos = maSelection.nEndPos + nCount; //! Overflow???
sal_Int32 nNewPar = maSelection.nEndPara;
- sal_Bool bOk = sal_True;
+ bool bOk = true;
sal_Int32 nParCount = pForwarder->GetParagraphCount();
sal_Int32 nThisLen = pForwarder->GetTextLen( nNewPar );
while ( nNewPos > nThisLen && bOk )
{
if ( nNewPar + 1 >= nParCount )
- bOk = sal_False;
+ bOk = false;
else
{
nNewPos -= nThisLen+1;
@@ -1447,10 +1447,10 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, sal_Bool Expand) throw(
return bOk;
}
- return sal_False;
+ return false;
}
-void SvxUnoTextRangeBase::GotoStart(sal_Bool Expand) throw()
+void SvxUnoTextRangeBase::GotoStart(bool Expand) throw()
{
maSelection.nStartPara = 0;
maSelection.nStartPos = 0;
@@ -1459,7 +1459,7 @@ void SvxUnoTextRangeBase::GotoStart(sal_Bool Expand) throw()
CollapseToStart();
}
-void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
+void SvxUnoTextRangeBase::GotoEnd(bool Expand) throw()
{
CheckSelection( maSelection, mpEditSource );
@@ -1566,7 +1566,7 @@ uno::Reference< uno::XInterface > SvxUnoTextRange_NewInstance()
#endif
}
-SvxUnoTextRange::SvxUnoTextRange( const SvxUnoTextBase& rParent, sal_Bool bPortion /* = sal_False */ ) throw()
+SvxUnoTextRange::SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion /* = false */ ) throw()
:SvxUnoTextRangeBase( rParent.GetEditSource(), bPortion ? ImplGetSvxTextPortionSvxPropertySet() : rParent.getPropertySet() ),
mbPortion( bPortion )
{
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index e21df77..5d37aee 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -450,7 +450,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
if( pRange == 0 )
{
- pRange = new SvxUnoTextRange( mrParentText, sal_True );
+ pRange = new SvxUnoTextRange( mrParentText, true );
pRange->SetSelection(aSel);
}
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 72f7523..5c1f11c 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -262,7 +262,7 @@ protected:
virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
// returns true if property found or false if unknown property
- virtual sal_Bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState);
+ virtual bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState);
virtual void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException );
@@ -283,18 +283,18 @@ public:
virtual void CollapseToStart(void) throw();
virtual void CollapseToEnd(void) throw();
- virtual sal_Bool IsCollapsed(void) throw();
- virtual sal_Bool GoLeft(sal_Int16 nCount, sal_Bool Expand) throw();
- virtual sal_Bool GoRight(sal_Int16 nCount, sal_Bool Expand) throw();
- virtual void GotoStart(sal_Bool Expand) throw();
- virtual void GotoEnd(sal_Bool Expand) throw();
+ virtual bool IsCollapsed(void) throw();
+ virtual bool GoLeft(sal_Int16 nCount, bool Expand) throw();
+ virtual bool GoRight(sal_Int16 nCount, bool Expand) throw();
+ virtual void GotoStart(bool Expand) throw();
+ virtual void GotoEnd(bool Expand) throw();
//const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); }
const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; }
SvxEditSource* GetEditSource() const throw() { return mpEditSource; }
- static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL );
- static sal_Bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
+ static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL );
+ static bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
void attachField( const SvxFieldData* pData ) throw();
@@ -356,10 +356,10 @@ class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
friend class SvxUnoTextRangeEnumeration;
private:
::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText;
- sal_Bool mbPortion;
+ bool mbPortion;
public:
- SvxUnoTextRange( const SvxUnoTextBase& rParent, sal_Bool bPortion = sal_False ) throw();
+ SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion = false ) throw();
virtual ~SvxUnoTextRange() throw();
// ::com::sun::star::uno::XInterface
commit 0f60ab5ebf5ab7a7e4bd92cd8a34e86f27474131
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 14:27:20 2014 +0200
editeng: sal_Bool->bool
Change-Id: I4fc276e320294d57eb667b6db8e5eff078bc28b3
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index dcc3500..04b6ffd 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -1202,14 +1202,14 @@ Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const
return mpViewForwarder->PixelToLogic(rPoint, rMapMode);
}
-sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const
+bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
ESelection aSelection;
if( !mpViewForwarder->GetSelection( aSelection ) )
- return sal_False;
+ return false;
SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex;
@@ -1224,10 +1224,10 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons
rSel = ESelection( aStartIndex.GetParagraph(), aStartIndex.GetIndex(),
aEndIndex.GetParagraph(), aEndIndex.GetIndex() );
- return sal_True;
+ return true;
}
-sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel )
+bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel )
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
@@ -1240,21 +1240,21 @@ sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel
return mpViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) );
}
-sal_Bool SvxAccessibleTextEditViewAdapter::Copy()
+bool SvxAccessibleTextEditViewAdapter::Copy()
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
return mpViewForwarder->Copy();
}
-sal_Bool SvxAccessibleTextEditViewAdapter::Cut()
+bool SvxAccessibleTextEditViewAdapter::Cut()
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
return mpViewForwarder->Cut();
}
-sal_Bool SvxAccessibleTextEditViewAdapter::Paste()
+bool SvxAccessibleTextEditViewAdapter::Paste()
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index a3554e5..1060029 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -124,34 +124,34 @@ Point SvxDrawOutlinerViewForwarder::PixelToLogic( const Point& rPoint, const Map
return Point();
}
-sal_Bool SvxDrawOutlinerViewForwarder::GetSelection( ESelection& rSelection ) const
+bool SvxDrawOutlinerViewForwarder::GetSelection( ESelection& rSelection ) const
{
rSelection = mrOutlinerView.GetSelection();
- return sal_True;
+ return true;
}
-sal_Bool SvxDrawOutlinerViewForwarder::SetSelection( const ESelection& rSelection )
+bool SvxDrawOutlinerViewForwarder::SetSelection( const ESelection& rSelection )
{
mrOutlinerView.SetSelection( rSelection );
- return sal_True;
+ return true;
}
-sal_Bool SvxDrawOutlinerViewForwarder::Copy()
+bool SvxDrawOutlinerViewForwarder::Copy()
{
mrOutlinerView.Copy();
- return sal_True;
+ return true;
}
-sal_Bool SvxDrawOutlinerViewForwarder::Cut()
+bool SvxDrawOutlinerViewForwarder::Cut()
{
mrOutlinerView.Cut();
- return sal_True;
+ return true;
}
-sal_Bool SvxDrawOutlinerViewForwarder::Paste()
+bool SvxDrawOutlinerViewForwarder::Paste()
{
mrOutlinerView.Paste();
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index e716dc9..5fe0f6f 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -123,11 +123,11 @@ public:
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
// SvxEditViewForwarder interface
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual bool GetSelection( ESelection& rSelection ) const;
+ virtual bool SetSelection( const ESelection& rSelection );
+ virtual bool Copy();
+ virtual bool Cut();
+ virtual bool Paste();
void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& );
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 8f11716..5f4a786 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -503,37 +503,37 @@ public:
@param rSelection
Contains the current selection after method call
- @return sal_False, if there is no view or no selection (the empty selection _is_ a selection)
+ @return false, if there is no view or no selection (the empty selection _is_ a selection)
*/
- virtual sal_Bool GetSelection( ESelection& rSelection ) const = 0;
+ virtual bool GetSelection( ESelection& rSelection ) const = 0;
/** Set selection in view.
@param rSelection
The selection to set
- @return sal_False, if there is no view or selection is invalid
+ @return false, if there is no view or selection is invalid
*/
- virtual sal_Bool SetSelection( const ESelection& rSelection ) = 0;
+ virtual bool SetSelection( const ESelection& rSelection ) = 0;
/** Copy current selection to clipboard.
- @return sal_False if no selection or no view (the empty selection _is_ a selection)
+ @return false if no selection or no view (the empty selection _is_ a selection)
*/
- virtual sal_Bool Copy() = 0;
+ virtual bool Copy() = 0;
/** Cut current selection to clipboard.
- @eturn sal_False if no selection or no view (the empty selection _is_ a selection)
+ @eturn balse if no selection or no view (the empty selection _is_ a selection)
*/
- virtual sal_Bool Cut() = 0;
+ virtual bool Cut() = 0;
/** Paste clipboard into current selection.
- @return sal_False if no view or no selection (the empty selection _is_ a selection)
+ @return false if no view or no selection (the empty selection _is_ a selection)
*/
- virtual sal_Bool Paste() = 0;
+ virtual bool Paste() = 0;
virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx
index 3c6ebe9..50f4c68 100644
--- a/include/editeng/unoviwou.hxx
+++ b/include/editeng/unoviwou.hxx
@@ -45,11 +45,11 @@ public:
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual bool GetSelection( ESelection& rSelection ) const;
+ virtual bool SetSelection( const ESelection& rSelection );
+ virtual bool Copy();
+ virtual bool Cut();
+ virtual bool Paste();
};
#endif
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index a3da6e3..87e533c 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -560,11 +560,11 @@ public:
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual bool GetSelection( ESelection& rSelection ) const;
+ virtual bool SetSelection( const ESelection& rSelection );
+ virtual bool Copy();
+ virtual bool Cut();
+ virtual bool Paste();
void GrabFocus();
@@ -625,13 +625,13 @@ Point ScEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa
return Point();
}
-sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const
+bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const
{
- sal_Bool bResult(false);
+ bool bResult(false);
if (IsValid())
{
rSelection = mpEditView->GetSelection();
- bResult = sal_True;
+ bResult = true;
}
else
{
@@ -640,13 +640,13 @@ sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const
return bResult;
}
-sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection )
+bool ScEditViewForwarder::SetSelection( const ESelection& rSelection )
{
- sal_Bool bResult(false);
+ bool bResult(false);
if (IsValid())
{
mpEditView->SetSelection(rSelection);
- bResult = sal_True;
+ bResult = true;
}
else
{
@@ -655,13 +655,13 @@ sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection )
return bResult;
}
-sal_Bool ScEditViewForwarder::Copy()
+bool ScEditViewForwarder::Copy()
{
- sal_Bool bResult(false);
+ bool bResult(false);
if (IsValid())
{
mpEditView->Copy();
- bResult = sal_True;
+ bResult = true;
}
else
{
@@ -670,13 +670,13 @@ sal_Bool ScEditViewForwarder::Copy()
return bResult;
}
-sal_Bool ScEditViewForwarder::Cut()
+bool ScEditViewForwarder::Cut()
{
- sal_Bool bResult(false);
+ bool bResult(false);
if (IsValid())
{
mpEditView->Cut();
- bResult = sal_True;
+ bResult = true;
}
else
{
@@ -685,13 +685,13 @@ sal_Bool ScEditViewForwarder::Cut()
return bResult;
}
-sal_Bool ScEditViewForwarder::Paste()
+bool ScEditViewForwarder::Paste()
{
- sal_Bool bResult(false);
+ bool bResult(false);
if (IsValid())
{
mpEditView->Paste();
- bResult = sal_True;
+ bResult = true;
}
else
{
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 58b67ea..284dd2d 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1561,62 +1561,62 @@ Point SmEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa
return Point();
}
-sal_Bool SmEditViewForwarder::GetSelection( ESelection& rSelection ) const
+bool SmEditViewForwarder::GetSelection( ESelection& rSelection ) const
{
- sal_Bool bRes = sal_False;
+ bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView();
if (pEditView)
{
rSelection = pEditView->GetSelection();
- bRes = sal_True;
+ bRes = true;
}
return bRes;
}
-sal_Bool SmEditViewForwarder::SetSelection( const ESelection& rSelection )
+bool SmEditViewForwarder::SetSelection( const ESelection& rSelection )
{
- sal_Bool bRes = sal_False;
+ bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView();
if (pEditView)
{
pEditView->SetSelection( rSelection );
- bRes = sal_True;
+ bRes = true;
}
return bRes;
}
-sal_Bool SmEditViewForwarder::Copy()
+bool SmEditViewForwarder::Copy()
{
- sal_Bool bRes = sal_False;
+ bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView();
if (pEditView)
{
pEditView->Copy();
- bRes = sal_True;
+ bRes = true;
}
return bRes;
}
-sal_Bool SmEditViewForwarder::Cut()
+bool SmEditViewForwarder::Cut()
{
- sal_Bool bRes = sal_False;
+ bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView();
if (pEditView)
{
pEditView->Cut();
- bRes = sal_True;
+ bRes = true;
}
return bRes;
}
-sal_Bool SmEditViewForwarder::Paste()
+bool SmEditViewForwarder::Paste()
{
- sal_Bool bRes = sal_False;
+ bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView();
if (pEditView)
{
pEditView->Paste();
- bRes = sal_True;
+ bRes = true;
}
return bRes;
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index dc3025e..ec04727 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -274,11 +274,11 @@ public:
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual bool GetSelection( ESelection& rSelection ) const;
+ virtual bool SetSelection( const ESelection& rSelection );
+ virtual bool Copy();
+ virtual bool Cut();
+ virtual bool Paste();
};
commit 074a2af8bc26d5d1ba3ef01016df7d6d122cfb9f
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 13:47:35 2014 +0200
editeng: sal_Bool->bool
Change-Id: I26b1fe14023737b85bcf23628e4881c8be79f071
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 8a8144c..2045105 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -136,7 +136,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[28] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
ppDefItems[29] = new SvxAutoKernItem( false, EE_CHAR_PAIRKERNING );
ppDefItems[30] = new SvxKerningItem( 0, EE_CHAR_KERNING );
- ppDefItems[31] = new SvxWordLineModeItem( sal_False, EE_CHAR_WLM );
+ ppDefItems[31] = new SvxWordLineModeItem( false, EE_CHAR_WLM );
ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE );
ppDefItems[33] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CJK );
ppDefItems[34] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ad3b0df..7e8b813 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -123,7 +123,7 @@ TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NO
TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0));
TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0));
TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0));
-TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(false, 0));
TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0));
TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0));
@@ -1748,7 +1748,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
// class SvxWordLineModeItem ---------------------------------------------
-SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
+SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode,
const sal_uInt16 nId ) :
SfxBoolItem( nId, bWordLineMode )
{
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 632e7c2..5baa24e 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -788,7 +788,7 @@ SET_FONTALIGNMENT:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( true, PLAINID->nWordlineMode ));
}
goto ATTR_SETUNDERLINE;
@@ -883,7 +883,7 @@ ATTR_SETUNDERLINE:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( true, PLAINID->nWordlineMode ));
}
goto ATTR_SETOVERLINE;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index b37169a..d64f2d6 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
public:
TYPEINFO();
- SvxWordLineModeItem( const sal_Bool bWordLineMode /*= sal_False*/,
+ SvxWordLineModeItem( const bool bWordLineMode /*= false*/,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index bbf4463..1bc759d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -660,7 +660,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxWeightItem(WEIGHT_NORMAL,ITEMID_WEIGHT),
new SvxShadowedItem(false,ITEMID_SHADOWED),
- new SvxWordLineModeItem(sal_False,ITEMID_WORDLINEMODE),
+ new SvxWordLineModeItem(false,ITEMID_WORDLINEMODE),
new SvxContourItem(false,ITEMID_CONTOUR),
new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT),
new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE),
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index d0301f2..6d3cd5a 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -469,7 +469,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_UNDERLINE- POOLATTR_BEGIN ] = new SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE );
aAttrTab[ RES_CHRATR_WEIGHT- POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT );
aAttrTab[ RES_CHRATR_RSID - POOLATTR_BEGIN ] = new SvxRsidItem( 0, RES_CHRATR_RSID );
- aAttrTab[ RES_CHRATR_WORDLINEMODE- POOLATTR_BEGIN ] = new SvxWordLineModeItem( sal_False, RES_CHRATR_WORDLINEMODE );
+ aAttrTab[ RES_CHRATR_WORDLINEMODE- POOLATTR_BEGIN ] = new SvxWordLineModeItem( false, RES_CHRATR_WORDLINEMODE );
aAttrTab[ RES_CHRATR_AUTOKERN- POOLATTR_BEGIN ] = new SvxAutoKernItem( false, RES_CHRATR_AUTOKERN );
aAttrTab[ RES_CHRATR_BLINK - POOLATTR_BEGIN ] = new SvxBlinkItem( false, RES_CHRATR_BLINK );
aAttrTab[ RES_CHRATR_NOHYPHEN - POOLATTR_BEGIN ] = new SvxNoHyphenItem( true, RES_CHRATR_NOHYPHEN );
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 537293c..3659f88 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1107,24 +1107,19 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
rOut << SvxFontHeightItem(hpsGet() * 10, 100, RES_CHRATR_FONTSIZE);
if (fsKulGet())
switch (kulGet()) {
- case 0: {
- rOut << SvxUnderlineItem(UNDERLINE_NONE, RES_CHRATR_UNDERLINE) <<
- SvxWordLineModeItem(sal_False, RES_CHRATR_WORDLINEMODE);
- } break;
+ case 0: rOut << SvxUnderlineItem(UNDERLINE_NONE, RES_CHRATR_UNDERLINE)
+ << SvxWordLineModeItem(false, RES_CHRATR_WORDLINEMODE);
+ break;
+ case 1: rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE);
+ break;
+ case 2: rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE)
+ << SvxWordLineModeItem(true, RES_CHRATR_WORDLINEMODE);
+ break;
+ case 3: rOut << SvxUnderlineItem(UNDERLINE_DOUBLE, RES_CHRATR_UNDERLINE);
+ break;
+ case 4: rOut << SvxUnderlineItem(UNDERLINE_DOTTED, RES_CHRATR_UNDERLINE);
+ break;
default: OSL_ENSURE(false, "Chpx");
- case 1: {
- rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE);
- } break;
- case 2: {
- rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE) <<
- SvxWordLineModeItem(sal_True, RES_CHRATR_WORDLINEMODE);
- } break;
- case 3: {
- rOut << SvxUnderlineItem(UNDERLINE_DOUBLE, RES_CHRATR_UNDERLINE);
- } break;
- case 4: {
- rOut << SvxUnderlineItem(UNDERLINE_DOTTED, RES_CHRATR_UNDERLINE);
- } break;
}
if (fsIcoGet())
commit 241f1a1ab47f56305725b2f33c23bac3ea919d79
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 12:58:20 2014 +0200
editeng: sal_Bool->bool
Change-Id: I0aa375d35c796cfa1929f9c0e735eaaa05561ee4
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 01806ce..ef299ec 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -170,13 +170,13 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
}
-sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rLName,
+bool SvXMLAttrContainerItem::AddAttr( const OUString& rLName,
const OUString& rValue )
{
return pImpl->AddAttr( rLName, rValue );
}
-sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix,
+bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix,
const OUString& rNamespace, const OUString& rLName,
const OUString& rValue )
{
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index bd2f0e3..029bc5e 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -59,9 +59,9 @@ public:
virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
{ return new SvXMLAttrContainerItem( *this ); }
- sal_Bool AddAttr( const OUString& rLName,
+ bool AddAttr( const OUString& rLName,
const OUString& rValue );
- sal_Bool AddAttr( const OUString& rPrefix,
+ bool AddAttr( const OUString& rPrefix,
const OUString& rNamespace,
const OUString& rLName,
const OUString& rValue );
commit 0786a72308f7c3a47e052b00616f28ab03bc6b32
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 28 09:47:38 2014 +0200
editeng: sal_Bool->bool
this had to be done in conjunction with changing
include/svx/unoshtxt.hxx
because there are two virtual methods "bool IsValid" in two different
base classes and some subclasses are overriding both base-class
methods at once.
Change-Id: Ib43fc5000b443057caaa513b4efeaa6fd16e4260
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 8643b7f..dcc3500 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -552,7 +552,7 @@ void SvxAccessibleTextAdapter::SetParaAttribs( sal_Int32 nPara, const SfxItemSet
mpTextForwarder->SetParaAttribs( nPara, rSet );
}
-void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 )
+void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , bool , sal_uInt16 )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
}
@@ -672,14 +672,14 @@ sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_Int32 nPara, sal_I
-sal_Bool SvxAccessibleTextAdapter::IsValid() const
+bool SvxAccessibleTextAdapter::IsValid() const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
if( mpTextForwarder )
return mpTextForwarder->IsValid();
else
- return sal_False;
+ return false;
}
LanguageType SvxAccessibleTextAdapter::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const
@@ -714,12 +714,12 @@ EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_Int32 nPara ) const
return mpTextForwarder->GetBulletInfo( nPara );
}
-void SvxAccessibleTextAdapter::SetUpdateModeForAcc(sal_Bool bUp)
+void SvxAccessibleTextAdapter::SetUpdateModeForAcc(bool bUp)
{
return mpTextForwarder->SetUpdateModeForAcc(bUp);
}
-sal_Bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
+bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
{
return mpTextForwarder->GetUpdateModeForAcc();
}
@@ -817,12 +817,12 @@ OutputDevice* SvxAccessibleTextAdapter::GetRefDevice() const
return mpTextForwarder->GetRefDevice();
}
-sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& nPara, sal_Int32& nIndex ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
if( !mpTextForwarder->GetIndexAtPoint( rPoint, nPara, nIndex ) )
- return sal_False;
+ return false;
SvxAccessibleTextIndex aIndex;
aIndex.SetEEIndex(nPara, nIndex, *this);
@@ -846,7 +846,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
if( !pOutDev )
- return sal_False;
+ return false;
AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText );
@@ -858,7 +858,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
"SvxAccessibleTextIndex::SetIndex: index value overflow");
nIndex = aStringWrap.GetIndexAtPoint( aPoint );
- return sal_True;
+ return true;
}
}
@@ -869,7 +869,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
if( !pOutDev )
- return sal_False;
+ return false;
ESelection aSelection = MakeEESelection( aIndex );
SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mpTextForwarder->GetAttribs( aSelection ) );
@@ -886,13 +886,13 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
"SvxAccessibleTextIndex::SetIndex: index value overflow");
nIndex = (aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
- return sal_True;
+ return true;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -910,7 +910,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
nStart = 0;
nEnd = aIndex.GetBulletLen();
- return sal_True;
+ return true;
}
if( aIndex.InField() )
@@ -926,11 +926,11 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
nStart = aIndex.GetIndex() - aIndex.GetFieldOffset();
nEnd = nStart + aIndex.GetFieldLen();
- return sal_True;
+ return true;
}
if( !mpTextForwarder->GetWordIndices( nPara, nIndex, nStart, nEnd ) )
- return sal_False;
+ return false;
aIndex.SetEEIndex( nPara, nStart, *this );
DBG_ASSERT(aIndex.GetIndex() >= 0 &&
@@ -944,7 +944,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
"SvxAccessibleTextIndex::SetIndex: index value overflow");
nEnd = aIndex.GetIndex();
- return sal_True;
+ return true;
}
bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool /* bInCell */ ) const
@@ -1042,7 +1042,7 @@ sal_Int32 SvxAccessibleTextAdapter::GetLineNumberAtIndex( sal_Int32 nPara, sal_I
return mpTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
}
-sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
+bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -1055,7 +1055,7 @@ sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
return mpTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) );
}
-sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
+bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -1068,7 +1068,7 @@ sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESele
return mpTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
}
-sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( sal_Bool bFull )
+bool SvxAccessibleTextAdapter::QuickFormatDoc( bool bFull )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -1082,7 +1082,7 @@ sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_Int32 nPara ) const
return mpTextForwarder->GetDepth( nPara );
}
-sal_Bool SvxAccessibleTextAdapter::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
+bool SvxAccessibleTextAdapter::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -1094,43 +1094,29 @@ void SvxAccessibleTextAdapter::SetForwarder( SvxTextForwarder& rForwarder )
mpTextForwarder = &rForwarder;
}
-sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
+bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
- if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
- aBulletInfo.bVisible &&
- aBulletInfo.nType == SVX_NUM_BITMAP )
- {
- return sal_True;
- }
- else
- {
- return sal_False;
- }
+ return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
+ aBulletInfo.bVisible &&
+ aBulletInfo.nType == SVX_NUM_BITMAP );
}
-sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
+bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
- if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
- aBulletInfo.bVisible &&
- aBulletInfo.nType != SVX_NUM_BITMAP )
- {
- return sal_True;
- }
- else
- {
- return sal_False;
- }
+ return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
+ aBulletInfo.bVisible &&
+ aBulletInfo.nType != SVX_NUM_BITMAP );
}
-sal_Bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
+bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -1185,14 +1171,14 @@ SvxAccessibleTextEditViewAdapter::~SvxAccessibleTextEditViewAdapter()
{
}
-sal_Bool SvxAccessibleTextEditViewAdapter::IsValid() const
+bool SvxAccessibleTextEditViewAdapter::IsValid() const
{
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
if( mpViewForwarder )
return mpViewForwarder->IsValid();
else
- return sal_False;
+ return false;
}
Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 9b1b70e..88fce45 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -112,7 +112,7 @@ void SvxEditEngineForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet&
rEditEngine.SetParaAttribs( nPara, rSet );
}
-void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
{
rEditEngine.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
}
@@ -147,7 +147,7 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel
rEditEngine.QuickSetAttribs( rSet, rSel );
}
-sal_Bool SvxEditEngineForwarder::IsValid() const
+bool SvxEditEngineForwarder::IsValid() const
{
// cannot reliably query EditEngine state
// while in the middle of an update
@@ -374,7 +374,7 @@ OutputDevice* SvxEditEngineForwarder::GetRefDevice() const
return rEditEngine.GetRefDevice();
}
-sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
{
Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
::std::swap( aSize.Width(), aSize.Height() );
@@ -387,10 +387,10 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32&
nPara = aDocPos.nPara;
nIndex = aDocPos.nIndex;
- return sal_True;
+ return true;
}
-sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
{
ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
@@ -400,10 +400,10 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nInd
nStart = aRes.nStartPos;
nEnd = aRes.nEndPos;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SvxEditEngineForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
@@ -432,27 +432,27 @@ sal_Int32 SvxEditEngineForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int
}
-sal_Bool SvxEditEngineForwarder::QuickFormatDoc( sal_Bool )
+bool SvxEditEngineForwarder::QuickFormatDoc( bool )
{
rEditEngine.QuickFormatDoc();
- return sal_True;
+ return true;
}
-sal_Bool SvxEditEngineForwarder::Delete( const ESelection& rSelection )
+bool SvxEditEngineForwarder::Delete( const ESelection& rSelection )
{
rEditEngine.QuickDelete( rSelection );
rEditEngine.QuickFormatDoc();
- return sal_True;
+ return true;
}
-sal_Bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
+bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
{
rEditEngine.QuickInsertText( rStr, rSelection );
rEditEngine.QuickFormatDoc();
- return sal_True;
+ return true;
}
sal_Int16 SvxEditEngineForwarder::GetDepth( sal_Int32 ) const
@@ -461,10 +461,10 @@ sal_Int16 SvxEditEngineForwarder::GetDepth( sal_Int32 ) const
return -1;
}
-sal_Bool SvxEditEngineForwarder::SetDepth( sal_Int32, sal_Int16 nNewDepth )
+bool SvxEditEngineForwarder::SetDepth( sal_Int32, sal_Int16 nNewDepth )
{
// EditEngine does not support outline depth
- return nNewDepth == -1 ? sal_True : sal_False;
+ return nNewDepth == -1;
}
const SfxItemSet * SvxEditEngineForwarder::GetEmptyItemSetPtr()
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 4163643..6f52000 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -180,7 +180,7 @@ void SvxOutlinerForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rS
((SfxItemSet*)&rSet)->SetParent( pOldParent );
}
-void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
{
rOutliner.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
}
@@ -236,7 +236,7 @@ void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, sal_Int32 n
rOutliner.FieldClicked( rField, nPara, nPos );
}
-sal_Bool SvxOutlinerForwarder::IsValid() const
+bool SvxOutlinerForwarder::IsValid() const
{
// cannot reliably query outliner state
// while in the middle of an update
@@ -371,7 +371,7 @@ OutputDevice* SvxOutlinerForwarder::GetRefDevice() const
return rOutliner.GetRefDevice();
}
-sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
{
Size aSize( rOutliner.CalcTextSize() );
::std::swap( aSize.Width(), aSize.Height() );
@@ -384,10 +384,10 @@ sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nP
nPara = aDocPos.nPara;
nIndex = aDocPos.nIndex;
- return sal_True;
+ return true;
}
-sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
{
ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
@@ -397,10 +397,10 @@ sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex
nStart = aRes.nStartPos;
nEnd = aRes.nEndPos;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
bool SvxOutlinerForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
@@ -428,29 +428,29 @@ sal_Int32 SvxOutlinerForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32
return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex );
}
-sal_Bool SvxOutlinerForwarder::QuickFormatDoc( sal_Bool )
+bool SvxOutlinerForwarder::QuickFormatDoc( bool )
{
rOutliner.QuickFormatDoc();
- return sal_True;
+ return true;
}
-sal_Bool SvxOutlinerForwarder::Delete( const ESelection& rSelection )
+bool SvxOutlinerForwarder::Delete( const ESelection& rSelection )
{
flushCache();
rOutliner.QuickDelete( rSelection );
rOutliner.QuickFormatDoc();
- return sal_True;
+ return true;
}
-sal_Bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
+bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
{
flushCache();
rOutliner.QuickInsertText( rStr, rSelection );
rOutliner.QuickFormatDoc();
- return sal_True;
+ return true;
}
sal_Int16 SvxOutlinerForwarder::GetDepth( sal_Int32 nPara ) const
@@ -467,7 +467,7 @@ sal_Int16 SvxOutlinerForwarder::GetDepth( sal_Int32 nPara ) const
return nLevel;
}
-sal_Bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
+bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
{
DBG_ASSERT( 0 <= nPara && nPara < GetParagraphCount(), "SvxOutlinerForwarder::SetDepth: Invalid paragraph index");
@@ -482,11 +482,11 @@ sal_Bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
if( bOutlinerText )
rOutliner.SetLevelDependendStyleSheet( nPara );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
sal_Int32 SvxOutlinerForwarder::GetNumberingStartValue( sal_Int32 nPara )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 39505da..b6581bc 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2216,7 +2216,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
// set properties for the new text portion
ESelection aSel( nPara, nStart, nPara, nEnd );
- pTextForwarder->RemoveAttribs( aSel, sal_False, 0 );
+ pTextForwarder->RemoveAttribs( aSel, false, 0 );
pEditSource->UpdateData();
SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
@@ -2465,7 +2465,7 @@ void SvxDummyTextSource::SetParaAttribs( sal_Int32, const SfxItemSet& )
{
}
-void SvxDummyTextSource::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 )
+void SvxDummyTextSource::RemoveAttribs( const ESelection& , bool , sal_uInt16 )
{
}
@@ -2513,9 +2513,9 @@ void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32
{
}
-sal_Bool SvxDummyTextSource::IsValid() const
+bool SvxDummyTextSource::IsValid() const
{
- return sal_False;
+ return false;
}
void SvxDummyTextSource::SetNotifyHdl( const Link& )
@@ -2562,14 +2562,14 @@ OutputDevice* SvxDummyTextSource::GetRefDevice() const
return NULL;
}
-sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const
+bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const
{
- return sal_False;
+ return false;
}
-sal_Bool SvxDummyTextSource::GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const
+bool SvxDummyTextSource::GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const
{
- return sal_False;
+ return false;
}
bool SvxDummyTextSource::GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const
@@ -2597,9 +2597,9 @@ sal_Int32 SvxDummyTextSource::GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int
return 0;
}
-sal_Bool SvxDummyTextSource::QuickFormatDoc( sal_Bool )
+bool SvxDummyTextSource::QuickFormatDoc( bool )
{
- return sal_False;
+ return false;
}
sal_Int16 SvxDummyTextSource::GetDepth( sal_Int32 ) const
@@ -2607,19 +2607,19 @@ sal_Int16 SvxDummyTextSource::GetDepth( sal_Int32 ) const
return -1;
}
-sal_Bool SvxDummyTextSource::SetDepth( sal_Int32, sal_Int16 nNewDepth )
+bool SvxDummyTextSource::SetDepth( sal_Int32, sal_Int16 nNewDepth )
{
- return nNewDepth == 0 ? sal_True : sal_False;
+ return nNewDepth == 0;
}
-sal_Bool SvxDummyTextSource::Delete( const ESelection& )
+bool SvxDummyTextSource::Delete( const ESelection& )
{
- return sal_False;
+ return false;
}
-sal_Bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
+bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
{
- return sal_False;
+ return false;
}
const SfxItemSet * SvxDummyTextSource::GetEmptyItemSetPtr()
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 6753fbb..a3554e5 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -46,9 +46,9 @@ Point SvxDrawOutlinerViewForwarder::GetTextOffset() const
return aOutputRect.TopLeft() - maTextShapeTopLeft;
}
-sal_Bool SvxDrawOutlinerViewForwarder::IsValid() const
+bool SvxDrawOutlinerViewForwarder::IsValid() const
{
- return sal_True;
+ return true;
}
Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 95624bd..e716dc9 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -39,7 +39,7 @@ public:
virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
- virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+ virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const;
virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex );
@@ -57,7 +57,7 @@ public:
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const;
virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const;
@@ -67,21 +67,21 @@ public:
virtual Rectangle GetParaBounds( sal_Int32 nPara ) const;
virtual MapMode GetMapMode() const;
virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
- virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
+ virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
+ virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
- virtual void SetUpdateModeForAcc( sal_Bool bUp);
- virtual sal_Bool GetUpdateModeForAcc() const;
+ virtual void SetUpdateModeForAcc( bool bUp);
+ virtual bool GetUpdateModeForAcc() const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
- virtual sal_Bool Delete( const ESelection& );
- virtual sal_Bool InsertText( const OUString&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
+ virtual bool Delete( const ESelection& );
+ virtual bool InsertText( const OUString&, const ESelection& );
+ virtual bool QuickFormatDoc( bool bFull = false );
virtual sal_Int16 GetDepth( sal_Int32 nPara ) const;
- virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
+ virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
virtual const SfxItemSet* GetEmptyItemSetPtr();
@@ -93,9 +93,9 @@ public:
//XTextCopy
virtual void CopyText(const SvxTextForwarder& rSource);
- void SetForwarder( SvxTextForwarder& );
- sal_Bool HaveImageBullet( sal_Int32 nPara ) const;
- sal_Bool HaveTextBullet( sal_Int32 nPara ) const;
+ void SetForwarder( SvxTextForwarder& );
+ bool HaveImageBullet( sal_Int32 nPara ) const;
+ bool HaveTextBullet( sal_Int32 nPara ) const;
/** Query whether all text in given selection is editable
@@ -103,7 +103,7 @@ public:
be changed, and sal_False if e.g. a field or a bullet is
contained therein.
*/
- sal_Bool IsEditable( const ESelection& rSelection );
+ bool IsEditable( const ESelection& rSelection );
private:
SvxTextForwarder* mpTextForwarder;
@@ -117,7 +117,7 @@ public:
virtual ~SvxAccessibleTextEditViewAdapter();
// SvxViewForwarder interface
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index e8bccfc..8f11716 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -144,7 +144,7 @@ public:
virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0;
- virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
+ virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const = 0;
virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0;
@@ -164,16 +164,16 @@ public:
// implementation functions for XParagraphAppend and XTextPortionAppend
virtual void AppendParagraph() = 0;
- virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0;
+ virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0;
// XTextCopy
virtual void CopyText(const SvxTextForwarder& rSource) = 0;
/** Query state of forwarder
- @return sal_False, if no longer valid
+ @return false, if no longer valid
*/
- virtual sal_Bool IsValid() const = 0;
+ virtual bool IsValid() const = 0;
/** Query language of character at given position on the underlying edit engine
@@ -210,8 +210,8 @@ public:
virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0;
virtual OUString GetNumStr(sal_uInt16) const { return OUString(); }
- virtual void SetUpdateModeForAcc(sal_Bool) {}
- virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; }
+ virtual void SetUpdateModeForAcc(bool) {}
+ virtual bool GetUpdateModeForAcc() const { return true; }
/** Query the bounding rectangle of the given character
@@ -279,10 +279,10 @@ public:
@param rIndex[0 .. m-1]
Index of character the point is over
- @return sal_True, if the point is over any text and both rPara and rIndex are valid
+ @return true, if the point is over any text and both rPara and rIndex are valid
*/
- virtual sal_Bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_Int32& rIndex ) const = 0;
+ virtual bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_Int32& rIndex ) const = 0;
/** Get the start and the end index of the word at the given index
@@ -305,9 +305,9 @@ public:
End index (in the same paragraph), this point to the last
character still contained in the query
- @return sal_True, if the result is non-empty
+ @return true, if the result is non-empty
*/
- virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& rStart, sal_Int32& rEnd ) const = 0;
+ virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& rStart, sal_Int32& rEnd ) const = 0;
/** Query range of similar attributes
@@ -382,9 +382,9 @@ public:
@param rSelection
The text range to be deleted
- @return sal_True if text has been successfully deleted
+ @return true if text has been successfully deleted
*/
- virtual sal_Bool Delete( const ESelection& rSelection ) = 0;
+ virtual bool Delete( const ESelection& rSelection ) = 0;
/** Insert/Replace given text in given range and reformat text
@@ -394,17 +394,17 @@ public:
@param rSel
Selection where text should be replaced. The empty selection inserts
- @return sal_True if text has been successfully inserted
+ @return true if text has been successfully inserted
*/
- virtual sal_Bool InsertText( const OUString& rText, const ESelection& rSel ) = 0;
+ virtual bool InsertText( const OUString& rText, const ESelection& rSel ) = 0;
/** Updates the formatting
@see EditEngine::QuickFormatDoc() for details
- @return sal_True if text have been successfully reformatted
+ @return true if text have been successfully reformatted
*/
- virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ) = 0;
+ virtual bool QuickFormatDoc( bool bFull = false ) = 0;
/** Get the outline depth of given paragraph
@@ -425,11 +425,11 @@ public:
The depth to set on the given paragraph. The range is
[0,n), where n is the maximal outline level.
- @return sal_True, if depth could be successfully set. Reasons for
+ @return true, if depth could be successfully set. Reasons for
failure are e.g. the text does not support outline level
(EditEngine), or the depth range is exceeded.
*/
- virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) = 0;
+ virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) = 0;
virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara );
virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue );
@@ -453,7 +453,7 @@ public:
@return sal_False, if no longer valid
*/
- virtual sal_Bool IsValid() const = 0;
+ virtual bool IsValid() const = 0;
/** Query visible area of the view containing the text
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 95b1618..ea8a9cc 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -41,7 +41,7 @@ public:
virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
- virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+ virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const;
virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
@@ -56,7 +56,7 @@ public:
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const;
virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const;
@@ -66,18 +66,18 @@ public:
virtual Rectangle GetParaBounds( sal_Int32 nPara ) const;
virtual MapMode GetMapMode() const;
virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
- virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
+ virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
+ virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
- virtual sal_Bool Delete( const ESelection& );
- virtual sal_Bool InsertText( const OUString&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
+ virtual bool Delete( const ESelection& );
+ virtual bool InsertText( const OUString&, const ESelection& );
+ virtual bool QuickFormatDoc( bool bFull = false );
virtual sal_Int16 GetDepth( sal_Int32 nPara ) const;
- virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
+ virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
virtual const SfxItemSet* GetEmptyItemSetPtr();
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 1ea7f61..5b9c719 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -59,7 +59,7 @@ public:
virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
- virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+ virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const;
virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
@@ -73,9 +73,9 @@ public:
virtual SfxItemPool* GetPool() const;
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
- virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
+ virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
Outliner& GetOutliner() const { return rOutliner; }
@@ -87,18 +87,18 @@ public:
virtual Rectangle GetParaBounds( sal_Int32 nPara ) const;
virtual MapMode GetMapMode() const;
virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
- virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
+ virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
+ virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const;
virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
- virtual sal_Bool Delete( const ESelection& );
- virtual sal_Bool InsertText( const OUString&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
+ virtual bool Delete( const ESelection& );
+ virtual bool InsertText( const OUString&, const ESelection& );
+ virtual bool QuickFormatDoc( bool bFull = false );
virtual sal_Int16 GetDepth( sal_Int32 nPara ) const;
- virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
+ virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara );
virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue );
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index d43478d..72f7523 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -178,7 +178,7 @@ public:
virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
- virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+ virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const;
sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
@@ -194,7 +194,7 @@ public:
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual void SetNotifyHdl( const Link& );
virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const;
@@ -205,18 +205,18 @@ public:
virtual Rectangle GetParaBounds( sal_Int32 nPara ) const;
virtual MapMode GetMapMode() const;
virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
- virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
+ virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
+ virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
- virtual sal_Bool Delete( const ESelection& );
- virtual sal_Bool InsertText( const OUString&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
+ virtual bool Delete( const ESelection& );
+ virtual bool InsertText( const OUString&, const ESelection& );
+ virtual bool QuickFormatDoc( bool bFull = false );
virtual sal_Int16 GetDepth( sal_Int32 nPara ) const;
- virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
+ virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
virtual const SfxItemSet* GetEmptyItemSetPtr();
diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx
index ff3e8de..3c6ebe9 100644
--- a/include/editeng/unoviwou.hxx
+++ b/include/editeng/unoviwou.hxx
@@ -39,7 +39,7 @@ public:
SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft );
virtual ~SvxDrawOutlinerViewForwarder();
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index fd30b64..09dee0d 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -71,7 +71,7 @@ public:
void unlock();
// the SvxViewForwarder interface
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point&, const MapMode& ) const;
virtual Point PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index b644e1a..a3da6e3 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -56,7 +56,7 @@ public:
ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell);
virtual ~ScViewForwarder();
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -76,7 +76,7 @@ ScViewForwarder::~ScViewForwarder()
{
}
-sal_Bool ScViewForwarder::IsValid() const
+bool ScViewForwarder::IsValid() const
{
return mpViewShell != NULL;
}
@@ -156,7 +156,7 @@ public:
const EditView* _pEditView);
virtual ~ScEditObjectViewForwarder();
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -176,7 +176,7 @@ ScEditObjectViewForwarder::~ScEditObjectViewForwarder()
{
}
-sal_Bool ScEditObjectViewForwarder::IsValid() const
+bool ScEditObjectViewForwarder::IsValid() const
{
return (mpWindow != NULL);
}
@@ -255,7 +255,7 @@ public:
ScPreviewViewForwarder(ScPreviewShell* pViewShell);
virtual ~ScPreviewViewForwarder();
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -280,7 +280,7 @@ ScPreviewViewForwarder::~ScPreviewViewForwarder()
delete mpTableInfo;
}
-sal_Bool ScPreviewViewForwarder::IsValid() const
+bool ScPreviewViewForwarder::IsValid() const
{
return mpViewShell != NULL;
}
@@ -556,7 +556,7 @@ public:
ScEditViewForwarder(EditView* pEditView, Window* pWin);
virtual ~ScEditViewForwarder();
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -582,14 +582,9 @@ ScEditViewForwarder::~ScEditViewForwarder()
{
}
-sal_Bool ScEditViewForwarder::IsValid() const
+bool ScEditViewForwarder::IsValid() const
{
- sal_Bool bResult(false);
- if (mpWindow && mpEditView)
- {
- bResult = sal_True;
- }
- return bResult;
+ return mpWindow && mpEditView;
}
Rectangle ScEditViewForwarder::GetVisArea() const
@@ -1670,7 +1665,7 @@ class ScCsvViewForwarder : public SvxViewForwarder
public:
explicit ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox );
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -1684,7 +1679,7 @@ ScCsvViewForwarder::ScCsvViewForwarder( Window* pWindow, const Rectangle& rBound
{
}
-sal_Bool ScCsvViewForwarder::IsValid() const
+bool ScCsvViewForwarder::IsValid() const
{
return mpWindow != NULL;
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index a5ac5a6..f5e4942 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list