[Libreoffice-commits] core.git: svx/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Apr 16 17:44:27 PDT 2013
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 10 -
svx/source/unodraw/UnoNameItemTable.cxx | 4
svx/source/unodraw/recoveryui.cxx | 2
svx/source/unodraw/unomtabl.cxx | 12 -
svx/source/unodraw/unopage.cxx | 4
svx/source/unodraw/unoprov.cxx | 10 -
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap3.cxx | 6
svx/source/unodraw/unoshap4.cxx | 4
svx/source/unodraw/unoshape.cxx | 16 -
svx/source/unodraw/unoshcol.cxx | 4
svx/source/unodraw/unoshtxt.cxx | 82 +++++-----
16 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit 01c135776601cb767fb45456739596c50499820f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Apr 17 09:12:54 2013 +0900
sal_Bool to bool
Change-Id: Id2ba5cf09227945fd97ef6f7e63cb40fa6488886
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 3d08218..656c06a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -253,7 +253,7 @@ void DictionaryList::addEntry( const OUString& rTerm, const OUString& rMapping
if( hasTerm( rTerm ) )
return;
- DictionaryEntry* pEntry = new DictionaryEntry( rTerm, rMapping, nConversionPropertyType, sal_True );
+ DictionaryEntry* pEntry = new DictionaryEntry( rTerm, rMapping, nConversionPropertyType, true );
SvTreeListEntry* pLBEntry = InsertEntryToColumn( makeTabString( *pEntry ), nPos );
pLBEntry->SetUserData( pEntry );
SelectRow( GetEntryPos( pLBEntry ) );
@@ -421,7 +421,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16
DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping
, sal_Int16 nConversionPropertyType
- , sal_Bool bNewEntry )
+ , bool bNewEntry )
: m_aTerm( rTerm )
, m_aMapping( rMapping )
, m_nConversionPropertyType( nConversionPropertyType )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 2728ac9..c0681ff 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -49,7 +49,7 @@ struct DictionaryEntry
{
DictionaryEntry( const OUString& rTerm, const OUString& rMapping
, sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType
- , sal_Bool bNewEntry = sal_False );
+ , bool bNewEntry = false );
virtual ~DictionaryEntry();
@@ -59,7 +59,7 @@ struct DictionaryEntry
OUString m_aMapping;
sal_Int16 m_nConversionPropertyType; //linguistic2::ConversionPropertyType
- sal_Bool m_bNewEntry;
+ bool m_bNewEntry;
};
class DictionaryList : public SvHeaderTabListBox
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 4082018..5c8e11f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -47,8 +47,8 @@ ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference
: m_xCC( xContext )
, m_xParentWindow( 0 )
, m_pDialog( 0 )
- , m_bDisposed(sal_False)
- , m_bInDispose(sal_False)
+ , m_bDisposed(false)
+ , m_bInDispose(false)
, m_aContainerMutex()
, m_aDisposeEventListeners(m_aContainerMutex)
{
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 0e8b89c..c2553a9 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -123,8 +123,8 @@ private:
ChineseTranslationDialog* m_pDialog;
- sal_Bool m_bDisposed; ///Dispose call ready.
- sal_Bool m_bInDispose;///In dispose call
+ bool m_bDisposed; ///Dispose call ready.
+ bool m_bInDispose;///In dispose call
osl::Mutex m_aContainerMutex;
cppu::OInterfaceContainerHelper m_aDisposeEventListeners;
};
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 59062ef..fb9e790 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -415,7 +415,7 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWid
pVDev->SetMapMode( aMM );
#ifdef DBG_UTIL
- sal_Bool bAbort = !
+ bool bAbort = !
#endif
pVDev->SetOutputSize(aPageSize);
DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
@@ -804,7 +804,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
if( bRet && !aShapes.empty() )
{
// special treatment for only one SdrGrafObj that has text
- sal_Bool bSingleGraphic = sal_False;
+ bool bSingleGraphic = false;
if( 1 == aShapes.size() )
{
@@ -829,7 +829,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
// #118804# only accept for bitmap graphics, else the
// conversion to bitmap will happen anywhere without size control
// as evtl. defined in rSettings.mnWidth/mnHeight
- bSingleGraphic = sal_True;
+ bSingleGraphic = true;
}
}
}
@@ -878,7 +878,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
aGraphic = Graphic( *pMtf );
- bSingleGraphic = sal_True;
+ bSingleGraphic = true;
}
}
}
@@ -1147,7 +1147,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
SdrObject* pObj;
Reference< XShape > xShape;
- sal_Bool bOk = sal_True;
+ bool bOk = true;
const sal_Int32 nCount = mxShapes->getCount();
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 09fa72e..3b44653 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -183,7 +183,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
}
// if it is not in our own sets, modify the pool!
- sal_Bool bFound = sal_False;
+ bool bFound = false;
sal_uInt32 nSurrogate;
sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
@@ -193,7 +193,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
if (pItem && aName.equals(pItem->GetName()))
{
pItem->PutValue( aElement, mnMemberId );
- bFound = sal_True;
+ bFound = true;
break;
}
}
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index ad217dc..652511b 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -274,7 +274,7 @@ sal_Bool RecoveryUI::impl_doEmergencySave()
//===============================================
void RecoveryUI::impl_doRecovery()
{
- sal_Bool bRecoveryOnly( sal_False );
+ bool bRecoveryOnly( false );
OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/");
OUString CFG_PATH_CRASHREPORTER( "CrashReporter" );
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 1e3d5a1..81b61e7 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -260,7 +260,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
}
// if it is not in our own sets, modify the pool!
- sal_Bool bFound = sal_False;
+ bool bFound = false;
sal_uInt32 nSurrogate;
const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0;
@@ -270,7 +270,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
if( pItem && pItem->GetName() == aSearchName )
{
pItem->PutValue( aElement );
- bFound = sal_True;
+ bFound = true;
break;
}
}
@@ -282,7 +282,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
if( pItem && pItem->GetName() == aSearchName )
{
pItem->PutValue( aElement );
- bFound = sal_True;
+ bFound = true;
break;
}
}
@@ -293,7 +293,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
throw container::NoSuchElementException();
}
-static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny )
+static bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny )
{
NameOrIndex *pItem;
const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0;
@@ -304,11 +304,11 @@ static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool
if( pItem && pItem->GetName() == rSearchName )
{
pItem->QueryValue( rAny, 0 );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
// XNameAccess
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index fcef224..461b4ad 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -133,14 +133,14 @@ void SvxDrawPage::dispose()
// Guard dispose against multible threading
// Remark: It is an error to call dispose more than once
- sal_Bool bDoDispose = sal_False;
+ bool bDoDispose = false;
{
osl::MutexGuard aGuard( mrBHelper.rMutex );
if( !mrBHelper.bDisposed && !mrBHelper.bInDispose )
{
// only one call go into this section
mrBHelper.bInDispose = sal_True;
- bDoDispose = sal_True;
+ bDoDispose = true;
}
}
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 3b77721..71d40cb 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1143,10 +1143,10 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
break;
default:
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, String& rString ) throw()
@@ -1188,18 +1188,18 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
rString.Replace( 0, aShortString.Len(), String( aNewRes ) );
- return sal_True;
+ return true;
}
else if( rString == aCompare )
{
sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
rString = String( aNewRes );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
static sal_uInt16 SvxUnoColorNameDefResId[] =
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index ebf9229..d47a69d 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1898,7 +1898,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
::SolarMutexGuard aGuard;
SdrObject* pObject = mpObj.get();
- sal_Bool bCustomShapeGeometry = pObject && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShapeGeometry" ) );
+ bool bCustomShapeGeometry = pObject && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShapeGeometry" ) );
sal_Bool bMirroredX = sal_False;
sal_Bool bMirroredY = sal_False;
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 6e15dc0..d94b7bc 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -389,9 +389,9 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
pScene->SetCamera(aCam);
// #91047# use imported VRP, VPN and VUP (if used)
- sal_Bool bVRPUsed(!aVRP.equal(basegfx::B3DPoint(0.0, 0.0, 1.0)));
- sal_Bool bVPNUsed(!aVPN.equal(basegfx::B3DVector(0.0, 0.0, 1.0)));
- sal_Bool bVUPUsed(!aVUP.equal(basegfx::B3DVector(0.0, 1.0, 0.0)));
+ bool bVRPUsed(!aVRP.equal(basegfx::B3DPoint(0.0, 0.0, 1.0)));
+ bool bVPNUsed(!aVPN.equal(basegfx::B3DVector(0.0, 0.0, 1.0)));
+ bool bVUPUsed(!aVUP.equal(basegfx::B3DVector(0.0, 1.0, 0.0)));
if(bVRPUsed || bVPNUsed || bVUPUsed)
{
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 6c3d922..49c7892 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -223,13 +223,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
const Graphic* pGraphic = pObj->GetGraphic();
if( pGraphic )
{
- sal_Bool bIsWMF = sal_False;
+ bool bIsWMF = false;
if ( pGraphic->IsLink() )
{
GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
{
- bIsWMF = sal_True;
+ bIsWMF = true;
uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
rValue <<= aSeq;
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 245d101..34c43a9e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1080,7 +1080,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
return;
}
- sal_Bool bClearMe = sal_False;
+ bool bClearMe = false;
switch( pSdrHint->GetKind() )
{
@@ -1091,7 +1091,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
}
case HINT_MODELCLEARED:
{
- bClearMe = sal_True;
+ bClearMe = true;
mpModel = NULL;
break;
}
@@ -1119,7 +1119,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
// Prefixing with 'svx' and marking static to make sure name collisions
// do not occur.
-static sal_Bool svx_needLogicRectHack( SdrObject* pObj )
+static bool svx_needLogicRectHack( SdrObject* pObj )
{
if( pObj->GetObjInventor() == SdrInventor)
{
@@ -1139,10 +1139,10 @@ static sal_Bool svx_needLogicRectHack( SdrObject* pObj )
case OBJ_PATHPOLY:
case OBJ_PATHPLIN:
case OBJ_MEASURE:
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
//----------------------------------------------------------------------
@@ -1700,7 +1700,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
DBG_ASSERT( pMap->nWID == SDRATTR_TEXTDIRECTION || pMap->nWID < SDRATTR_NOTPERSIST_FIRST || pMap->nWID > SDRATTR_NOTPERSIST_LAST, "Not persist item not handled!" );
DBG_ASSERT( pMap->nWID < OWN_ATTR_VALUE_START || pMap->nWID > OWN_ATTR_VALUE_END, "Not item property not handled!" );
- sal_Bool bIsNotPersist = pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST && pMap->nWID != SDRATTR_TEXTDIRECTION;
+ bool bIsNotPersist = pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST && pMap->nWID != SDRATTR_TEXTDIRECTION;
if( pMap->nWID == SDRATTR_ECKENRADIUS )
{
@@ -2929,13 +2929,13 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
const Graphic* pGraphic = pObj->GetGraphic();
if( pGraphic )
{
- sal_Bool bIsWMF = sal_False;
+ bool bIsWMF = false;
if ( pGraphic->IsLink() )
{
GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
{
- bIsWMF = sal_True;
+ bIsWMF = true;
uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
rValue <<= aSeq;
}
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 2f5364c..129d075 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -102,14 +102,14 @@ void SvxShapeCollection::dispose()
// Guard dispose against multible threading
// Remark: It is an error to call dispose more than once
- sal_Bool bDoDispose = sal_False;
+ bool bDoDispose = false;
{
osl::MutexGuard aGuard( mrBHelper.rMutex );
if( !mrBHelper.bDisposed && !mrBHelper.bInDispose )
{
// only one call go into this section
mrBHelper.bInDispose = sal_True;
- bDoDispose = sal_True;
+ bDoDispose = true;
}
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 86734c6..0324abb 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -90,14 +90,14 @@ private:
SvxDrawOutlinerViewForwarder* mpViewForwarder; // if non-NULL, use GetViewModeTextForwarder text forwarder
css::uno::Reference< css::linguistic2::XLinguServiceManager2 > m_xLinguServiceManager;
Point maTextOffset;
- sal_Bool mbDataValid;
- sal_Bool mbDestroyed;
- sal_Bool mbIsLocked;
- sal_Bool mbNeedsUpdate;
+ bool mbDataValid;
+ bool mbDestroyed;
+ bool mbIsLocked;
+ bool mbNeedsUpdate;
sal_Bool mbOldUndoMode;
- sal_Bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
- sal_Bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
- sal_Bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
+ bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
+ bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
+ bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
XInterface* mpOwner;
SvxUnoTextRangeBaseList maTextRanges;
@@ -108,11 +108,11 @@ private:
void SetupOutliner();
- sal_Bool HasView() const { return mpView ? sal_True : sal_False; }
- sal_Bool IsEditMode() const
+ bool HasView() const { return mpView ? true : false; }
+ bool IsEditMode() const
{
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
- return mbShapeIsEditMode && pTextObj && pTextObj->IsTextEditActive() ? sal_True : sal_False;
+ return mbShapeIsEditMode && pTextObj && pTextObj->IsTextEditActive() ? true : false;
}
void dispose();
@@ -168,14 +168,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mpOutliner ( NULL ),
mpTextForwarder ( NULL ),
mpViewForwarder ( NULL ),
- mbDataValid ( sal_False ),
- mbDestroyed ( sal_False ),
- mbIsLocked ( sal_False ),
- mbNeedsUpdate ( sal_False ),
+ mbDataValid ( false ),
+ mbDestroyed ( false ),
+ mbIsLocked ( false ),
+ mbNeedsUpdate ( false ),
mbOldUndoMode ( sal_False ),
- mbForwarderIsEditMode ( sal_False ),
- mbShapeIsEditMode ( sal_False ),
- mbNotificationsDisabled ( sal_False ),
+ mbForwarderIsEditMode ( false ),
+ mbShapeIsEditMode ( false ),
+ mbNotificationsDisabled ( false ),
mpOwner( pOwner )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -206,14 +206,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mpOutliner ( NULL ),
mpTextForwarder ( NULL ),
mpViewForwarder ( NULL ),
- mbDataValid ( sal_False ),
- mbDestroyed ( sal_False ),
- mbIsLocked ( sal_False ),
- mbNeedsUpdate ( sal_False ),
+ mbDataValid ( false ),
+ mbDestroyed ( false ),
+ mbIsLocked ( false ),
+ mbNeedsUpdate ( false ),
mbOldUndoMode ( sal_False ),
- mbForwarderIsEditMode ( sal_False ),
- mbShapeIsEditMode ( sal_True ),
- mbNotificationsDisabled ( sal_False ),
+ mbForwarderIsEditMode ( false ),
+ mbShapeIsEditMode ( true ),
+ mbNotificationsDisabled ( false ),
mpOwner(0)
{
if( !mpText )
@@ -238,7 +238,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
SvxTextEditSourceImpl::~SvxTextEditSourceImpl()
{
- DBG_ASSERT( mbIsLocked == sal_False, "text edit source was not unlocked before dispose!" );
+ DBG_ASSERT( mbIsLocked == false, "text edit source was not unlocked before dispose!" );
if( mpObject )
mpObject->RemoveObjectUser( *this );
@@ -354,7 +354,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
case HINT_OBJCHG:
{
- mbDataValid = sal_False; // Text muss neu geholt werden
+ mbDataValid = false; // Text muss neu geholt werden
if( HasView() )
{
@@ -386,7 +386,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
// #104157# Only now we're really in edit mode
- mbShapeIsEditMode = sal_True;
+ mbShapeIsEditMode = true;
Broadcast( *pSdrHint );
}
@@ -398,7 +398,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
Broadcast( *pSdrHint );
// #104157# We're no longer in edit mode
- mbShapeIsEditMode = sal_False;
+ mbShapeIsEditMode = false;
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
@@ -416,7 +416,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
// invalid.
if( mbForwarderIsEditMode )
{
- mbForwarderIsEditMode = sal_False;
+ mbForwarderIsEditMode = false;
delete mpTextForwarder;
mpTextForwarder = NULL;
}
@@ -540,10 +540,10 @@ void SvxTextEditSourceImpl::UpdateOutliner()
SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
{
- sal_Bool bCreated = sal_False;
+ bool bCreated = false;
// #99840#: prevent EE/Outliner notifications during setup
- mbNotificationsDisabled = sal_True;
+ mbNotificationsDisabled = true;
if (!mpTextForwarder)
{
@@ -585,9 +585,9 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) );
// delay listener subscription and UAA initialization until Outliner is fully setup
- bCreated = sal_True;
+ bCreated = true;
- mbForwarderIsEditMode = sal_False;
+ mbForwarderIsEditMode = false;
}
if( mpObject && mpText && !mbDataValid && mpObject->IsInserted() && mpObject->GetPage() )
@@ -622,7 +622,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
else
{
- sal_Bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : sal_False;
+ bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : false;
// set objects style sheet on empty outliner
SfxStyleSheetPool* pPool = (SfxStyleSheetPool*)mpObject->GetModel()->GetStyleSheetPool();
@@ -653,7 +653,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
}
- mbDataValid = sal_True;
+ mbDataValid = true;
if( bOwnParaObj )
delete pOutlinerParaObject;
@@ -667,7 +667,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
// #99840#: prevent EE/Outliner notifications during setup
- mbNotificationsDisabled = sal_False;
+ mbNotificationsDisabled = false;
return mpTextForwarder;
}
@@ -683,7 +683,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder()
if( pEditOutliner )
{
mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) );
- mbForwarderIsEditMode = sal_True;
+ mbForwarderIsEditMode = true;
}
}
@@ -820,7 +820,7 @@ void SvxTextEditSourceImpl::UpdateData()
{
if( mbIsLocked )
{
- mbNeedsUpdate = sal_True;
+ mbNeedsUpdate = true;
}
else
{
@@ -860,7 +860,7 @@ void SvxTextEditSourceImpl::UpdateData()
void SvxTextEditSourceImpl::lock()
{
- mbIsLocked = sal_True;
+ mbIsLocked = true;
if( mpOutliner )
{
((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False );
@@ -871,12 +871,12 @@ void SvxTextEditSourceImpl::lock()
void SvxTextEditSourceImpl::unlock()
{
- mbIsLocked = sal_False;
+ mbIsLocked = false;
if( mbNeedsUpdate )
{
UpdateData();
- mbNeedsUpdate = sal_False;
+ mbNeedsUpdate = false;
}
if( mpOutliner )
More information about the Libreoffice-commits
mailing list