summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editeng/qa/unit/core-test.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx20
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx14
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx10
-rw-r--r--editeng/source/accessibility/AccessibleParaManager.cxx2
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx10
-rw-r--r--editeng/source/editeng/editattr.cxx12
-rw-r--r--editeng/source/editeng/editdbg.cxx2
-rw-r--r--editeng/source/editeng/editdoc.cxx68
-rw-r--r--editeng/source/editeng/editdoc.hxx8
-rw-r--r--editeng/source/editeng/editeng.cxx32
-rw-r--r--editeng/source/editeng/editobj.cxx24
-rw-r--r--editeng/source/editeng/editsel.cxx2
-rw-r--r--editeng/source/editeng/editundo.cxx8
-rw-r--r--editeng/source/editeng/editview.cxx8
-rw-r--r--editeng/source/editeng/edtspell.cxx6
-rw-r--r--editeng/source/editeng/eehtml.cxx6
-rw-r--r--editeng/source/editeng/eehtml.hxx2
-rw-r--r--editeng/source/editeng/eerdll.cxx4
-rw-r--r--editeng/source/editeng/eertfpar.cxx6
-rw-r--r--editeng/source/editeng/impedit.cxx32
-rw-r--r--editeng/source/editeng/impedit.hxx42
-rw-r--r--editeng/source/editeng/impedit2.cxx60
-rw-r--r--editeng/source/editeng/impedit3.cxx70
-rw-r--r--editeng/source/editeng/impedit4.cxx16
-rw-r--r--editeng/source/editeng/impedit5.cxx28
-rw-r--r--editeng/source/editeng/textconv.cxx2
-rw-r--r--editeng/source/items/borderline.cxx12
-rw-r--r--editeng/source/items/bulitem.cxx10
-rw-r--r--editeng/source/items/flditem.cxx20
-rw-r--r--editeng/source/items/frmitems.cxx66
-rw-r--r--editeng/source/items/numitem.cxx46
-rw-r--r--editeng/source/items/textitem.cxx30
-rw-r--r--editeng/source/items/writingmodeitem.cxx2
-rw-r--r--editeng/source/items/xmlcnitm.cxx6
-rw-r--r--editeng/source/lookuptree/Trie.cxx16
-rw-r--r--editeng/source/misc/forbiddencharacterstable.cxx2
-rw-r--r--editeng/source/misc/hangulhanja.cxx6
-rw-r--r--editeng/source/misc/splwrap.cxx4
-rw-r--r--editeng/source/misc/svxacorr.cxx68
-rw-r--r--editeng/source/misc/swafopt.cxx4
-rw-r--r--editeng/source/misc/txtrange.cxx6
-rw-r--r--editeng/source/misc/unolingu.cxx64
-rw-r--r--editeng/source/outliner/outleeng.cxx2
-rw-r--r--editeng/source/outliner/outlin2.cxx2
-rw-r--r--editeng/source/outliner/outliner.cxx52
-rw-r--r--editeng/source/outliner/outlundo.cxx6
-rw-r--r--editeng/source/outliner/outlvw.cxx12
-rw-r--r--editeng/source/outliner/overflowingtxt.cxx10
-rw-r--r--editeng/source/outliner/paralist.hxx2
-rw-r--r--editeng/source/rtf/rtfitem.cxx16
-rw-r--r--editeng/source/rtf/svxrtf.cxx20
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx2
-rw-r--r--editeng/source/uno/unoedprx.cxx24
-rw-r--r--editeng/source/uno/unoedsrc.cxx4
-rw-r--r--editeng/source/uno/unofdesc.cxx2
-rw-r--r--editeng/source/uno/unofield.cxx10
-rw-r--r--editeng/source/uno/unofored.cxx6
-rw-r--r--editeng/source/uno/unoforou.cxx14
-rw-r--r--editeng/source/uno/unoipset.cxx14
-rw-r--r--editeng/source/uno/unonrule.cxx4
-rw-r--r--editeng/source/uno/unopracc.cxx6
-rw-r--r--editeng/source/uno/unotext.cxx114
-rw-r--r--editeng/source/uno/unotext2.cxx22
-rw-r--r--editeng/source/xml/xmltxtexp.cxx2
-rw-r--r--editeng/source/xml/xmltxtimp.cxx4
-rw-r--r--include/editeng/AccessibleEditableTextPara.hxx2
-rw-r--r--include/editeng/adjustitem.hxx4
-rw-r--r--include/editeng/autokernitem.hxx4
-rw-r--r--include/editeng/blinkitem.hxx4
-rw-r--r--include/editeng/borderline.hxx6
-rw-r--r--include/editeng/boxitem.hxx8
-rw-r--r--include/editeng/brushitem.hxx4
-rw-r--r--include/editeng/bulletitem.hxx4
-rw-r--r--include/editeng/charhiddenitem.hxx4
-rw-r--r--include/editeng/charreliefitem.hxx4
-rw-r--r--include/editeng/charrotateitem.hxx4
-rw-r--r--include/editeng/charscaleitem.hxx4
-rw-r--r--include/editeng/charsetcoloritem.hxx4
-rw-r--r--include/editeng/cmapitem.hxx4
-rw-r--r--include/editeng/colritem.hxx6
-rw-r--r--include/editeng/contouritem.hxx4
-rw-r--r--include/editeng/crossedoutitem.hxx4
-rw-r--r--include/editeng/editdata.hxx2
-rw-r--r--include/editeng/editeng.hxx8
-rw-r--r--include/editeng/editobj.hxx2
-rw-r--r--include/editeng/editview.hxx12
-rw-r--r--include/editeng/emphasismarkitem.hxx4
-rw-r--r--include/editeng/escapementitem.hxx4
-rw-r--r--include/editeng/fhgtitem.hxx4
-rw-r--r--include/editeng/flditem.hxx2
-rw-r--r--include/editeng/flstitem.hxx4
-rw-r--r--include/editeng/fontitem.hxx4
-rw-r--r--include/editeng/forbiddenruleitem.hxx4
-rw-r--r--include/editeng/formatbreakitem.hxx4
-rw-r--r--include/editeng/frmdiritem.hxx4
-rw-r--r--include/editeng/fwdtitem.hxx4
-rw-r--r--include/editeng/hngpnctitem.hxx4
-rw-r--r--include/editeng/hyphenzoneitem.hxx4
-rw-r--r--include/editeng/justifyitem.hxx12
-rw-r--r--include/editeng/keepitem.hxx4
-rw-r--r--include/editeng/kernitem.hxx4
-rw-r--r--include/editeng/langitem.hxx4
-rw-r--r--include/editeng/lcolitem.hxx2
-rw-r--r--include/editeng/lineitem.hxx4
-rw-r--r--include/editeng/lrspitem.hxx4
-rw-r--r--include/editeng/lspcitem.hxx4
-rw-r--r--include/editeng/nhypitem.hxx4
-rw-r--r--include/editeng/nlbkitem.hxx4
-rw-r--r--include/editeng/numitem.hxx4
-rw-r--r--include/editeng/opaqitem.hxx4
-rw-r--r--include/editeng/optitems.hxx8
-rw-r--r--include/editeng/orphitem.hxx4
-rw-r--r--include/editeng/outliner.hxx22
-rw-r--r--include/editeng/paravertalignitem.hxx4
-rw-r--r--include/editeng/pbinitem.hxx4
-rw-r--r--include/editeng/pgrditem.hxx4
-rw-r--r--include/editeng/pmdlitem.hxx4
-rw-r--r--include/editeng/postitem.hxx4
-rw-r--r--include/editeng/prntitem.hxx4
-rw-r--r--include/editeng/protitem.hxx4
-rw-r--r--include/editeng/prszitem.hxx4
-rw-r--r--include/editeng/rsiditem.hxx2
-rw-r--r--include/editeng/scriptspaceitem.hxx4
-rw-r--r--include/editeng/scripttypeitem.hxx4
-rw-r--r--include/editeng/shaditem.hxx6
-rw-r--r--include/editeng/shdditem.hxx4
-rw-r--r--include/editeng/sizeitem.hxx4
-rw-r--r--include/editeng/spltitem.hxx4
-rw-r--r--include/editeng/svxacorr.hxx2
-rw-r--r--include/editeng/svxfont.hxx4
-rw-r--r--include/editeng/svxrtf.hxx6
-rw-r--r--include/editeng/tstpitem.hxx4
-rw-r--r--include/editeng/twolinesitem.hxx4
-rw-r--r--include/editeng/udlnitem.hxx8
-rw-r--r--include/editeng/ulspitem.hxx4
-rw-r--r--include/editeng/unotext.hxx4
-rw-r--r--include/editeng/wghtitem.hxx4
-rw-r--r--include/editeng/widwitem.hxx4
-rw-r--r--include/editeng/writingmodeitem.hxx4
-rw-r--r--include/editeng/wrlmitem.hxx4
-rw-r--r--include/editeng/xmlcnitm.hxx4
142 files changed, 779 insertions, 779 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 7b8de3e643ad..0c6acef40c90 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -70,7 +70,7 @@ private:
EditEngineItemPool* mpItemPool;
};
-Test::Test() : mpItemPool(NULL) {}
+Test::Test() : mpItemPool(nullptr) {}
void Test::setUp()
{
@@ -273,7 +273,7 @@ private:
virtual OUString const* GetPrevPara(bool) override
{
//fprintf(stderr, "TestAutoCorrDoc::GetPrevPara\n");
- return 0;
+ return nullptr;
}
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos,
sal_Int32 nEndPos, SvxAutoCorrect& rACorrect,
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 64e53572accf..3e5481f82d4b 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -46,8 +46,8 @@ AccessibleContextBase::AccessibleContextBase (
const uno::Reference<XAccessible>& rxParent,
const sal_Int16 aRole)
: WeakComponentImplHelper(MutexOwner::maMutex),
- mxStateSet (NULL),
- mxRelationSet (NULL),
+ mxStateSet (nullptr),
+ mxRelationSet (nullptr),
mxParent(rxParent),
msDescription(),
meDescriptionOrigin(NotSet),
@@ -83,7 +83,7 @@ bool AccessibleContextBase::SetState (sal_Int16 aState)
::osl::ClearableMutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if ((pStateSet != NULL) && !pStateSet->contains(aState))
+ if ((pStateSet != nullptr) && !pStateSet->contains(aState))
{
pStateSet->AddState (aState);
// Clear the mutex guard so that it is not locked during calls to
@@ -114,7 +114,7 @@ bool AccessibleContextBase::ResetState (sal_Int16 aState)
::osl::ClearableMutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if ((pStateSet != NULL) && pStateSet->contains(aState))
+ if ((pStateSet != nullptr) && pStateSet->contains(aState))
{
pStateSet->RemoveState (aState);
// Clear the mutex guard so that it is not locked during calls to listeners.
@@ -140,7 +140,7 @@ bool AccessibleContextBase::GetState (sal_Int16 aState)
::osl::MutexGuard aGuard (maMutex);
::utl::AccessibleStateSetHelper* pStateSet =
static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if (pStateSet != NULL)
+ if (pStateSet != nullptr)
return pStateSet->contains(aState);
else
// If there is no state set then return false as a default value.
@@ -216,7 +216,7 @@ uno::Reference<XAccessible> SAL_CALL
ThrowIfDisposed ();
throw lang::IndexOutOfBoundsException (
"no child with index " + OUString::number(nIndex),
- NULL);
+ nullptr);
}
@@ -323,13 +323,13 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
// Create a copy of the relation set and return it.
::utl::AccessibleRelationSetHelper* pRelationSet =
static_cast< ::utl::AccessibleRelationSetHelper*>(mxRelationSet.get());
- if (pRelationSet != NULL)
+ if (pRelationSet != nullptr)
{
return uno::Reference<XAccessibleRelationSet> (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
else
- return uno::Reference<XAccessibleRelationSet>(NULL);
+ return uno::Reference<XAccessibleRelationSet>(nullptr);
}
@@ -345,7 +345,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
AccessibleContextBase::getAccessibleStateSet()
throw (css::uno::RuntimeException, std::exception)
{
- ::utl::AccessibleStateSetHelper* pStateSet = NULL;
+ ::utl::AccessibleStateSetHelper* pStateSet = nullptr;
if (rBHelper.bDisposed)
{
@@ -371,7 +371,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
pStateSet->RemoveState (aState);
}
#endif
- if (pStateSet != NULL)
+ if (pStateSet != nullptr)
pStateSet = new ::utl::AccessibleStateSetHelper (*pStateSet);
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index f7a43deb261f..e4a5ab8cb22e 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -111,7 +111,7 @@ namespace accessibility
: AccessibleTextParaInterfaceBase( m_aMutex ),
mnParagraphIndex( 0 ),
mnIndexInParent( 0 ),
- mpEditSource( NULL ),
+ mpEditSource( nullptr ),
maEEOffset( 0, 0 ),
mxParent( rParent ),
// well, that's strictly (UNO) exception safe, though not
@@ -300,9 +300,9 @@ namespace accessibility
int nClientId( getNotifierClientId() );
// #108212# drop all references before notifying dispose
- mxParent = NULL;
+ mxParent = nullptr;
mnNotifierClientId = -1;
- mpEditSource = NULL;
+ mpEditSource = nullptr;
// notify listeners
if( nClientId != -1 )
@@ -604,7 +604,7 @@ namespace accessibility
void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
{
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != NULL &&
+ if( pStateSet != nullptr &&
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
@@ -615,7 +615,7 @@ namespace accessibility
void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
{
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != NULL &&
+ if( pStateSet != nullptr &&
pStateSet->contains(nStateId) )
{
pStateSet->RemoveState( nStateId );
@@ -852,9 +852,9 @@ namespace accessibility
static uno::Sequence< OUString > getAttributeNames()
{
- static uno::Sequence< OUString >* pNames = NULL;
+ static uno::Sequence< OUString >* pNames = nullptr;
- if( pNames == NULL )
+ if( pNames == nullptr )
{
uno::Sequence< OUString >* pSeq = new uno::Sequence< OUString >( 21 );
OUString* pStrings = pSeq->getArray();
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 78d6c72cefbb..709a6cd9e5a2 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -53,7 +53,7 @@ namespace accessibility
AccessibleImageBullet::AccessibleImageBullet ( const uno::Reference< XAccessible >& rParent ) :
mnParagraphIndex( 0 ),
mnIndexInParent( 0 ),
- mpEditSource( NULL ),
+ mpEditSource( nullptr ),
maEEOffset( 0, 0 ),
mxParent( rParent ),
// well, that's strictly (UNO) exception safe, though not
@@ -394,9 +394,9 @@ namespace accessibility
int nClientId( getNotifierClientId() );
// #108212# drop all references before notifying dispose
- mxParent = NULL;
+ mxParent = nullptr;
mnNotifierClientId = -1;
- mpEditSource = NULL;
+ mpEditSource = nullptr;
// notify listeners
if( nClientId != -1 )
@@ -460,7 +460,7 @@ namespace accessibility
{
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != NULL &&
+ if( pStateSet != nullptr &&
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
@@ -472,7 +472,7 @@ namespace accessibility
{
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != NULL &&
+ if( pStateSet != nullptr &&
pStateSet->contains(nStateId) )
{
pStateSet->RemoveState( nStateId );
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 53fcd5a9e9c7..f02a1dab8194 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -386,7 +386,7 @@ namespace accessibility
WeakPara::HardRefType aChild( rChild.first.get() );
if( IsReferencable( aChild ) )
- aChild->SetEditSource( NULL );
+ aChild->SetEditSource( nullptr );
}
}
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 980905077d39..08da4ee432be 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -192,8 +192,8 @@ namespace accessibility
AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() :
- mxThis( NULL ),
- mpTextParagraph( new AccessibleEditableTextPara(NULL) ),
+ mxThis( nullptr ),
+ mpTextParagraph( new AccessibleEditableTextPara(nullptr) ),
mxParagraph( mpTextParagraph ),
maEditSource(),
maMutex(),
@@ -237,9 +237,9 @@ namespace accessibility
mpTextParagraph->Dispose();
// drop references
- mxParagraph = NULL;
- mxThis = NULL;
- mpTextParagraph = NULL;
+ mxParagraph = nullptr;
+ mxThis = nullptr;
+ mpTextParagraph = nullptr;
}
AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 57d0045e9d64..088327fd3a49 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -336,8 +336,8 @@ EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16
: EditCharAttrib( rAttr, nPos, nPos+1 )
{
SetFeature( true ); // !!!
- pTxtColor = 0;
- pFldColor = 0;
+ pTxtColor = nullptr;
+ pFldColor = nullptr;
}
void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* )
@@ -360,8 +360,8 @@ void EditCharAttribField::SetFieldValue(const OUString& rVal)
void EditCharAttribField::Reset()
{
aFieldValue.clear();
- delete pTxtColor; pTxtColor = NULL;
- delete pFldColor; pFldColor = NULL;
+ delete pTxtColor; pTxtColor = nullptr;
+ delete pFldColor; pFldColor = nullptr;
}
EditCharAttribField::EditCharAttribField( const EditCharAttribField& rAttr )
@@ -369,8 +369,8 @@ EditCharAttribField::EditCharAttribField( const EditCharAttribField& rAttr )
aFieldValue( rAttr.aFieldValue )
{
// Use this constructor only for temporary Objects, Item is not pooled.
- pTxtColor = rAttr.pTxtColor ? new Color( *rAttr.pTxtColor ) : 0;
- pFldColor = rAttr.pFldColor ? new Color( *rAttr.pFldColor ) : 0;
+ pTxtColor = rAttr.pTxtColor ? new Color( *rAttr.pTxtColor ) : nullptr;
+ pFldColor = rAttr.pFldColor ? new Color( *rAttr.pFldColor ) : nullptr;
}
EditCharAttribField::~EditCharAttribField()
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 5e65479adf15..e77d95c9e61e 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -323,7 +323,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool bInfoBox )
#else
FILE* fp = fopen( "d:\\debug.log", "w" );
#endif
- if ( fp == 0 )
+ if ( fp == nullptr )
{
OSL_FAIL( "Log file could not be created!" );
return;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index edfbe8878a3b..ec6aad49bc14 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -264,7 +264,7 @@ EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sa
// Create a new attribute in the pool
const SfxPoolItem& rNew = rPool.Put( rAttr );
- EditCharAttrib* pNew = 0;
+ EditCharAttrib* pNew = nullptr;
switch( rNew.Which() )
{
case EE_CHAR_LANGUAGE:
@@ -531,7 +531,7 @@ ExtraPortionInfo::ExtraPortionInfo()
, nAsianCompressionTypes(0)
, bFirstCharIsRightPunktuation(false)
, bCompressed(false)
-, pOrgDXArray(NULL)
+, pOrgDXArray(nullptr)
, lineBreaksList()
{
}
@@ -550,7 +550,7 @@ void ExtraPortionInfo::SaveOrgDXArray( const long* pDXArray, sal_Int32 nLen )
memcpy( pOrgDXArray, pDXArray, nLen * sizeof(long) );
}
else
- pOrgDXArray = NULL;
+ pOrgDXArray = nullptr;
}
ParaPortion::ParaPortion( ContentNode* pN )
@@ -740,12 +740,12 @@ sal_Int32 ParaPortionList::GetPos(const ParaPortion* p) const
ParaPortion* ParaPortionList::operator [](sal_Int32 nPos)
{
- return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : nullptr;
}
const ParaPortion* ParaPortionList::operator [](sal_Int32 nPos) const
{
- return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : nullptr;
}
ParaPortion* ParaPortionList::Release(sal_Int32 nPos)
@@ -753,7 +753,7 @@ ParaPortion* ParaPortionList::Release(sal_Int32 nPos)
if (nPos < 0 || (sal_Int32)maPortions.size() <= nPos)
{
SAL_WARN( "editeng", "ParaPortionList::Release - out of bounds pos " << nPos);
- return NULL;
+ return nullptr;
}
return maPortions.release(maPortions.begin()+nPos).release();
}
@@ -827,12 +827,12 @@ sal_Int32 ParaPortionList::FindParagraph(long nYOffset) const
const ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos) const
{
- return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : nullptr;
}
ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos)
{
- return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? &maPortions[nPos] : nullptr;
}
#if OSL_DEBUG_LEVEL > 0
@@ -1162,7 +1162,7 @@ void EditLineList::Insert(sal_Int32 nPos, EditLine* p)
maLines.insert(maLines.begin()+nPos, p);
}
-EditPaM::EditPaM() : pNode(NULL), nIndex(0) {}
+EditPaM::EditPaM() : pNode(nullptr), nIndex(0) {}
EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {}
EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {}
@@ -1639,7 +1639,7 @@ void ContentNode::CreateDefFont()
// ... then iron out the hard paragraph formatting...
CreateFont( GetCharAttribs().GetDefFont(),
- GetContentAttribs().GetItems(), pS == NULL );
+ GetContentAttribs().GetItems(), pS == nullptr );
}
void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle )
@@ -1651,7 +1651,7 @@ void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyl
GetCharAttribs().GetDefFont() = rFontFromStyle;
// ... then iron out the hard paragraph formatting...
CreateFont( GetCharAttribs().GetDefFont(),
- GetContentAttribs().GetItems(), pS == NULL );
+ GetContentAttribs().GetItems(), pS == nullptr );
}
void ContentNode::SetStyleSheet( SfxStyleSheet* pS, bool bRecalcFont )
@@ -1706,7 +1706,7 @@ OUString ContentNode::GetExpandedText(sal_Int32 nStartPos, sal_Int32 nEndPos, bo
if ( pNextFeature && ( pNextFeature->GetStart() < nEnd ) )
nEnd = pNextFeature->GetStart();
else
- pNextFeature = 0; // Feature does not interest the below
+ pNextFeature = nullptr; // Feature does not interest the below
DBG_ASSERT( nEnd >= nIndex, "End in front of the index?" );
//!! beware of sub string length of -1
@@ -1858,7 +1858,7 @@ void ContentNode::DestroyWrongList()
}
ContentAttribs::ContentAttribs( SfxItemPool& rPool )
-: pStyle(0)
+: pStyle(nullptr)
, aAttribSet( rPool, EE_PARA_START, EE_CHAR_END )
{
}
@@ -1939,7 +1939,7 @@ ItemList::ItemList() : CurrentItem( 0 )
const SfxPoolItem* ItemList::First()
{
CurrentItem = 0;
- return aItemPool.empty() ? NULL : aItemPool[ 0 ];
+ return aItemPool.empty() ? nullptr : aItemPool[ 0 ];
}
const SfxPoolItem* ItemList::Next()
@@ -1949,7 +1949,7 @@ const SfxPoolItem* ItemList::Next()
++CurrentItem;
return aItemPool[ CurrentItem ];
}
- return NULL;
+ return nullptr;
}
void ItemList::Insert( const SfxPoolItem* pItem )
@@ -2116,12 +2116,12 @@ sal_Int32 EditDoc::GetPos(const ContentNode* p) const
const ContentNode* EditDoc::GetObject(sal_Int32 nPos) const
{
- return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? &maContents[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? &maContents[nPos] : nullptr;
}
ContentNode* EditDoc::GetObject(sal_Int32 nPos)
{
- return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? &maContents[nPos] : NULL;
+ return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? &maContents[nPos] : nullptr;
}
const ContentNode* EditDoc::operator[](sal_Int32 nPos) const
@@ -2267,7 +2267,7 @@ void EditDoc::SetModified( bool b )
bModified = b;
if ( bModified )
{
- aModifyHdl.Call( NULL );
+ aModifyHdl.Call( nullptr );
}
}
@@ -2406,9 +2406,9 @@ void EditDoc::InsertAttribInSelection( ContentNode* pNode, sal_Int32 nStart, sal
// for Optimization:
// This ends at the beginning of the selection => can be expanded
- EditCharAttrib* pEndingAttrib = 0;
+ EditCharAttrib* pEndingAttrib = nullptr;
// This starts at the end of the selection => can be expanded
- EditCharAttrib* pStartingAttrib = 0;
+ EditCharAttrib* pStartingAttrib = nullptr;
DBG_ASSERT( nStart <= nEnd, "Small miscalculations in InsertAttribInSelection" );
@@ -2450,9 +2450,9 @@ bool EditDoc::RemoveAttribs( ContentNode* pNode, sal_Int32 nStart, sal_Int32 nEn
DBG_ASSERT( nEnd <= pNode->Len(), "InsertAttrib: Attribute to large!" );
// This ends at the beginning of the selection => can be expanded
- rpEnding = 0;
+ rpEnding = nullptr;
// This starts at the end of the selection => can be expanded
- rpStarting = 0;
+ rpStarting = nullptr;
bool bChanged = false;
@@ -2626,7 +2626,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE
{
while ( pAttr && ( pAttr->GetStart() <= nEndPos) )
{
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
// Attribute is about...
if ( ( pAttr->GetStart() < nStartPos ) && ( pAttr->GetEnd() > nStartPos ) )
pItem = pAttr->GetItem();
@@ -2672,7 +2672,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE
{
while ( pAttr && ( pAttr->GetStart() < nEndPos) )
{
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
// Attribut is about...
if ( ( pAttr->GetStart() <= nStartPos ) && ( pAttr->GetEnd() >= nEndPos ) )
pItem = pAttr->GetItem();
@@ -2839,7 +2839,7 @@ const EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 n
if (rAttr.Which() == nWhich && rAttr.IsIn(nPos))
return &rAttr;
}
- return NULL;
+ return nullptr;
}
EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos )
@@ -2853,7 +2853,7 @@ EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos )
if (rAttr.Which() == nWhich && rAttr.IsIn(nPos))
return &rAttr;
}
- return NULL;
+ return nullptr;
}
const EditCharAttrib* CharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos ) const
@@ -2866,7 +2866,7 @@ const EditCharAttrib* CharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_Int
if (rAttr.GetStart() >= nFromPos && rAttr.Which() == nWhich)
return &rAttr;
}
- return NULL;
+ return nullptr;
}
bool CharAttribList::HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const
@@ -2945,7 +2945,7 @@ bool CharAttribList::HasBoundingAttrib( sal_Int32 nBound ) const
const EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const
{
if ( !bHasEmptyAttribs )
- return NULL;
+ return nullptr;
AttribsType::const_iterator it = aAttribs.begin(), itEnd = aAttribs.end();
for (; it != itEnd; ++it)
@@ -2954,13 +2954,13 @@ const EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_In
if (rAttr.GetStart() == nPos && rAttr.GetEnd() == nPos && rAttr.Which() == nWhich)
return &rAttr;
}
- return NULL;
+ return nullptr;
}
EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos )
{
if ( !bHasEmptyAttribs )
- return NULL;
+ return nullptr;
AttribsType::iterator it = aAttribs.begin(), itEnd = aAttribs.end();
for (; it != itEnd; ++it)
@@ -2969,7 +2969,7 @@ EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nP
if (rAttr.GetStart() == nPos && rAttr.GetEnd() == nPos && rAttr.Which() == nWhich)
return &rAttr;
}
- return NULL;
+ return nullptr;
}
namespace {
@@ -2995,11 +2995,11 @@ const EditCharAttrib* CharAttribList::FindFeature( sal_Int32 nPos ) const
if (it == aAttribs.end())
// All attributes are before the specified position.
- return NULL;
+ return nullptr;
// And find the first attribute with feature.
it = std::find_if(it, aAttribs.end(), [](const EditCharAttrib& aAttrib) { return aAttrib.IsFeature(); } );
- return it == aAttribs.end() ? NULL : &(*it);
+ return it == aAttribs.end() ? nullptr : &(*it);
}
namespace {
@@ -3050,7 +3050,7 @@ void CharAttribList::DbgCheckAttribs(CharAttribList const& rAttribs)
EditEngineItemPool::EditEngineItemPool( bool bPersistenRefCounts )
: SfxItemPool( "EditEngineItemPool", EE_ITEMS_START, EE_ITEMS_END,
- aItemInfos, 0, bPersistenRefCounts )
+ aItemInfos, nullptr, bPersistenRefCounts )
{
SetVersionMap( 1, 3999, 4015, aV1Map );
SetVersionMap( 2, 3999, 4019, aV2Map );
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 4fe3963d2041..e1b4914353e5 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -387,7 +387,7 @@ private:
TextPortion()
- : pExtraInfos( NULL )
+ : pExtraInfos( nullptr )
, nLen( 0 )
, aOutSz()
, nKind( PortionKind::TEXT )
@@ -398,7 +398,7 @@ private:
public:
TextPortion( sal_Int32 nL )
- : pExtraInfos( NULL )
+ : pExtraInfos( nullptr )
, nLen( nL )
, aOutSz( -1, -1 )
, nKind( PortionKind::TEXT )
@@ -408,7 +408,7 @@ public:
}
TextPortion( const TextPortion& r )
- : pExtraInfos( NULL )
+ : pExtraInfos( nullptr )
, nLen( r.nLen )
, aOutSz( r.aOutSz )
, nKind( r.nKind )
@@ -828,7 +828,7 @@ public:
inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int32 nAttr)
{
- return (nAttr < (sal_Int32)rAttribs.size()) ? &rAttribs[nAttr] : NULL;
+ return (nAttr < (sal_Int32)rAttribs.size()) ? &rAttribs[nAttr] : nullptr;
}
void CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool bStart);
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 955cbc23b28f..143976800f56 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::linguistic2;
static bool bDebugPaint = false;
#endif
-static SfxItemPool* pGlobalPool=0;
+static SfxItemPool* pGlobalPool=nullptr;
EditEngine::EditEngine( SfxItemPool* pItemPool )
{
@@ -320,7 +320,7 @@ EditView* EditEngine::RemoveView( EditView* pView )
{
pView->HideCursor();
- EditView* pRemoved = NULL;
+ EditView* pRemoved = nullptr;
ImpEditEngine::ViewsType& rViews = pImpEditEngine->GetEditViews();
ImpEditEngine::ViewsType::iterator it = std::find(rViews.begin(), rViews.end(), pView);
@@ -331,8 +331,8 @@ EditView* EditEngine::RemoveView( EditView* pView )
rViews.erase(it);
if ( pImpEditEngine->GetActiveView() == pView )
{
- pImpEditEngine->SetActiveView( 0 );
- pImpEditEngine->GetSelEngine().SetCurView( 0 );
+ pImpEditEngine->SetActiveView( nullptr );
+ pImpEditEngine->GetSelEngine().SetCurView( nullptr );
}
pView->pImpEditView->RemoveDragAndDropListeners();
@@ -344,12 +344,12 @@ EditView* EditEngine::RemoveView(size_t nIndex)
{
ImpEditEngine::ViewsType& rViews = pImpEditEngine->GetEditViews();
if (nIndex >= rViews.size())
- return NULL;
+ return nullptr;
EditView* pView = rViews[nIndex];
if ( pView )
return RemoveView( pView );
- return NULL;
+ return nullptr;
}
EditView* EditEngine::GetView(size_t nIndex) const
@@ -501,7 +501,7 @@ void EditEngine::SetAddExtLeading( bool b )
void EditEngine::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon )
{
- SetPolygon( rPolyPolygon, 0L );
+ SetPolygon( rPolyPolygon, nullptr );
}
void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon)
@@ -524,7 +524,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
void EditEngine::ClearPolygon()
{
- pImpEditEngine->SetTextRanger( 0 );
+ pImpEditEngine->SetTextRanger( nullptr );
}
const Size& EditEngine::GetMinAutoPaperSize() const
@@ -1572,7 +1572,7 @@ EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas
aTmpSel.Max() = EditPaM( pEndNode, pEndNode->Len() );
return pImpEditEngine->CreateTextObject( aTmpSel );
}
- return 0;
+ return nullptr;
}
void EditEngine::RemoveParagraph( sal_Int32 nPara )
@@ -1853,7 +1853,7 @@ void EditEngine::SetControlWord( EEControlBits nWord )
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
const ParaPortion* pPortion = pImpEditEngine->GetParaPortions()[n];
bool bWrongs = false;
- if (pNode->GetWrongList() != NULL)
+ if (pNode->GetWrongList() != nullptr)
bWrongs = !pNode->GetWrongList()->empty();
pNode->DestroyWrongList();
if ( bWrongs )
@@ -1943,7 +1943,7 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
// derived objects may override this function to give access to
// bullet information (see Outliner)
(void) nPara;
- return 0;
+ return nullptr;
}
bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
@@ -2333,7 +2333,7 @@ void EditEngine::CompleteOnlineSpelling()
pImpEditEngine->FormatAndUpdate();
pImpEditEngine->StopOnlineSpellTimer();
- pImpEditEngine->DoOnlineSpelling( 0, true, false );
+ pImpEditEngine->DoOnlineSpelling( nullptr, true, false );
}
}
@@ -2384,7 +2384,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
{
const ParaPortion* pParaPortion = pImpEditEngine->GetParaPortions()[nPara];
const EditLine* pLine = (pParaPortion && pParaPortion->GetLines().Count()) ?
- &pParaPortion->GetLines()[0] : NULL;
+ &pParaPortion->GetLines()[0] : nullptr;
DBG_ASSERT( pParaPortion && pLine, "GetParagraphInfos - Paragraph out of range" );
if ( pParaPortion && pLine )
{
@@ -2764,7 +2764,7 @@ bool EditEngine::IsPageOverflow() {
EFieldInfo::EFieldInfo()
{
- pFieldItem = NULL;
+ pFieldItem = nullptr;
}
@@ -2779,7 +2779,7 @@ EFieldInfo::~EFieldInfo()
}
EFieldInfo::EFieldInfo( const EFieldInfo& rFldInfo )
- : pFieldItem(0)
+ : pFieldItem(nullptr)
{
*this = rFldInfo;
}
@@ -2789,7 +2789,7 @@ EFieldInfo& EFieldInfo::operator= ( const EFieldInfo& rFldInfo )
if( this == &rFldInfo )
return *this;
- pFieldItem = rFldInfo.pFieldItem ? new SvxFieldItem( *rFldInfo.pFieldItem ) : 0;
+ pFieldItem = rFldInfo.pFieldItem ? new SvxFieldItem( *rFldInfo.pFieldItem ) : nullptr;
aCurrentText = rFldInfo.aCurrentText;
aPosition = rFldInfo.aPosition;
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index d9645458610a..b607b1f4ac97 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -80,7 +80,7 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uIn
XEditAttribute::~XEditAttribute()
{
- pItem = 0; // belongs to the Pool.
+ pItem = nullptr; // belongs to the Pool.
}
bool XEditAttribute::IsFeature() const
@@ -163,7 +163,7 @@ OUString ContentInfo::GetText() const
void ContentInfo::SetText( const OUString& rStr )
{
- maText = svl::SharedString(rStr.pData, NULL);
+ maText = svl::SharedString(rStr.pData, nullptr);
}
const WrongList* ContentInfo::GetWrongList() const
@@ -414,11 +414,11 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal
{
// Unknown object we no longer support.
rIStream.SetError(EE_READWRITE_WRONGFORMAT);
- return NULL;
+ return nullptr;
}
if ( rIStream.GetError() )
- return NULL;
+ return nullptr;
EditTextObject* pTxtObj = new EditTextObject(pGlobalTextObjectPool);;
pTxtObj->CreateData(rIStream);
@@ -542,7 +542,7 @@ EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, SfxItemPool* pP
nMetric = 0xFFFF;
nUserType = 0;
nObjSettings = 0;
- pPortionInfo = 0;
+ pPortionInfo = nullptr;
// #i101239# ensure target is a EditEngineItemPool, else
// fallback to pool ownership. This is needed to ensure that at
@@ -582,7 +582,7 @@ EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, const EditTextOb
nObjSettings = r.nObjSettings;
bVertical = r.bVertical;
nScriptType = r.nScriptType;
- pPortionInfo = NULL; // Do not copy PortionInfo
+ pPortionInfo = nullptr; // Do not copy PortionInfo
bStoreUnicodeStrings = false;
if ( !r.bOwnerOfPool )
@@ -721,7 +721,7 @@ void EditTextObjectImpl::ClearPortionInfo()
if ( pPortionInfo )
{
delete pPortionInfo;
- pPortionInfo = NULL;
+ pPortionInfo = nullptr;
}
}
@@ -776,18 +776,18 @@ const SvxFieldItem* EditTextObjectImpl::GetField() const
}
}
}
- return 0;
+ return nullptr;
}
const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPos, sal_Int32 nType) const
{
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
- return NULL;
+ return nullptr;
const ContentInfo& rC = aContents[nPara];
if (nPos >= rC.aAttribs.size())
// URL position is out-of-bound.
- return NULL;
+ return nullptr;
ContentInfo::XEditAttributesType::const_iterator it = rC.aAttribs.begin(), itEnd = rC.aAttribs.end();
size_t nCurPos = 0;
@@ -811,7 +811,7 @@ const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPo
++nCurPos;
}
- return NULL; // field not found.
+ return nullptr; // field not found.
}
bool EditTextObjectImpl::HasField( sal_Int32 nType ) const
@@ -1182,7 +1182,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
// Convert StarSymbol back to StarBats
// StarSymbol as paragraph attribute or in StyleSheet?
- FontToSubsFontConverter hConv = NULL;
+ FontToSubsFontConverter hConv = nullptr;
if (rC.GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SfxItemState::SET)
{
hConv = CreateFontToSubsFontConverter( static_cast<const SvxFontItem&>(rC.GetParaAttribs().Get( EE_CHAR_FONTINFO )).GetFamilyName(), FontToSubsFontFlags::EXPORT | FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS );
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 45a280b889e9..b852af73b985 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -30,7 +30,7 @@
EditSelFunctionSet::EditSelFunctionSet()
{
- pCurView = NULL;
+ pCurView = nullptr;
}
void EditSelFunctionSet::CreateAnchor()
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index e581f38216ae..2ede5857a7e1 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -38,7 +38,7 @@ static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
EditUndoManager::EditUndoManager(sal_uInt16 nMaxUndoActionCount )
: SfxUndoManager(nMaxUndoActionCount),
- mpEditEngine(0)
+ mpEditEngine(nullptr)
{
}
@@ -420,14 +420,14 @@ void EditUndoMoveParagraphs::Undo()
else
nTmpDest += aTmpRange.Len();
- EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, nTmpDest, 0);
+ EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, nTmpDest, nullptr);
GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
void EditUndoMoveParagraphs::Redo()
{
DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
- EditSelection aNewSel = GetEditEngine()->MoveParagraphs(nParagraphs, nDest, 0);
+ EditSelection aNewSel = GetEditEngine()->MoveParagraphs(nParagraphs, nDest, nullptr);
GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
@@ -580,7 +580,7 @@ void EditUndoSetAttribs::ImpSetSelection( EditView* /*pView*/ )
EditUndoTransliteration::EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, sal_Int32 nM) :
EditUndo(EDITUNDO_TRANSLITERATE, pEE),
- aOldESel(rESel), nMode(nM), pTxtObj(NULL) {}
+ aOldESel(rESel), nMode(nM), pTxtObj(nullptr) {}
EditUndoTransliteration::~EditUndoTransliteration()
{
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 45790d1ef255..074198457b3c 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -655,12 +655,12 @@ SfxStyleSheet* EditView::GetStyleSheet()
sal_Int32 nStartPara = pImpEditView->pEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
sal_Int32 nEndPara = pImpEditView->pEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
- SfxStyleSheet* pStyle = NULL;
+ SfxStyleSheet* pStyle = nullptr;
for ( sal_Int32 n = nStartPara; n <= nEndPara; n++ )
{
SfxStyleSheet* pTmpStyle = pImpEditView->pEditEngine->GetStyleSheet( n );
if ( ( n != nStartPara ) && ( pStyle != pTmpStyle ) )
- return NULL; // Not unique.
+ return nullptr; // Not unique.
pStyle = pTmpStyle;
}
return pStyle;
@@ -878,7 +878,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
Sequence< Reference< linguistic2::XDictionary > > aDics;
if (xDicList.is())
{
- const Reference< linguistic2::XDictionary > *pDic = NULL;
+ const Reference< linguistic2::XDictionary > *pDic = nullptr;
// add the default positive dictionary to dic-list (if not already done).
// This is to ensure that there is at least one dictionary to which
// words could be added.
@@ -1115,7 +1115,7 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
}
}
}
- return 0;
+ return nullptr;
}
void EditView::SetInvalidateMore( sal_uInt16 nPixel )
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 547c377ffec9..6f7241013c99 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -132,7 +132,7 @@ bool EditSpellWrapper::SpellMore()
if ( pSpellInfo->bMultipleDoc )
{
bMore = pEE->SpellNextDocument();
- SetCurTextObj( NULL );
+ SetCurTextObj( nullptr );
if ( bMore )
{
// The text has been entered into the engine, when backwords then
@@ -681,7 +681,7 @@ OUString const* EdtAutoCorrDoc::GetPrevPara(bool const)
bBullet = true;
}
if ( bBullet )
- return 0;
+ return nullptr;
for ( sal_Int32 n = nPos; n; )
{
@@ -690,7 +690,7 @@ OUString const* EdtAutoCorrDoc::GetPrevPara(bool const)
if ( pNode->Len() )
return & pNode->GetString();
}
- return 0;
+ return nullptr;
}
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 34b659cf4ede..584634c9c435 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -41,8 +41,8 @@
EditHTMLParser::EditHTMLParser( SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs )
: HTMLParser( rIn, true ),
aBaseURL( rBaseURL ),
- mpEditEngine(NULL),
- pCurAnchor(NULL),
+ mpEditEngine(nullptr),
+ pCurAnchor(nullptr),
bInPara(false),
bWasInPara(false),
bFieldsInserted(false),
@@ -806,7 +806,7 @@ void EditHTMLParser::AnchorEnd()
aCurSel = mpEditEngine->InsertField(aCurSel, aFld);
bFieldsInserted = true;
delete pCurAnchor;
- pCurAnchor = NULL;
+ pCurAnchor = nullptr;
if (mpEditEngine->IsImportHandlerSet())
{
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index f3f3c0919106..92c2582e68cf 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -62,7 +62,7 @@ private:
void ImpInsertParaBreak();
void ImpInsertText( const OUString& rText );
- void ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = 0 );
+ void ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = nullptr );
void ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
protected:
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index bb6cf769cf93..5de7b3286c60 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -83,7 +83,7 @@ EditDLL& EditDLL::Get()
GlobalEditData::GlobalEditData()
{
- ppDefItems = NULL;
+ ppDefItems = nullptr;
}
GlobalEditData::~GlobalEditData()
@@ -206,7 +206,7 @@ EditDLL::~EditDLL()
delete pGlobalData;
}
-static ResMgr* pResMgr=0;
+static ResMgr* pResMgr=nullptr;
ResMgr* EditDLL::GetResMgr()
{
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 3a28f1801d1c..a3b271b2ebba 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -44,7 +44,7 @@ ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSe
nToken = 0;
nTokenValue = 0;
- pAttrs = NULL;
+ pAttrs = nullptr;
}
ImportInfo::~ImportInfo()
@@ -53,7 +53,7 @@ ImportInfo::~ImportInfo()
EditRTFParser::EditRTFParser(
SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine) :
- SvxRTFParser(rAttrPool, rIn, 0),
+ SvxRTFParser(rAttrPool, rIn, nullptr),
mpEditEngine(pEditEngine),
aRTFMapMode(MAP_TWIP)
{
@@ -438,7 +438,7 @@ SvxRTFStyleType* EditRTFParser::FindStyleSheet( const OUString& rName )
if (iter.second->sName == rName)
return iter.second.get();
}
- return NULL;
+ return nullptr;
}
SfxStyleSheet* EditRTFParser::CreateStyleSheet( SvxRTFStyleType* pRTFStyle )
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index aeb8a6841528..40a7efa5e560 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -75,16 +75,16 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo
pEditView = pView;
pEditEngine = pEng;
pOutWin = pWindow;
- pPointer = NULL;
- pBackgroundColor = NULL;
+ pPointer = nullptr;
+ pBackgroundColor = nullptr;
mbTiledRendering = false;
- mpLibreOfficeKitCallback = 0;
- mpLibreOfficeKitData = 0;
+ mpLibreOfficeKitCallback = nullptr;
+ mpLibreOfficeKitData = nullptr;
nScrollDiffX = 0;
nExtraCursorFlags = 0;
nCursorBidiLevel = CURSOR_BIDILEVEL_DONTKNOW;
- pCursor = NULL;
- pDragAndDropInfo = NULL;
+ pCursor = nullptr;
+ pDragAndDropInfo = nullptr;
bReadOnly = false;
bClickedInSelection = false;
eSelectionMode = EE_SELMODE_TXTONLY;
@@ -103,7 +103,7 @@ ImpEditView::~ImpEditView()
RemoveDragAndDropListeners();
if ( pOutWin && ( pOutWin->GetCursor() == pCursor ) )
- pOutWin->SetCursor( NULL );
+ pOutWin->SetCursor( nullptr );
delete pCursor;
delete pBackgroundColor;
@@ -190,7 +190,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, Ou
if (isTiledRendering() && !pRegion)
pRegion = &aRegion;
- tools::PolyPolygon* pPolyPoly = NULL;
+ tools::PolyPolygon* pPolyPoly = nullptr;
if ( pRegion )
pPolyPoly = new tools::PolyPolygon;
@@ -1287,7 +1287,7 @@ void ImpEditView::DeleteSelected()
const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara, sal_Int32* pPos ) const
{
if( !GetOutputArea().IsInside( rPos ) )
- return 0;
+ return nullptr;
Point aDocPos( GetDocPos( rPos ) );
EditPaM aPaM = pEditEngine->GetPaM(aDocPos, false);
@@ -1295,7 +1295,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara,
if ( aPaM.GetIndex() == aPaM.GetNode()->Len() )
{
// Otherwise, whenever the Field at the very end and mouse under the text
- return 0;
+ return nullptr;
}
const CharAttribList::AttribsType& rAttrs = aPaM.GetNode()->GetCharAttribs().GetAttribs();
@@ -1316,7 +1316,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara,
}
}
}
- return NULL;
+ return nullptr;
}
bool ImpEditView::IsBulletArea( const Point& rPos, sal_Int32* pPara )
@@ -1362,7 +1362,7 @@ void ImpEditView::CutCopy( css::uno::Reference< css::datatransfer::clipboard::XC
try
{
- rxClipboard->setContents( xData, NULL );
+ rxClipboard->setContents( xData, nullptr );
// #87756# FlushClipboard, but it would be better to become a TerminateListener to the Desktop and flush on demand...
uno::Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( rxClipboard, uno::UNO_QUERY );
@@ -1642,7 +1642,7 @@ void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestur
SolarMutexGuard aVclGuard;
- pDragAndDropInfo = NULL;
+ pDragAndDropInfo = nullptr;
Point aMousePosPixel( rDGE.DragOriginX, rDGE.DragOriginY );
@@ -1808,7 +1808,7 @@ void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent
HideDDCursor();
ShowCursor( DoAutoScroll(), true );
delete pDragAndDropInfo;
- pDragAndDropInfo = NULL;
+ pDragAndDropInfo = nullptr;
pEditEngine->GetEndDropHdl().Call(GetEditViewPtr());
}
}
@@ -1881,7 +1881,7 @@ void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE
if ( !pDragAndDropInfo->bStarterOfDD )
{
delete pDragAndDropInfo;
- pDragAndDropInfo = NULL;
+ pDragAndDropInfo = nullptr;
}
rDTDE.Context->dropComplete( bChanges );
@@ -1924,7 +1924,7 @@ void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) thr
if ( pDragAndDropInfo && !pDragAndDropInfo->bStarterOfDD )
{
delete pDragAndDropInfo;
- pDragAndDropInfo = NULL;
+ pDragAndDropInfo = nullptr;
}
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 01606191d101..ecfd01b5ffff 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -128,9 +128,9 @@ struct DragAndDropInfo
DragAndDropInfo()
{
- pBackground = NULL; bVisCursor = false; bDroppedInMe = false; bStarterOfDD = false;
+ pBackground = nullptr; bVisCursor = false; bDroppedInMe = false; bStarterOfDD = false;
bHasValidData = false; bUndoAction = false; bOutlinerMode = false;
- nSensibleRange = 0; nCursorWidth = 0; pField = 0; nOutlinerDropDest = 0; bDragAccepted = false;
+ nSensibleRange = 0; nCursorWidth = 0; pField = nullptr; nOutlinerDropDest = 0; bDragAccepted = false;
}
};
@@ -294,7 +294,7 @@ public:
bool IsVertical() const;
- bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL );
+ bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = nullptr );
bool MouseButtonUp( const MouseEvent& rMouseEvent );
bool MouseButtonDown( const MouseEvent& rMouseEvent );
@@ -318,7 +318,7 @@ public:
bool HasSelection() const { return aEditSelection.HasRange(); }
void DrawSelection() { DrawSelection( aEditSelection ); }
- void DrawSelection( EditSelection, vcl::Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL );
+ void DrawSelection( EditSelection, vcl::Region* pRegion = nullptr, OutputDevice* pTargetDevice = nullptr );
void GetSelectionRectangles(std::vector<Rectangle>& rLogicRects);
vcl::Window* GetWindow() const { return pOutWin; }
@@ -556,8 +556,8 @@ private:
bool FinishCreateLines( ParaPortion* pParaPortion );
void CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rStartPos /*, sal_Bool bCreateBlockPortions */ );
void RecalcTextPortion( ParaPortion* pParaPortion, sal_Int32 nStartPos, sal_Int32 nNewChars );
- sal_Int32 SplitTextPortion( ParaPortion* pParaPortion, sal_Int32 nPos, EditLine* pCurLine = 0 );
- void SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0 );
+ sal_Int32 SplitTextPortion( ParaPortion* pParaPortion, sal_Int32 nPos, EditLine* pCurLine = nullptr );
+ void SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr, sal_uInt16 nIgnoreWhich = 0 );
void RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics, SvxFont& rFont );
void CheckAutoPageSize();
@@ -569,7 +569,7 @@ private:
EditPaM ImpInsertParaBreak( const EditSelection& rEditSelection, bool bKeepEndingAttribs = true );
EditPaM ImpInsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
EditPaM ImpInsertFeature(const EditSelection& rCurSel, const SfxPoolItem& rItem);
- void ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditUndoRemoveChars* pCurUndo = 0 );
+ void ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditUndoRemoveChars* pCurUndo = nullptr );
void ImpRemoveParagraph( sal_Int32 nPara );
EditSelection ImpMoveParagraphs( Range aParagraphs, sal_Int32 nNewPos );
@@ -611,7 +611,7 @@ private:
void InitScriptTypes( sal_Int32 nPara );
- sal_uInt16 GetI18NScriptType( const EditPaM& rPaM, sal_Int32* pEndPos = NULL ) const;
+ sal_uInt16 GetI18NScriptType( const EditPaM& rPaM, sal_Int32* pEndPos = nullptr ) const;
SvtScriptType GetItemScriptType( const EditSelection& rSel ) const;
bool IsScriptChange( const EditPaM& rPaM ) const;
bool HasScriptType( sal_Int32 nPara, sal_uInt16 nType ) const;
@@ -707,7 +707,7 @@ public:
inline EditUndoManager& GetUndoManager();
inline ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);
- void SetUpdateMode( bool bUp, EditView* pCurView = 0, bool bForceUpdate = false );
+ void SetUpdateMode( bool bUp, EditView* pCurView = nullptr, bool bForceUpdate = false );
bool GetUpdateMode() const { return bUpdate; }
ViewsType& GetEditViews() { return aEditViews; }
@@ -730,7 +730,7 @@ public:
void InitWritingDirections( sal_Int32 nPara );
bool IsRightToLeft( sal_Int32 nPara ) const;
- sal_uInt8 GetRightToLeft( sal_Int32 nPara, sal_Int32 nChar, sal_Int32* pStart = NULL, sal_Int32* pEnd = NULL );
+ sal_uInt8 GetRightToLeft( sal_Int32 nPara, sal_Int32 nChar, sal_Int32* pStart = nullptr, sal_Int32* pEnd = nullptr );
bool HasDifferentRTLLevels( const ContentNode* pNode );
void SetTextRanger( TextRanger* pRanger );
@@ -744,8 +744,8 @@ public:
void FormatDoc();
void FormatFullDoc();
- void UpdateViews( EditView* pCurView = 0 );
- void Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice = 0, bool bUseVirtDev = false );
+ void UpdateViews( EditView* pCurView = nullptr );
+ void Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr, bool bUseVirtDev = false );
void Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aStartPos, bool bStripOnly = false, short nOrientation = 0 );
bool MouseButtonUp( const MouseEvent& rMouseEvent, EditView* pView );
@@ -783,7 +783,7 @@ public:
EditPaM DeleteSelected(const EditSelection& rEditSelection);
EditPaM InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, bool bIsUserInput = false );
EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
- EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = NULL );
+ EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = nullptr );
EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
EditPaM InsertParaBreak(const EditSelection& rEditSelection);
EditPaM InsertLineBreak(const EditSelection& aEditSelection);
@@ -791,7 +791,7 @@ public:
EditPaM InsertField(const EditSelection& rCurSel, const SvxFieldItem& rFld);
bool UpdateFields();
- EditPaM Read(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, const EditSelection& rSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL);
+ EditPaM Read(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, const EditSelection& rSel, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr);
void Write(SvStream& rOutput, EETextFormat eFormat, const EditSelection& rSel);
EditTextObject* CreateTextObject();
@@ -855,8 +855,8 @@ public:
void SetNotifyHdl( const Link<EENotify&,void>& rLink ) { aNotifyHdl = rLink; }
Link<EENotify&,void> GetNotifyHdl() const { return aNotifyHdl; }
- void FormatAndUpdate( EditView* pCurView = 0 );
- inline void IdleFormatAndUpdate( EditView* pCurView = 0 );
+ void FormatAndUpdate( EditView* pCurView = nullptr );
+ inline void IdleFormatAndUpdate( EditView* pCurView = nullptr );
svtools::ColorConfig& GetColorConfig();
bool IsVisualCursorTravelingEnabled();
@@ -917,10 +917,10 @@ public:
void SetDefaultLanguage( LanguageType eLang ) { eDefLanguage = eLang; }
LanguageType GetDefaultLanguage() const { return eDefLanguage; }
- LanguageType GetLanguage( const EditPaM& rPaM, sal_Int32* pEndPos = NULL ) const;
+ LanguageType GetLanguage( const EditPaM& rPaM, sal_Int32* pEndPos = nullptr ) const;
css::lang::Locale GetLocale( const EditPaM& rPaM ) const;
- void DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, bool bSpellAtCursorPos = false, bool bInteruptable = true );
+ void DoOnlineSpelling( ContentNode* pThisNodeOnly = nullptr, bool bSpellAtCursorPos = false, bool bInteruptable = true );
EESpellState Spell( EditView* pEditView, bool bMultipleDoc );
EESpellState HasSpellErrors();
void ClearSpellErrors();
@@ -972,7 +972,7 @@ public:
SfxItemPool* GetEditTextObjectPool() const { return pTextObjectPool; }
const SvxNumberFormat * GetNumberFormat( const ContentNode* pNode ) const;
- sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const;
+ sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = nullptr, sal_Int32 *pnMinLabelWidth = nullptr ) const;
const SvxLRSpaceItem& GetLRSpaceItem( ContentNode* pNode );
SvxAdjust GetJustification( sal_Int32 nPara ) const;
@@ -1103,7 +1103,7 @@ inline ::svl::IUndoManager* ImpEditEngine::SetUndoManager(::svl::IUndoManager* p
if(pUndoManager)
{
- pUndoManager->SetEditEngine(0);
+ pUndoManager->SetEditEngine(nullptr);
}
pUndoManager = dynamic_cast< EditUndoManager* >(pNew);
@@ -1200,7 +1200,7 @@ inline vcl::Cursor* ImpEditView::GetCursor()
}
void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit );
-void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = NULL, const MapUnit* pDestUnit = NULL );
+void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = nullptr, const MapUnit* pDestUnit = nullptr );
sal_uInt8 GetCharTypeForCompression( sal_Unicode cChar );
Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index b974750cf760..354ba80d21f6 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -103,20 +103,20 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
mbLastTryMerge(false)
{
pEditEngine = pEE;
- pRefDev = NULL;
- pVirtDev = NULL;
- pEmptyItemSet = NULL;
- pActiveView = NULL;
- pSpellInfo = NULL;
- pConvInfo = NULL;
- pTextObjectPool = NULL;
- mpIMEInfos = NULL;
- pStylePool = NULL;
- pUndoManager = NULL;
- pUndoMarkSelection = NULL;
- pTextRanger = NULL;
- pColorConfig = NULL;
- pCTLOptions = NULL;
+ pRefDev = nullptr;
+ pVirtDev = nullptr;
+ pEmptyItemSet = nullptr;
+ pActiveView = nullptr;
+ pSpellInfo = nullptr;
+ pConvInfo = nullptr;
+ pTextObjectPool = nullptr;
+ mpIMEInfos = nullptr;
+ pStylePool = nullptr;
+ pUndoManager = nullptr;
+ pUndoMarkSelection = nullptr;
+ pTextRanger = nullptr;
+ pColorConfig = nullptr;
+ pCTLOptions = nullptr;
nCurTextHeight = 0;
nCurTextHeightNTP = 0;
@@ -151,7 +151,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
// Access data already from here on!
- SetRefDevice( NULL );
+ SetRefDevice( nullptr );
InitDoc( false );
bCallParaInsertedOrDeleted = true;
@@ -390,7 +390,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
bool bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
delete mpIMEInfos;
- mpIMEInfos = NULL;
+ mpIMEInfos = nullptr;
FormatAndUpdate( pView );
@@ -937,7 +937,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
UBiDi* pBidi = ubidi_openSized( aLine.getLength(), 0, &nError );
const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.getLength(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.getLength(), nBidiLevel, nullptr, &nError ); // UChar != sal_Unicode in MinGW
sal_Int32 nVisPos = bStart ? 0 : aLine.getLength()-1;
const sal_Int32 nLogPos = ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
@@ -1057,7 +1057,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
UBiDi* pBidi = ubidi_openSized( aLine.getLength(), 0, &nError );
const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.getLength(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.getLength(), nBidiLevel, nullptr, &nError ); // UChar != sal_Unicode in MinGW
if ( !pEditView->IsInsertMode() )
{
@@ -1636,7 +1636,7 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
}
}
// #112831# Last Field might go from 0xffff to 0x0000
- pField = pField->GetEnd() ? pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, pField->GetEnd() ) : NULL;
+ pField = pField->GetEnd() ? pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, pField->GetEnd() ) : nullptr;
}
OUString aOUText( aText );
@@ -1894,7 +1894,7 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 nPara )
UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError );
nError = U_ZERO_ERROR;
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.getStr()), aText.getLength(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.getStr()), aText.getLength(), nBidiLevel, nullptr, &nError ); // UChar != sal_Unicode in MinGW
nError = U_ZERO_ERROR;
int32_t nCount = ubidi_countRuns( pBidi, &nError );
@@ -1926,7 +1926,7 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 nPara )
bool ImpEditEngine::IsRightToLeft( sal_Int32 nPara ) const
{
bool bR2L = false;
- const SvxFrameDirectionItem* pFrameDirItem = NULL;
+ const SvxFrameDirectionItem* pFrameDirItem = nullptr;
if ( !IsVertical() )
{
@@ -1937,7 +1937,7 @@ bool ImpEditEngine::IsRightToLeft( sal_Int32 nPara ) const
// #103045# if DefaultHorizontalTextDirection is set, use that value, otherwise pool default.
if ( GetDefaultHorizontalTextDirection() != EE_HTEXTDIR_DEFAULT )
{
- pFrameDirItem = NULL; // bR2L already set to default horizontal text direction
+ pFrameDirItem = nullptr; // bR2L already set to default horizontal text direction
}
else
{
@@ -2088,10 +2088,10 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n
nNewPos = nParaCount;
// Height may change when moving first or last Paragraph
- ParaPortion* pRecalc1 = NULL;
- ParaPortion* pRecalc2 = NULL;
- ParaPortion* pRecalc3 = NULL;
- ParaPortion* pRecalc4 = NULL;
+ ParaPortion* pRecalc1 = nullptr;
+ ParaPortion* pRecalc2 = nullptr;
+ ParaPortion* pRecalc3 = nullptr;
+ ParaPortion* pRecalc4 = nullptr;
if ( nNewPos == 0 ) // Move to Start
{
@@ -3407,7 +3407,7 @@ void ImpEditEngine::SetActiveView( EditView* pView )
if ( !pView && mpIMEInfos )
{
delete mpIMEInfos;
- mpIMEInfos = NULL;
+ mpIMEInfos = nullptr;
}
}
@@ -3621,7 +3621,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, bool bSmart
OSL_ENSURE( pPortion->GetLines().Count(), "Empty ParaPortion in GetPaM!" );
- const EditLine* pLine = NULL;
+ const EditLine* pLine = nullptr;
for ( sal_Int32 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
{
const EditLine& rTmpLine = pPortion->GetLines()[nLine];
@@ -4136,7 +4136,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_Int32 nIndex,
OSL_ENSURE( nLineCount, "Empty ParaPortion in GetEditCursor!" );
if (nLineCount == 0)
return Rectangle();
- const EditLine* pLine = NULL;
+ const EditLine* pLine = nullptr;
bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) != 0;
for (sal_Int32 nLine = 0; nLine < nLineCount; ++nLine)
{
@@ -4369,7 +4369,7 @@ void ImpEditEngine::LeaveBlockNotifications()
IMPL_LINK_NOARG_TYPED(ImpEditEngine, DocModified, LinkParamNone*, void)
{
- aModifyHdl.Call( NULL /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner
+ aModifyHdl.Call( nullptr /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index f28970cb8dbe..bbc2f6de6bee 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -293,7 +293,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
// For tiled rendering, we have to always go via Invalidate().
if ( pView == pCurView && !pView->isTiledRendering())
- Paint( pView->pImpEditView, aClipRect, 0, true );
+ Paint( pView->pImpEditView, aClipRect, nullptr, true );
else
pView->GetWindow()->Invalidate( aClipRect );
}
@@ -569,7 +569,7 @@ void ImpEditEngine::CheckPageOverflow()
sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current MaxAutoPaperHeight is " << nBoxHeight);
- sal_uInt32 nTxtHeight = CalcTextHeight(NULL);
+ sal_uInt32 nTxtHeight = CalcTextHeight(nullptr);
SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current Text Height is " << nTxtHeight);
sal_uInt32 nParaCount = GetParaPortions().Count();
@@ -823,7 +823,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
if ( nXWidth <= nTmpWidth ) // while has to be looped once
nXWidth = nTmpWidth+1;
- LongDqPtr pTextRanges = 0;
+ LongDqPtr pTextRanges = nullptr;
long nTextExtraYOffset = 0;
long nTextXOffset = 0;
long nTextLineHeight = 0;
@@ -901,7 +901,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
// search for Portion that no longer fits in line ....
- TextPortion* pPortion = 0;
+ TextPortion* pPortion = nullptr;
bool bBrokenLine = false;
bLineBreak = false;
const EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( pLine->GetStart() );
@@ -1033,7 +1033,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nApproxWC = nXWidth / ( nWidthOrg / nChars );
ExtraPortionInfo *pExtraInfo= pPortion->GetExtraInfos();
if( !nApproxWC ) nApproxWC++;
- if( pExtraInfo == NULL )
+ if( pExtraInfo == nullptr )
{
pExtraInfo = new ExtraPortionInfo();
pExtraInfo->nOrgWidth = nXWidth;
@@ -1280,7 +1280,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
if ( bCompressedChars && pPortion && ( pPortion->GetLen() > 1 ) && pPortion->GetExtraInfos() && pPortion->GetExtraInfos()->bCompressed )
{
// I need the manipulated DXArray for determining the break position...
- long* pDXArray = NULL;
+ long* pDXArray = nullptr;
if (!pLine->GetCharPosArray().empty())
{
pDXArray = &pLine->GetCharPosArray()[0] + (nPortionStart - pLine->GetStart());
@@ -1540,7 +1540,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nEndPortion = pLine->GetEndPortion();
// Next line or maybe a new line....
- pLine = 0;
+ pLine = nullptr;
if ( nLine < pParaPortion->GetLines().Count()-1 )
pLine = &pParaPortion->GetLines()[++nLine];
if ( pLine && ( nIndex >= pNode->Len() ) )
@@ -2263,7 +2263,7 @@ sal_Int32 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_Int32 nPos
sal_Int32 nSplitPortion;
sal_Int32 nTmpPos = 0;
- TextPortion* pTextPortion = NULL;
+ TextPortion* pTextPortion = nullptr;
sal_Int32 nPortions = pPortion->GetTextPortions().Count();
for ( nSplitPortion = 0; nSplitPortion < nPortions; nSplitPortion++ )
{
@@ -2468,7 +2468,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_Int32 nSta
sal_Int32 nPos = 0;
sal_Int32 nEnd = nStartPos-nNewChars;
sal_Int32 nPortions = pParaPortion->GetTextPortions().Count();
- TextPortion* pTP = 0;
+ TextPortion* pTP = nullptr;
for ( nPortion = 0; nPortion < nPortions; nPortion++ )
{
pTP = &pParaPortion->GetTextPortions()[ nPortion ];
@@ -2633,7 +2633,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
pOut->SetOverlineColor();
}
- const SvxLanguageItem* pCJKLanguageItem = NULL;
+ const SvxLanguageItem* pCJKLanguageItem = nullptr;
/*
* Scan through char attributes of pNode
@@ -2761,7 +2761,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
{
// #i75566# Do not use AutoColor when printing OR Pdf export
const bool bPrinting(OUTDEV_PRINTER == pOut->GetOutDevType());
- const bool bPDFExporting(0 != pOut->GetPDFWriter());
+ const bool bPDFExporting(nullptr != pOut->GetPDFWriter());
if ( IsAutoColorEnabled() && !bPrinting && !bPDFExporting)
{
@@ -2886,7 +2886,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
long nFirstVisXPos = - pOutDev->GetMapMode().GetOrigin().X();
long nFirstVisYPos = - pOutDev->GetMapMode().GetOrigin().Y();
- const EditLine* pLine = NULL;
+ const EditLine* pLine = nullptr;
Point aTmpPos;
Point aRedLineTmpPos;
DBG_ASSERT( GetParaPortions().Count(), "No ParaPortion?!" );
@@ -2910,7 +2910,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
// #110496# Added some more optional metafile comments. This
// change: factored out some duplicated code.
GDIMetaFile* pMtf = pOutDev->GetConnectMetaFile();
- const bool bMetafileValid( pMtf != NULL );
+ const bool bMetafileValid( pMtf != nullptr );
long nVertLineSpacing = CalcVertLineSpacing(aStartPos);
@@ -3071,7 +3071,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
OUString aText;
sal_Int32 nTextStart = 0;
sal_Int32 nTextLen = 0;
- const long* pDXArray = 0;
+ const long* pDXArray = nullptr;
std::unique_ptr<long[]> pTmpDXArray;
if ( rTextPortion.GetKind() == PortionKind::TEXT )
@@ -3313,7 +3313,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
}
}
- const SvxFieldData* pFieldData = 0;
+ const SvxFieldData* pFieldData = nullptr;
if(PortionKind::FIELD == rTextPortion.GetKind())
{
@@ -3350,7 +3350,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
// StripPortions() data callback
GetEditEnginePtr()->DrawingText( aOutPos, aText, nTextStart, nTextLen, pDXArray,
aTmpFont, n, nIndex, rTextPortion.GetRightToLeft(),
- aWrongSpellVector.size() ? &aWrongSpellVector : 0,
+ aWrongSpellVector.size() ? &aWrongSpellVector : nullptr,
pFieldData,
bEndOfLine, bEndOfParagraph, false, // support for EOL/EOP TEXT comments
&aLocale,
@@ -3596,12 +3596,12 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
const Color aTextLineColor(pOutDev->GetTextLineColor());
GetEditEnginePtr()->DrawingText(
- aTmpPos, OUString(), 0, 0, 0,
+ aTmpPos, OUString(), 0, 0, nullptr,
aTmpFont, n, nIndex, 0,
- 0,
- 0,
+ nullptr,
+ nullptr,
bEndOfLine, bEndOfParagraph, false,
- 0,
+ nullptr,
aOverlineColor,
aTextLineColor);
}
@@ -3653,12 +3653,12 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
const Color aTextLineColor(pOutDev->GetTextLineColor());
GetEditEnginePtr()->DrawingText(
- aTmpPos, OUString(), 0, 0, 0,
+ aTmpPos, OUString(), 0, 0, nullptr,
aTmpFont, n, nIndex, 0,
- 0,
- 0,
+ nullptr,
+ nullptr,
false, true, false, // support for EOL/EOP TEXT comments
- 0,
+ nullptr,
aOverlineColor,
aTextLineColor);
}
@@ -3840,7 +3840,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev
pTarget->SetMapMode( aOldMapMode );
}
- pView->DrawSelection(pView->GetEditSelection(), 0, pTarget);
+ pView->DrawSelection(pView->GetEditSelection(), nullptr, pTarget);
}
else
{
@@ -3885,7 +3885,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev
// In case of tiled rendering pass a region to DrawSelection(), so that
// selection callbacks are not emitted during every repaint.
vcl::Region aRegion;
- pView->DrawSelection(pView->GetEditSelection(), pView->isTiledRendering() ? &aRegion : 0, pTarget);
+ pView->DrawSelection(pView->GetEditSelection(), pView->isTiledRendering() ? &aRegion : nullptr, pTarget);
}
}
@@ -4072,7 +4072,7 @@ ContentNode* ImpEditEngine::GetPrevVisNode( ContentNode* pCurNode )
pPortion = GetPrevVisPortion( pPortion );
if ( pPortion )
return pPortion->GetNode();
- return 0;
+ return nullptr;
}
ContentNode* ImpEditEngine::GetNextVisNode( ContentNode* pCurNode )
@@ -4082,16 +4082,16 @@ ContentNode* ImpEditEngine::GetNextVisNode( ContentNode* pCurNode )
pPortion = GetNextVisPortion( pPortion );
if ( pPortion )
return pPortion->GetNode();
- return 0;
+ return nullptr;
}
const ParaPortion* ImpEditEngine::GetPrevVisPortion( const ParaPortion* pCurPortion ) const
{
sal_Int32 nPara = GetParaPortions().GetPos( pCurPortion );
DBG_ASSERT( nPara < GetParaPortions().Count() , "Portion not found: GetPrevVisPortion" );
- const ParaPortion* pPortion = nPara ? GetParaPortions()[--nPara] : 0;
+ const ParaPortion* pPortion = nPara ? GetParaPortions()[--nPara] : nullptr;
while ( pPortion && !pPortion->IsVisible() )
- pPortion = nPara ? GetParaPortions()[--nPara] : 0;
+ pPortion = nPara ? GetParaPortions()[--nPara] : nullptr;
return pPortion;
}
@@ -4177,7 +4177,7 @@ EditPaM ImpEditEngine::InsertParagraph( sal_Int32 nPara )
EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 nPara )
{
- EditSelection* pSel = 0;
+ EditSelection* pSel = nullptr;
ContentNode* pNode = GetEditDoc().GetObject( nPara );
SAL_WARN_IF( !pNode, "editeng", "Paragraph does not exist: SelectParagraph" );
if ( pNode )
@@ -4245,7 +4245,7 @@ void ImpEditEngine::SetCharStretching( sal_uInt16 nX, sal_uInt16 nY )
const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode ) const
{
- const SvxNumberFormat *pRes = 0;
+ const SvxNumberFormat *pRes = nullptr;
if (pNode)
{
@@ -4437,7 +4437,7 @@ bool ImpEditEngine::ImplCalcAsianCompression(ContentNode* pNode,
// Percent is 1/100 Percent...
if ( n100thPercentFromMax == 10000 )
- pTextPortion->SetExtraInfos( NULL );
+ pTextPortion->SetExtraInfos( nullptr );
bool bCompressed = false;
@@ -4572,7 +4572,7 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
nCompressed += pTP->GetExtraInfos()->nOrgWidth - pTP->GetSize().Width();
aCompressedPortions.push_back(pTP);
}
- pTP = ( nPortion > pLine->GetStartPortion() ) ? &pParaPortion->GetTextPortions()[ --nPortion ] : NULL;
+ pTP = ( nPortion > pLine->GetStartPortion() ) ? &pParaPortion->GetTextPortions()[ --nPortion ] : nullptr;
}
if ( bFoundCompressedPortion )
@@ -4596,7 +4596,7 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
sal_Int32 nTxtPortion = pParaPortion->GetTextPortions().GetPos( pTP );
sal_Int32 nTxtPortionStart = pParaPortion->GetTextPortions().GetStartPos( nTxtPortion );
DBG_ASSERT( nTxtPortionStart >= pLine->GetStart(), "Portion doesn't belong to the line!!!" );
- long* pDXArray = NULL;
+ long* pDXArray = nullptr;
if (!pLine->GetCharPosArray().empty())
{
pDXArray = &pLine->GetCharPosArray()[0]+( nTxtPortionStart-pLine->GetStart() );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f5ae0db2cab3..4f3e2bd908d8 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -292,7 +292,7 @@ static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_Int32
sal_uInt32 ImpEditEngine::WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicodeStrings)
{
- std::unique_ptr<EditTextObject> xObj(CreateTextObject(rSel, NULL));
+ std::unique_ptr<EditTextObject> xObj(CreateTextObject(rSel, nullptr));
xObj->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
xObj->Store(rOutput);
return 0;
@@ -1515,7 +1515,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc )
}
EESpellState eState = pSpellInfo->eState;
delete pSpellInfo;
- pSpellInfo = 0;
+ pSpellInfo = nullptr;
return eState;
}
@@ -1639,7 +1639,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
pEditView->ShowCursor( true, false );
}
delete pConvInfo;
- pConvInfo = 0;
+ pConvInfo = nullptr;
}
@@ -1987,7 +1987,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView,
//add the portion preceding the error
EditSelection aStartSelection(aSentencePaM.Min(), aCurSel.Min());
if(aStartSelection.HasRange())
- AddPortionIterated(rEditView, aStartSelection, 0, rToFill);
+ AddPortionIterated(rEditView, aStartSelection, nullptr, rToFill);
//add the error portion
AddPortionIterated(rEditView, aCurSel, xAlt, rToFill);
//find the end of the sentence
@@ -1999,7 +1999,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView,
if(xAlt.is())
{
//add the part between the previous and the current error
- AddPortionIterated(rEditView, EditSelection(aCurSel.Max(), aNextSel.Min()), 0, rToFill);
+ AddPortionIterated(rEditView, EditSelection(aCurSel.Max(), aNextSel.Min()), nullptr, rToFill);
//add the current error
AddPortionIterated(rEditView, aNextSel, xAlt, rToFill);
}
@@ -2732,7 +2732,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
bool bChanges = false;
bool bLenChanged = false;
- EditUndoTransliteration* pUndo = NULL;
+ EditUndoTransliteration* pUndo = nullptr;
utl::TransliterationWrapper aTransliterationWrapper( ::comphelper::getProcessComponentContext(), nTransliterationMode );
bool bConsiderLanguage = aTransliterationWrapper.needLanguageForTheMode();
@@ -2972,7 +2972,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
if (bSingleNode && !bHasAttribs)
pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) );
else
- pUndo->SetText( CreateTextObject( aSel, NULL ) );
+ pUndo->SetText( CreateTextObject( aSel, nullptr ) );
}
// now apply the changes from end to start to leave the offsets of the
@@ -3117,7 +3117,7 @@ sal_Int32 ImpEditEngine::LogicToTwips(sal_Int32 n)
{
Size aSz(n, 0);
MapMode aTwipsMode( MAP_TWIP );
- aSz = pRefDev->LogicToLogic( aSz, NULL, &aTwipsMode );
+ aSz = pRefDev->LogicToLogic( aSz, nullptr, &aTwipsMode );
return aSz.Width();
}
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 0c47d9e1833c..187939a5ddb8 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -38,13 +38,13 @@ void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
const SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_Int32 nPara ) const
{
const ContentNode* pNode = aEditDoc.GetObject( nPara );
- return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
+ return pNode ? pNode->GetContentAttribs().GetStyleSheet() : nullptr;
}
SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_Int32 nPara )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
- return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
+ return pNode ? pNode->GetContentAttribs().GetStyleSheet() : nullptr;
}
void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle )
@@ -130,7 +130,7 @@ void ImpEditEngine::RemoveStyleFromParagraphs( SfxStyleSheet* pStyle )
ContentNode* pNode = aEditDoc.GetObject(nNode);
if ( pNode->GetStyleSheet() == pStyle )
{
- pNode->SetStyleSheet( NULL );
+ pNode->SetStyleSheet( nullptr );
ParaAttribsChanged( pNode );
}
}
@@ -143,7 +143,7 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if ( !bDowning )
{
- SfxStyleSheet* pStyle = NULL;
+ SfxStyleSheet* pStyle = nullptr;
sal_uLong nId = 0;
const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast<const SfxStyleSheetHint*>(&rHint);
@@ -188,7 +188,7 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
DBG_ASSERT( nStartNode <= nEndNode, "CreateAttribUndo: Start > End ?!" );
- EditUndoSetAttribs* pUndo = NULL;
+ EditUndoSetAttribs* pUndo = nullptr;
if ( rSet.GetPool() != &aEditDoc.GetItemPool() )
{
SfxItemSet aTmpSet( GetEmptyItemSet() );
@@ -247,7 +247,7 @@ void ImpEditEngine::UndoActionEnd( sal_uInt16 )
{
GetUndoManager().LeaveListAction();
delete pUndoMarkSelection;
- pUndoMarkSelection = NULL;
+ pUndoMarkSelection = nullptr;
}
}
@@ -259,7 +259,7 @@ void ImpEditEngine::InsertUndo( EditUndo* pUndo, bool bTryMerge )
EditUndoMarkSelection* pU = new EditUndoMarkSelection(pEditEngine, *pUndoMarkSelection);
GetUndoManager().AddUndoAction( pU );
delete pUndoMarkSelection;
- pUndoMarkSelection = NULL;
+ pUndoMarkSelection = nullptr;
}
GetUndoManager().AddUndoAction( pUndo, bTryMerge );
@@ -350,7 +350,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnl
}
else if ( aCurSet.GetItemState( nWhich ) == SfxItemState::SET )
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
pItem = &pNode->GetContentAttribs().GetItem( nWhich );
@@ -583,7 +583,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, bool bRemoveParaAttri
sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
- const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0;
+ const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : nullptr;
if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() )
{
@@ -761,7 +761,7 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
if ( pAttr->GetStart() > nLastEnd )
aEditDoc.InsertAttrib( pNode, nLastEnd, pAttr->GetStart(), rItem );
// #112831# Last Attr might go from 0xffff to 0x0000
- pAttr = nLastEnd ? pNode->GetCharAttribs().FindNextAttrib( nWhich, nLastEnd ) : NULL;
+ pAttr = nLastEnd ? pNode->GetCharAttribs().FindNextAttrib( nWhich, nLastEnd ) : nullptr;
}
// And the Rest:
@@ -775,13 +775,13 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
IdleFormattter::IdleFormattter()
{
- pView = 0;
+ pView = nullptr;
nRestarts = 0;
}
IdleFormattter::~IdleFormattter()
{
- pView = 0;
+ pView = nullptr;
}
void IdleFormattter::DoIdleFormat( EditView* pV )
@@ -812,7 +812,7 @@ ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterSt
aPos = rPos;
nLen = 0;
bCursor = true;
- pAttribs = NULL;
+ pAttribs = nullptr;
bWasCursorOverwrite = false;
}
@@ -832,7 +832,7 @@ void ImplIMEInfos::CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL )
void ImplIMEInfos::DestroyAttribs()
{
delete[] pAttribs;
- pAttribs = NULL;
+ pAttribs = nullptr;
nLen = 0;
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 8b43dda6f2b2..5491fbee2ca3 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -383,7 +383,7 @@ void TextConvWrapper::ReplaceUnit(
if (bIsChineseConversion)
ChangeText( aNewTxt, rOrigText, &rOffsets, &aOldSel );
else
- ChangeText( aNewTxt, rOrigText, NULL, NULL );
+ ChangeText( aNewTxt, rOrigText, nullptr, nullptr );
// change language and font if necessary
if (bIsChineseConversion)
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 10b60fd894f0..ab1e9f852891 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -573,19 +573,19 @@ void SvxBorderLine::SetBorderLineStyle( SvxBorderStyle nNew )
m_pColorOutFn = lightColor;
m_pColorInFn = darkColor;
m_bUseLeftTop = true;
- m_pColorGapFn = NULL;
+ m_pColorGapFn = nullptr;
break;
case INSET:
m_pColorOutFn = darkColor;
m_pColorInFn = lightColor;
m_bUseLeftTop = true;
- m_pColorGapFn = NULL;
+ m_pColorGapFn = nullptr;
break;
default:
m_pColorOutFn = darkColor;
m_pColorInFn = darkColor;
m_bUseLeftTop = false;
- m_pColorGapFn = NULL;
+ m_pColorGapFn = nullptr;
break;
}
}
@@ -594,7 +594,7 @@ Color SvxBorderLine::GetColorOut( bool bLeftOrTop ) const
{
Color aResult = aColor;
- if ( m_aWidthImpl.IsDouble() && m_pColorOutFn != NULL )
+ if ( m_aWidthImpl.IsDouble() && m_pColorOutFn != nullptr )
{
if ( !bLeftOrTop && m_bUseLeftTop )
aResult = (*m_pColorInFn)( aColor );
@@ -609,7 +609,7 @@ Color SvxBorderLine::GetColorIn( bool bLeftOrTop ) const
{
Color aResult = aColor;
- if ( m_aWidthImpl.IsDouble() && m_pColorInFn != NULL )
+ if ( m_aWidthImpl.IsDouble() && m_pColorInFn != nullptr )
{
if ( !bLeftOrTop && m_bUseLeftTop )
aResult = (*m_pColorOutFn)( aColor );
@@ -624,7 +624,7 @@ Color SvxBorderLine::GetColorGap( ) const
{
Color aResult = aColor;
- if ( m_aWidthImpl.IsDouble() && m_pColorGapFn != NULL )
+ if ( m_aWidthImpl.IsDouble() && m_pColorGapFn != nullptr )
{
aResult = (*m_pColorGapFn)( aColor );
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 3207391fb2a3..0b803705354d 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -109,7 +109,7 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
: SfxPoolItem(_nWhich)
- , pGraphicObject(NULL)
+ , pGraphicObject(nullptr)
, nStart(0)
, nStyle(SvxBulletStyle::ABC_BIG)
, nScale(0)
@@ -167,7 +167,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem )
{
aFont = rItem.aFont;
- pGraphicObject = ( rItem.pGraphicObject ? new GraphicObject( *rItem.pGraphicObject ) : NULL );
+ pGraphicObject = ( rItem.pGraphicObject ? new GraphicObject( *rItem.pGraphicObject ) : nullptr );
aPrevText = rItem.aPrevText;
aFollowText = rItem.aFollowText;
nStart = rItem.nStart;
@@ -211,7 +211,7 @@ void SvxBulletItem::SetDefaultFont_Impl()
void SvxBulletItem::SetDefaults_Impl()
{
- pGraphicObject = NULL;
+ pGraphicObject = nullptr;
nWidth = 1200; // 1.2cm
nStart = 1;
nStyle = SvxBulletStyle::N123;
@@ -294,7 +294,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
if( pGraphicObject )
{
delete( const_cast< SvxBulletItem* >( this )->pGraphicObject );
- const_cast< SvxBulletItem* >( this )->pGraphicObject = NULL;
+ const_cast< SvxBulletItem* >( this )->pGraphicObject = nullptr;
}
const_cast< SvxBulletItem* >( this )->nStyle = SvxBulletStyle::NONE;
@@ -391,7 +391,7 @@ void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject )
if( pGraphicObject )
{
delete pGraphicObject;
- pGraphicObject = NULL;
+ pGraphicObject = nullptr;
}
}
else
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 73cb29c2f308..6018d635b7b9 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -40,7 +40,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
{
uno::Reference<beans::XPropertySet> xPropSet(xTextContent, uno::UNO_QUERY);
if (!xPropSet.is())
- return NULL;
+ return nullptr;
// we do not support these fields from Writer, so make sure we do not throw
// here - see fdo#63436 how to possibly extend Writer to make use of this
@@ -48,7 +48,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
try {
aAny = xPropSet->getPropertyValue(UNO_TC_PROP_TEXTFIELD_TYPE);
if ( !aAny.has<sal_Int32>() )
- return NULL;
+ return nullptr;
sal_Int32 nFieldType = aAny.get<sal_Int32>();
@@ -214,10 +214,10 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
};
} catch ( const beans::UnknownPropertyException& )
{
- return NULL;
+ return nullptr;
}
- return NULL;
+ return nullptr;
}
TYPEINIT1( SvxFieldItem, SfxPoolItem );
@@ -296,7 +296,7 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
SfxPoolItem ( rItem )
{
- pField = rItem.GetField() ? rItem.GetField()->Clone() : 0;
+ pField = rItem.GetField() ? rItem.GetField()->Clone() : nullptr;
}
@@ -317,7 +317,7 @@ SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
- SvxFieldData* pData = 0;
+ SvxFieldData* pData = nullptr;
SvPersistStream aPStrm( GetClassManager(), &rStrm );
aPStrm >> pData;
@@ -501,7 +501,7 @@ OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumbe
double fDiffDate = aDate - *(rFormatter.GetNullDate());
OUString aStr;
- Color* pColor = NULL;
+ Color* pColor = nullptr;
rFormatter.GetOutputString( fDiffDate, nFormatKey, aStr, &pColor );
return aStr;
}
@@ -561,7 +561,7 @@ static void write_unicode( SvPersistStream & rStm, const OUString& rString )
static OUString read_unicode( SvPersistStream & rStm )
{
- rtl_uString *pStr = NULL;
+ rtl_uString *pStr = nullptr;
sal_uInt16 nL = 0;
rStm.ReadUInt16( nL );
const size_t nMaxRecords = rStm.remainingSize() / sizeof(sal_Unicode);
@@ -917,7 +917,7 @@ OUString SvxExtTimeField::GetFormatted( tools::Time& aTime, SvxTimeFormat eForma
double fFracTime = aTime.GetTimeInDays();
OUString aStr;
- Color* pColor = NULL;
+ Color* pColor = nullptr;
rFormatter.GetOutputString( fFracTime, nFormatKey, aStr, &pColor );
return aStr;
}
@@ -1180,7 +1180,7 @@ OUString SvxAuthorField::GetFormatted() const
return aString;
}
-static SvClassManager* pClassMgr=0;
+static SvClassManager* pClassMgr=nullptr;
SvClassManager& SvxFieldItem::GetClassManager()
{
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3aa5888af877..575bf495066b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1612,10 +1612,10 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) :
nRightDist ( rCpy.nRightDist )
{
- pTop = rCpy.GetTop() ? new SvxBorderLine( *rCpy.GetTop() ) : 0;
- pBottom = rCpy.GetBottom() ? new SvxBorderLine( *rCpy.GetBottom() ) : 0;
- pLeft = rCpy.GetLeft() ? new SvxBorderLine( *rCpy.GetLeft() ) : 0;
- pRight = rCpy.GetRight() ? new SvxBorderLine( *rCpy.GetRight() ) : 0;
+ pTop = rCpy.GetTop() ? new SvxBorderLine( *rCpy.GetTop() ) : nullptr;
+ pBottom = rCpy.GetBottom() ? new SvxBorderLine( *rCpy.GetBottom() ) : nullptr;
+ pLeft = rCpy.GetLeft() ? new SvxBorderLine( *rCpy.GetLeft() ) : nullptr;
+ pRight = rCpy.GetRight() ? new SvxBorderLine( *rCpy.GetRight() ) : nullptr;
}
@@ -1623,10 +1623,10 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) :
SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
- pTop ( 0 ),
- pBottom ( 0 ),
- pLeft ( 0 ),
- pRight ( 0 ),
+ pTop ( nullptr ),
+ pBottom ( nullptr ),
+ pLeft ( nullptr ),
+ pRight ( nullptr ),
nTopDist ( 0 ),
nBottomDist ( 0 ),
nLeftDist ( 0 ),
@@ -1869,7 +1869,7 @@ lcl_setLine(const uno::Any& rAny, Item& rItem, Line nLine, const bool bConvert)
{
SvxBorderLine aLine;
bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
- rItem.SetLine( bSet ? &aLine : NULL, nLine);
+ rItem.SetLine( bSet ? &aLine : nullptr, nLine);
bDone = true;
}
return bDone;
@@ -2067,7 +2067,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return false;
bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
- SetLine(bSet ? &aLine : 0, nLine);
+ SetLine(bSet ? &aLine : nullptr, nLine);
}
return true;
@@ -2339,7 +2339,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const
{
- const SvxBorderLine *pRet = 0;
+ const SvxBorderLine *pRet = nullptr;
switch ( nLine )
{
@@ -2367,7 +2367,7 @@ const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const
void SvxBoxItem::SetLine( const SvxBorderLine* pNew, SvxBoxItemLine nLine )
{
- SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : 0;
+ SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr;
switch ( nLine )
{
@@ -2462,7 +2462,7 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, SvxBoxItemLine nLine )
sal_uInt16 SvxBoxItem::CalcLineSpace( SvxBoxItemLine nLine, bool bIgnoreLine ) const
{
- SvxBorderLine* pTmp = 0;
+ SvxBorderLine* pTmp = nullptr;
sal_uInt16 nDist = 0;
switch ( nLine )
{
@@ -2499,8 +2499,8 @@ sal_uInt16 SvxBoxItem::CalcLineSpace( SvxBoxItemLine nLine, bool bIgnoreLine ) c
SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
- pHori ( 0 ),
- pVert ( 0 ),
+ pHori ( nullptr ),
+ pVert ( nullptr ),
mbEnableHor( false ),
mbEnableVer( false ),
nDefDist( 0 )
@@ -2516,8 +2516,8 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) :
mbEnableHor( rCpy.mbEnableHor ),
mbEnableVer( rCpy.mbEnableVer )
{
- pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0;
- pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0;
+ pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : nullptr;
+ pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : nullptr;
bDist = rCpy.IsDist();
bMinDist = rCpy.IsMinDist();
nValidFlags = rCpy.nValidFlags;
@@ -2538,8 +2538,8 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy )
{
delete pHori;
delete pVert;
- pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0;
- pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0;
+ pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : nullptr;
+ pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : nullptr;
mbEnableHor = rCpy.mbEnableHor;
mbEnableVer = rCpy.mbEnableVer;
bDist = rCpy.IsDist();
@@ -2572,7 +2572,7 @@ bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const
void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLine )
{
- SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : 0;
+ SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr;
if ( SvxBoxInfoItemLine::HORI == nLine )
{
@@ -3106,7 +3106,7 @@ SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
SfxPoolItem ( nId ),
- pLine( NULL )
+ pLine( nullptr )
{
}
@@ -3116,7 +3116,7 @@ SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) :
SfxPoolItem ( rCpy )
{
- pLine = rCpy.GetLine() ? new SvxBorderLine( *rCpy.GetLine() ) : 0;
+ pLine = rCpy.GetLine() ? new SvxBorderLine( *rCpy.GetLine() ) : nullptr;
}
@@ -3294,7 +3294,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
void SvxLineItem::SetLine( const SvxBorderLine* pNew )
{
delete pLine;
- pLine = pNew ? new SvxBorderLine( *pNew ) : 0;
+ pLine = pNew ? new SvxBorderLine( *pNew ) : nullptr;
}
// class SvxBrushItem ----------------------------------------------------
@@ -3313,7 +3313,7 @@ public:
//copied to the GraphicObject when necessary
SvStream* pStream;
- explicit SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
+ explicit SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(nullptr) {}
};
@@ -3324,7 +3324,7 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
aColor ( COL_TRANSPARENT ),
nShadingValue ( ShadingPattern::CLEAR ),
- pImpl ( new SvxBrushItem_Impl( 0 ) ),
+ pImpl ( new SvxBrushItem_Impl( nullptr ) ),
maStrLink (),
maStrFilter (),
eGraphicPos ( GPOS_NONE ),
@@ -3341,7 +3341,7 @@ SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) :
aColor ( rColor ),
nShadingValue ( ShadingPattern::CLEAR ),
- pImpl ( new SvxBrushItem_Impl( 0 ) ),
+ pImpl ( new SvxBrushItem_Impl( nullptr ) ),
maStrLink (),
maStrFilter (),
eGraphicPos ( GPOS_NONE ),
@@ -3398,7 +3398,7 @@ SvxBrushItem::SvxBrushItem(
aColor ( COL_TRANSPARENT ),
nShadingValue ( ShadingPattern::CLEAR ),
- pImpl ( new SvxBrushItem_Impl( NULL ) ),
+ pImpl ( new SvxBrushItem_Impl( nullptr ) ),
maStrLink ( rLink ),
maStrFilter ( rFilter ),
eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ),
@@ -3415,7 +3415,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
: SfxPoolItem( _nWhich )
, aColor ( COL_TRANSPARENT )
, nShadingValue ( ShadingPattern::CLEAR )
- , pImpl ( new SvxBrushItem_Impl( NULL ) )
+ , pImpl ( new SvxBrushItem_Impl( nullptr ) )
, maStrLink ()
, maStrFilter ()
, eGraphicPos ( GPOS_NONE )
@@ -3529,7 +3529,7 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
SfxPoolItem( rItem.Which() ),
nShadingValue ( ShadingPattern::CLEAR ),
- pImpl ( new SvxBrushItem_Impl( NULL ) ),
+ pImpl ( new SvxBrushItem_Impl( nullptr ) ),
maStrLink (),
maStrFilter (),
eGraphicPos ( GPOS_NONE ),
@@ -3910,7 +3910,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
// when graphics already loaded, use as a cache
{
if (SvtSecurityOptions().isUntrustedReferer(referer)) {
- return 0;
+ return nullptr;
}
pImpl->pStream = utl::UcbStreamHelper::CreateStream( maStrLink, STREAM_STD_READ );
if( pImpl->pStream && !pImpl->pStream->GetError() )
@@ -3920,7 +3920,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN );
nRes = GraphicFilter::GetGraphicFilter().
ImportGraphic( aGraphic, maStrLink, *pImpl->pStream,
- GRFILTER_FORMAT_DONTKNOW, NULL, GraphicFilterImportFlags::DontSetLogsizeForJpeg );
+ GRFILTER_FORMAT_DONTKNOW, nullptr, GraphicFilterImportFlags::DontSetLogsizeForJpeg );
if( nRes != GRFILTER_OK )
{
@@ -3965,7 +3965,7 @@ void SvxBrushItem::setGraphicTransparency(sal_Int8 nNew)
const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const
{
const GraphicObject* pGrafObj = GetGraphicObject(referer);
- return( pGrafObj ? &( pGrafObj->GetGraphic() ) : NULL );
+ return( pGrafObj ? &( pGrafObj->GetGraphic() ) : nullptr );
}
@@ -4108,7 +4108,7 @@ WallpaperStyle SvxBrushItem::GraphicPos2WallpaperStyle( SvxGraphicPosition ePos
SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich ) :
SfxPoolItem ( _nWhich ),
nShadingValue ( ShadingPattern::CLEAR ),
- pImpl ( new SvxBrushItem_Impl( 0 ) ),
+ pImpl ( new SvxBrushItem_Impl( nullptr ) ),
maStrLink (),
maStrFilter (),
bLoadAgain ( true )
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index e38e0cd75e38..bd68ff001874 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::style;
sal_Int32 SvxNumberType::nRefCount = 0;
-css::uno::Reference<css::text::XNumberingFormatter> SvxNumberType::xFormatter = 0;
+css::uno::Reference<css::text::XNumberingFormatter> SvxNumberType::xFormatter = nullptr;
static void lcl_getFormatter(css::uno::Reference<css::text::XNumberingFormatter>& _xFormatter)
{
if(!_xFormatter.is())
@@ -95,7 +95,7 @@ SvxNumberType::SvxNumberType(const SvxNumberType& rType) :
SvxNumberType::~SvxNumberType()
{
if(!--nRefCount)
- xFormatter = 0;
+ xFormatter = nullptr;
}
OUString SvxNumberType::GetNumStr( sal_uLong nNo ) const
@@ -164,17 +164,17 @@ SvxNumberFormat::SvxNumberFormat( sal_Int16 eType,
mnListtabPos( 0 ),
mnFirstLineIndent( 0 ),
mnIndentAt( 0 ),
- pGraphicBrush(0),
+ pGraphicBrush(nullptr),
eVertOrient(text::VertOrientation::NONE),
- pBulletFont(0)
+ pBulletFont(nullptr)
{
}
SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat& rFormat) :
SvxNumberType(rFormat),
mePositionAndSpaceMode( rFormat.mePositionAndSpaceMode ),
- pGraphicBrush(0),
- pBulletFont(0)
+ pGraphicBrush(nullptr),
+ pBulletFont(nullptr)
{
*this = rFormat;
}
@@ -213,7 +213,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
pGraphicBrush = new SvxBrushItem( SID_ATTR_BRUSH );
pGraphicBrush = static_cast<SvxBrushItem*>(pGraphicBrush->Create( rStream, BRUSH_GRAPHIC_VERSION ));
}
- else pGraphicBrush = 0;
+ else pGraphicBrush = nullptr;
rStream.ReadUInt16( nTmp16 ); eVertOrient = nTmp16;
sal_uInt16 hasBulletFont = 0;
@@ -223,7 +223,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
pBulletFont = new vcl::Font( );
ReadFont( rStream, *pBulletFont );
}
- else pBulletFont = NULL;
+ else pBulletFont = nullptr;
ReadPair( rStream, aGraphicSize );
ReadColor( rStream, nBulletColor );
@@ -398,7 +398,7 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
if(!pBrushItem)
{
delete pGraphicBrush;
- pGraphicBrush = 0;
+ pGraphicBrush = nullptr;
}
else if ( !pGraphicBrush || (*pBrushItem != *pGraphicBrush) )
{
@@ -442,7 +442,7 @@ sal_Int16 SvxNumberFormat::GetVertOrient() const
void SvxNumberFormat::SetBulletFont(const vcl::Font* pFont)
{
delete pBulletFont;
- pBulletFont = pFont ? new vcl::Font(*pFont): 0;
+ pBulletFont = pFont ? new vcl::Font(*pFont): nullptr;
}
void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode )
@@ -554,8 +554,8 @@ OUString SvxNumberFormat::GetCharFormatName()const
}
sal_Int32 SvxNumRule::nRefCount = 0;
-static SvxNumberFormat* pStdNumFmt = 0;
-static SvxNumberFormat* pStdOutlineNumFmt = 0;
+static SvxNumberFormat* pStdNumFmt = nullptr;
+static SvxNumberFormat* pStdOutlineNumFmt = nullptr;
SvxNumRule::SvxNumRule( SvxNumRuleFlags nFeatures,
sal_uInt16 nLevels,
bool bCont,
@@ -604,7 +604,7 @@ SvxNumRule::SvxNumRule( SvxNumRuleFlags nFeatures,
}
}
else
- aFmts[i] = 0;
+ aFmts[i] = nullptr;
aFmtsSet[i] = false;
}
}
@@ -623,7 +623,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
if(rCopy.aFmts[i])
aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
else
- aFmts[i] = 0;
+ aFmts[i] = nullptr;
aFmtsSet[i] = rCopy.aFmtsSet[i];
}
}
@@ -650,7 +650,7 @@ SvxNumRule::SvxNumRule( SvStream &rStream )
}
else
{
- aFmts[i] = 0;
+ aFmts[i] = nullptr;
aFmtsSet[i] = false; // actually only false is valid
}
}
@@ -667,7 +667,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
rStream.WriteUInt16( sal_uInt16(bContinuousNumbering) );
rStream.WriteUInt16( static_cast<sal_uInt16>(eNumberingType) );
- FontToSubsFontConverter pConverter = 0;
+ FontToSubsFontConverter pConverter = nullptr;
bool bConvertBulletFont = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_50 ) && ( rStream.GetVersion() );
for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
@@ -717,7 +717,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
if(rCopy.aFmts[i])
aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
else
- aFmts[i] = 0;
+ aFmts[i] = nullptr;
aFmtsSet[i] = rCopy.aFmtsSet[i];
}
return *this;
@@ -749,9 +749,9 @@ const SvxNumberFormat* SvxNumRule::Get(sal_uInt16 nLevel)const
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
if( nLevel < SVX_MAX_NUM )
- return aFmtsSet[nLevel] ? aFmts[nLevel] : 0;
+ return aFmtsSet[nLevel] ? aFmts[nLevel] : nullptr;
else
- return 0;
+ return nullptr;
}
const SvxNumberFormat& SvxNumRule::GetLevel(sal_uInt16 nLevel)const
@@ -797,13 +797,13 @@ void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
if( nLevel < SVX_MAX_NUM )
{
- aFmtsSet[nLevel] = 0 != pFmt;
+ aFmtsSet[nLevel] = nullptr != pFmt;
if(pFmt)
SetLevel(nLevel, *pFmt);
else
{
delete aFmts[nLevel];
- aFmts[nLevel] = 0;
+ aFmts[nLevel] = nullptr;
}
}
}
@@ -872,10 +872,10 @@ bool SvxNumRule::UnLinkGraphics()
const SvxBrushItem* pBrush = aFmt.GetBrush();
if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
{
- const Graphic* pGraphic = NULL;
+ const Graphic* pGraphic = nullptr;
if(pBrush &&
!pBrush->GetGraphicLink().isEmpty() &&
- 0 != (pGraphic = pBrush->GetGraphic()))
+ nullptr != (pGraphic = pBrush->GetGraphic()))
{
SvxBrushItem aTempItem(*pBrush);
aTempItem.SetGraphicLink("");
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 709d26375588..ad06c25257bb 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3378,7 +3378,7 @@ SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
SfxPoolItem* SvxScriptSetItem::Create( SvStream &, sal_uInt16 ) const
{
- return 0;
+ return nullptr;
}
const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet(
@@ -3387,7 +3387,7 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet(
const SfxPoolItem* pI;
SfxItemState eSt = rSet.GetItemState( nId, false, &pI );
if( SfxItemState::SET != eSt )
- pI = SfxItemState::DEFAULT == eSt ? &rSet.Get( nId ) : 0;
+ pI = SfxItemState::DEFAULT == eSt ? &rSet.Get( nId ) : nullptr;
return pI;
}
@@ -3405,29 +3405,29 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nSlotId, const
pRet = GetItemOfScriptSet( rSet, nComplex );
} else if (nScript == (SvtScriptType::LATIN|SvtScriptType::ASIAN))
{
- if( 0 == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
- 0 == (pAsn = GetItemOfScriptSet( rSet, nAsian )) ||
+ if( nullptr == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
+ nullptr == (pAsn = GetItemOfScriptSet( rSet, nAsian )) ||
*pRet != *pAsn )
- pRet = 0;
+ pRet = nullptr;
} else if (nScript == (SvtScriptType::LATIN|SvtScriptType::COMPLEX))
{
- if( 0 == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
- 0 == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
+ if( nullptr == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
+ nullptr == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
*pRet != *pCmplx )
- pRet = 0;
+ pRet = nullptr;
} else if (nScript == (SvtScriptType::ASIAN|SvtScriptType::COMPLEX))
{
- if( 0 == (pRet = GetItemOfScriptSet( rSet, nAsian )) ||
- 0 == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
+ if( nullptr == (pRet = GetItemOfScriptSet( rSet, nAsian )) ||
+ nullptr == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
*pRet != *pCmplx )
- pRet = 0;
+ pRet = nullptr;
} else if (nScript == (SvtScriptType::LATIN|SvtScriptType::ASIAN|SvtScriptType::COMPLEX))
{
- if( 0 == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
- 0 == (pAsn = GetItemOfScriptSet( rSet, nAsian )) ||
- 0 == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
+ if( nullptr == (pRet = GetItemOfScriptSet( rSet, nLatin )) ||
+ nullptr == (pAsn = GetItemOfScriptSet( rSet, nAsian )) ||
+ nullptr == (pCmplx = GetItemOfScriptSet( rSet, nComplex )) ||
*pRet != *pAsn || *pRet != *pCmplx )
- pRet = 0;
+ pRet = nullptr;
} else {
//no one valid -> match to latin
pRet = GetItemOfScriptSet( rSet, nLatin );
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 1ba2575ff674..50449a0b34cf 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -51,7 +51,7 @@ SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
SfxPoolItem* SvxWritingModeItem::Create( SvStream & , sal_uInt16 ) const
{
OSL_FAIL("SvxWritingModeItem should not be streamed!");
- return NULL;
+ return nullptr;
}
SvStream& SvxWritingModeItem::Store( SvStream & rStrm, sal_uInt16 ) const
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 7f595d60fcd1..6906e5ed2648 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -84,9 +84,9 @@ bool SvXMLAttrContainerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMembe
bool SvXMLAttrContainerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
Reference<XInterface> xRef;
- SvUnoAttributeContainer* pContainer = NULL;
+ SvUnoAttributeContainer* pContainer = nullptr;
- if( rVal.getValue() != NULL && rVal.getValueType().getTypeClass() == TypeClass_INTERFACE )
+ if( rVal.getValue() != nullptr && rVal.getValueType().getTypeClass() == TypeClass_INTERFACE )
{
xRef = *static_cast<Reference<XInterface> const *>(rVal.getValue());
Reference<XUnoTunnel> xTunnel(xRef, UNO_QUERY);
@@ -120,7 +120,7 @@ bool SvXMLAttrContainerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nM
const OUString aName( *pNames++ );
aAny = xContainer->getByName( aName );
- if( aAny.getValue() == NULL || aAny.getValueType() != cppu::UnoType<AttributeData>::get() )
+ if( aAny.getValue() == nullptr || aAny.getValueType() != cppu::UnoType<AttributeData>::get() )
return false;
AttributeData const * pData = static_cast<AttributeData const *>(aAny.getValue());
diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx
index e148318146b5..1a6dbd16401a 100644
--- a/editeng/source/lookuptree/Trie.cxx
+++ b/editeng/source/lookuptree/Trie.cxx
@@ -43,7 +43,7 @@ TrieNode::TrieNode(sal_Unicode aCharacter) :
{
for (int i=0; i<LATIN_ARRAY_SIZE; i++)
{
- mLatinArray[i] = NULL;
+ mLatinArray[i] = nullptr;
}
}
@@ -96,7 +96,7 @@ TrieNode* TrieNode::findChild(sal_Unicode aInputCharacter)
return pCurrent;
}
- return NULL;
+ return nullptr;
}
void TrieNode::collectSuggestions(const OUString& sPath, vector<OUString>& rSuggestionList)
@@ -105,7 +105,7 @@ void TrieNode::collectSuggestions(const OUString& sPath, vector<OUString>& rSugg
for (int i=0; i<LATIN_ARRAY_SIZE; i++)
{
TrieNode* pCurrent = mLatinArray[i];
- if (pCurrent != NULL)
+ if (pCurrent != nullptr)
collectSuggestionsForCurrentNode(pCurrent, sPath, rSuggestionList);
}
@@ -114,7 +114,7 @@ void TrieNode::collectSuggestions(const OUString& sPath, vector<OUString>& rSugg
for(iNode = mChildren.begin(); iNode != mChildren.end(); ++iNode)
{
TrieNode* pCurrent = *iNode;
- if (pCurrent != NULL)
+ if (pCurrent != nullptr)
collectSuggestionsForCurrentNode(pCurrent, sPath, rSuggestionList);
}
}
@@ -138,8 +138,8 @@ TrieNode* TrieNode::traversePath(const OUString& sPath)
{
sal_Unicode aCurrentChar = sPath[i];
pCurrent = pCurrent->findChild(aCurrentChar);
- if ( pCurrent == NULL )
- return NULL;
+ if ( pCurrent == nullptr )
+ return nullptr;
}
return pCurrent;
@@ -171,7 +171,7 @@ void Trie::insert(const OUString& sInputString) const
{
aCurrentChar = sInputString[i];
TrieNode* pChild = pCurrent->findChild(aCurrentChar);
- if ( pChild == NULL )
+ if ( pChild == nullptr )
{
TrieNode* pNewNode = new TrieNode(aCurrentChar);
pCurrent->addNewChild(pNewNode);
@@ -190,7 +190,7 @@ void Trie::findSuggestions(const OUString& sWordPart, vector<OUString>& rSuggest
{
TrieNode* pNode = mRoot->traversePath(sWordPart);
- if (pNode != NULL)
+ if (pNode != nullptr)
{
pNode->collectSuggestions(sWordPart, rSuggestionList);
}
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 082f894b0b50..1391d993316a 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -32,7 +32,7 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const css::uno::Refere
const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault )
{
- css::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
+ css::i18n::ForbiddenCharacters* pForbiddenCharacters = nullptr;
Map::iterator it = maMap.find( nLanguage );
if ( it != maMap.end() )
pForbiddenCharacters = &(it->second);
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index b3d639094827..374463dd85e8 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -237,7 +237,7 @@ namespace editeng
sal_Int32 _nOptions,
bool _bIsInteractive,
HangulHanjaConversion* _pAntiImpl )
- : m_pConversionDialog( NULL )
+ : m_pConversionDialog( nullptr )
, m_pUIParent( _pUIParent )
, m_xContext( rxContext )
, m_aSourceLocale( _rSourceLocale )
@@ -734,7 +734,7 @@ namespace editeng
//remind this decision
m_aRecentlyUsedList[ GetCurrentUnit() ] = _rChangeInto;
- LanguageType *pNewUnitLang = 0;
+ LanguageType *pNewUnitLang = nullptr;
LanguageType nNewUnitLang = LANGUAGE_NONE;
if (m_eConvType == HHC::eConvSimplifiedTraditional)
{
@@ -917,7 +917,7 @@ namespace editeng
bool bHaveToHanja = ( aToHanja.Boundary.startPos < aToHanja.Boundary.endPos );
bool bHaveToHangul = ( aToHangul.Boundary.startPos < aToHangul.Boundary.endPos );
- TextConversionResult* pResult = NULL;
+ TextConversionResult* pResult = nullptr;
if ( bHaveToHanja && bHaveToHangul )
{ // it found convertibles in both directions -> use the first
if ( aToHangul.Boundary.startPos < aToHanja.Boundary.startPos )
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 62ec29ddb7aa..8f4801681061 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -150,7 +150,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn,
pWin ( pWn ),
xSpell ( xSpellChecker ),
- mpTextObj( NULL),
+ mpTextObj( nullptr),
bOtherCntnt ( bOther ),
bDialog ( false ),
bHyphen ( false ),
@@ -173,7 +173,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn,
const bool bStart, const bool bOther ) :
pWin ( pWn ),
xHyph ( xHyphenator ),
- mpTextObj( NULL),
+ mpTextObj( nullptr),
bOtherCntnt ( bOther ),
bDialog ( false ),
bHyphen ( false ),
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 0b700402de6c..8ca501939d4d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -276,7 +276,7 @@ SvxAutoCorrect::SvxAutoCorrect( const OUString& rShareAutocorrFile,
: sShareAutoCorrFile( rShareAutocorrFile )
, sUserAutoCorrFile( rUserAutocorrFile )
, m_pLangTable( new std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> )
- , pCharClass( 0 )
+ , pCharClass( nullptr )
, bRunNext( false )
, eCharClassLang( LANGUAGE_DONTKNOW )
, nFlags(SvxAutoCorrect::GetDefaultFlags())
@@ -294,7 +294,7 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
, sUserAutoCorrFile( rCpy.sUserAutoCorrFile )
, aSwFlags( rCpy.aSwFlags )
, m_pLangTable( new std::map<LanguageTag, std::unique_ptr<SvxAutoCorrectLanguageLists>> )
- , pCharClass( 0 )
+ , pCharClass( nullptr )
, bRunNext( false )
, eCharClassLang(rCpy.eCharClassLang)
, nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad))
@@ -801,8 +801,8 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
OUString aText( rTxt );
const sal_Unicode *pStart = aText.getStr(),
*pStr = pStart + nEndPos,
- *pWordStt = 0,
- *pDelim = 0;
+ *pWordStt = nullptr,
+ *pDelim = nullptr;
bool bAtStart = false;
do {
@@ -898,7 +898,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
// Found [ \t]+[A-Z0-9]+ until here. Test now on the paragraph separator.
// all three can happen, but not more than once!
- const sal_Unicode* pExceptStt = 0;
+ const sal_Unicode* pExceptStt = nullptr;
if( !bAtStart )
{
bool bContinue = true;
@@ -956,7 +956,7 @@ bool SvxAutoCorrect::FnCapitalStartSentence( SvxAutoCorrDoc& rDoc,
}
} while( bContinue );
if( C_FULL_STOP != nFlag )
- pExceptStt = 0;
+ pExceptStt = nullptr;
}
if( 2 > ( pStr - pStart ) )
@@ -1323,7 +1323,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
if( IsAutoCorrFlag( Autocorrect ) )
{
OUString aPara;
- OUString* pPara = IsAutoCorrFlag(CapitalStartSentence) ? &aPara : 0;
+ OUString* pPara = IsAutoCorrFlag(CapitalStartSentence) ? &aPara : nullptr;
// since LibO 4.1, '-' is a word separator
// fdo#67742 avoid "--" to be replaced by "–" if next is "-"
@@ -1461,7 +1461,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
bool SvxAutoCorrect::AddCplSttException( const OUString& rNew,
LanguageType eLang )
{
- SvxAutoCorrectLanguageLists* pLists = 0;
+ SvxAutoCorrectLanguageLists* pLists = nullptr;
// either the right language is present or it will be this in the general list
auto iter = m_pLangTable->find(LanguageTag(eLang));
if (iter != m_pLangTable->end())
@@ -1483,7 +1483,7 @@ bool SvxAutoCorrect::AddCplSttException( const OUString& rNew,
bool SvxAutoCorrect::AddWrtSttException( const OUString& rNew,
LanguageType eLang )
{
- SvxAutoCorrectLanguageLists* pLists = 0;
+ SvxAutoCorrectLanguageLists* pLists = nullptr;
//either the right language is present or it is set in the general list
auto iter = m_pLangTable->find(LanguageTag(eLang));
if (iter != m_pLangTable->end())
@@ -1553,7 +1553,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true ));
OUString sShareDirFile( sUserDirFile );
- SvxAutoCorrectLanguageLists* pLists = 0;
+ SvxAutoCorrectLanguageLists* pLists = nullptr;
tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY );
@@ -1593,7 +1593,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
{
aLastFileTable[rLanguageTag] = nAktTime.GetTime();
}
- return pLists != 0;
+ return pLists != nullptr;
}
bool SvxAutoCorrect::PutText( const OUString& rShort, const OUString& rLong,
@@ -1694,7 +1694,7 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
const OUString& rTxt, sal_Int32& rStt, sal_Int32 nEndPos,
SvxAutoCorrDoc&, LanguageTag& rLang )
{
- const SvxAutocorrWord* pRet = 0;
+ const SvxAutocorrWord* pRet = nullptr;
LanguageTag aLanguageTag( rLang);
if( aLanguageTag.isSystemLocale() )
aLanguageTag.reset( MsLangId::getSystemLanguage());
@@ -1747,7 +1747,7 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
return pRet;
}
}
- return 0;
+ return nullptr;
}
bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
@@ -1909,9 +1909,9 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
aModifiedDate( Date::EMPTY ),
aModifiedTime( tools::Time::EMPTY ),
aLastCheckTime( tools::Time::EMPTY ),
- pCplStt_ExcptLst( 0 ),
- pWrdStt_ExcptLst( 0 ),
- pAutocorr_List( 0 ),
+ pCplStt_ExcptLst( nullptr ),
+ pWrdStt_ExcptLst( nullptr ),
+ pAutocorr_List( nullptr ),
rAutoCorrect(rParent),
nFlags(0)
{
@@ -1942,11 +1942,11 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
bRet = true;
// then remove all the lists fast!
if( CplSttLstLoad & nFlags && pCplStt_ExcptLst )
- delete pCplStt_ExcptLst, pCplStt_ExcptLst = 0;
+ delete pCplStt_ExcptLst, pCplStt_ExcptLst = nullptr;
if( WrdSttLstLoad & nFlags && pWrdStt_ExcptLst )
- delete pWrdStt_ExcptLst, pWrdStt_ExcptLst = 0;
+ delete pWrdStt_ExcptLst, pWrdStt_ExcptLst = nullptr;
if( ChgWordLstLoad & nFlags && pAutocorr_List )
- delete pAutocorr_List, pAutocorr_List = 0;
+ delete pAutocorr_List, pAutocorr_List = nullptr;
nFlags &= ~(CplSttLstLoad | WrdSttLstLoad | ChgWordLstLoad );
}
aLastCheckTime = tools::Time( tools::Time::SYSTEM );
@@ -2168,7 +2168,7 @@ bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const OUString& rNew)
SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
- xStg = 0;
+ xStg = nullptr;
// Set time stamp
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
&aModifiedDate, &aModifiedTime );
@@ -2189,7 +2189,7 @@ bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const OUString& rNew)
SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
- xStg = 0;
+ xStg = nullptr;
// Set time stamp
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
&aModifiedDate, &aModifiedTime );
@@ -2221,7 +2221,7 @@ void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
- xStg = 0;
+ xStg = nullptr;
// Set time stamp
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
@@ -2266,7 +2266,7 @@ void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
- xStg = 0;
+ xStg = nullptr;
// Set time stamp
FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
&aModifiedDate, &aModifiedTime );
@@ -2304,7 +2304,7 @@ void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const OUString& rName )
xStg->Remove( rName );
xStg->Commit();
- xStg = 0;
+ xStg = nullptr;
}
}
}
@@ -2369,7 +2369,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
{
OUString sXMLWord ( pXMLImplWrdStt_ExcptLstStr );
OUString sXMLSentence ( pXMLImplCplStt_ExcptLstStr );
- SvStringsISortDtor *pTmpWordList = NULL;
+ SvStringsISortDtor *pTmpWordList = nullptr;
if (xSrcStg->IsContained( sXMLWord ) )
LoadXMLExceptList_Imp( pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xSrcStg );
@@ -2378,7 +2378,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
{
SaveExceptList_Imp( *pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xDstStg, true );
pTmpWordList->clear();
- pTmpWordList = NULL;
+ pTmpWordList = nullptr;
}
@@ -2394,7 +2394,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
GetAutocorrWordList();
MakeBlocklist_Imp( *xDstStg );
sShareAutoCorrFile = sUserAutoCorrFile;
- xDstStg = 0;
+ xDstStg = nullptr;
try
{
::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() );
@@ -2573,7 +2573,7 @@ bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, const OUStrin
if( pAutocorr_List->Insert( pNew ) )
{
bRet = MakeBlocklist_Imp( *xStg );
- xStg = 0;
+ xStg = nullptr;
}
else
{
@@ -2598,7 +2598,7 @@ bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort,
{
uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, embed::ElementModes::READWRITE );
bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, rShell, sLong );
- xStg = 0;
+ xStg = nullptr;
// Update the word list
if( bRet )
@@ -2695,7 +2695,7 @@ bool SvxAutocorrWordList::empty() const
SvxAutocorrWord *SvxAutocorrWordList::FindAndRemove(SvxAutocorrWord *pWord)
{
- SvxAutocorrWord *pMatch = NULL;
+ SvxAutocorrWord *pMatch = nullptr;
if ( mpImpl->maSet.empty() ) // use the hash
{
@@ -2771,7 +2771,7 @@ const SvxAutocorrWord* SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
{
// fdo#33899 avoid "1/2", "1/3".. to be replaced by fractions in dates, eg. 1/2/14
if (rTxt.getLength() > nEndPos && rTxt[nEndPos] == '/' && rChk.indexOf('/') != -1)
- return NULL;
+ return nullptr;
return pFnd;
}
// get the first word delimiter position before the matching ".*word" pattern
@@ -2817,7 +2817,7 @@ const SvxAutocorrWord* SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
}
if (nEndPos + extra_repl <= nFndPos)
{
- return 0;
+ return nullptr;
}
// store matching pattern and its replacement as a new list item, eg. "i18ns" -> "internationalizations"
OUString aShort = rTxt.copy(nFndPos, nEndPos - nFndPos + extra_repl);
@@ -2849,7 +2849,7 @@ const SvxAutocorrWord* SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
}
}
}
- return NULL;
+ return nullptr;
}
const SvxAutocorrWord* SvxAutocorrWordList::SearchWordsInList(const OUString& rTxt, sal_Int32& rStt,
@@ -2866,7 +2866,7 @@ const SvxAutocorrWord* SvxAutocorrWordList::SearchWordsInList(const OUString& rT
if( const SvxAutocorrWord *aTmp = WordMatches( *it2, rTxt, rStt, nEndPos ) )
return aTmp;
}
- return 0;
+ return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index f146bf5afa87..21ed9698661b 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -76,8 +76,8 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
nAutoCmpltWordLen = 8;
nAutoCmpltListLen = 1000;
- m_pAutoCompleteList = 0;
- pSmartTagMgr = 0;
+ m_pAutoCompleteList = nullptr;
+ pSmartTagMgr = nullptr;
}
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index be6191ed7445..b316098e64e6 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -32,7 +32,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght,
bool bSimpl, bool bInnr, bool bVert ) :
- pBound( NULL ),
+ pBound( nullptr ),
nCacheSize( nCacheSz ),
nRight( nRght ),
nLeft( nLft ),
@@ -66,7 +66,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
}
}
else
- mpLinePolyPolygon = NULL;
+ mpLinePolyPolygon = nullptr;
}
@@ -658,7 +658,7 @@ LongDqPtr TextRanger::GetTextRanges( const Range& rRange )
const Rectangle& TextRanger::_GetBoundRect()
{
- DBG_ASSERT( 0 == pBound, "Don't call twice." );
+ DBG_ASSERT( nullptr == pBound, "Don't call twice." );
pBound = new Rectangle( mpPolyPolygon->GetBoundRect() );
return *pBound;
}
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 6adfbe9144cc..3f295efa08b5 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -82,7 +82,7 @@ class ThesDummy_Impl :
void GetThes_Impl();
public:
- ThesDummy_Impl() : pLocaleSeq(0) {}
+ ThesDummy_Impl() : pLocaleSeq(nullptr) {}
virtual ~ThesDummy_Impl();
// XSupportedLocales
@@ -139,7 +139,7 @@ void ThesDummy_Impl::GetThes_Impl()
if (xThes.is())
{
// no longer needed...
- delete pLocaleSeq; pLocaleSeq = 0;
+ delete pLocaleSeq; pLocaleSeq = nullptr;
}
}
}
@@ -456,7 +456,7 @@ LinguMgrExitLstnr::~LinguMgrExitLstnr()
if (xDesktop.is())
{
xDesktop->removeEventListener( this );
- xDesktop = NULL; //! release reference to desktop
+ xDesktop = nullptr; //! release reference to desktop
}
OSL_ENSURE(!xDesktop.is(), "reference to desktop should be realeased");
}
@@ -467,7 +467,7 @@ void LinguMgrExitLstnr::disposing(const EventObject& rSource)
if (xDesktop.is() && rSource.Source == xDesktop)
{
xDesktop->removeEventListener( this );
- xDesktop = NULL; //! release reference to desktop
+ xDesktop = nullptr; //! release reference to desktop
AtExit();
}
@@ -478,37 +478,37 @@ void LinguMgrExitLstnr::AtExit()
SolarMutexGuard g;
// release references
- LinguMgr::xLngSvcMgr = 0;
- LinguMgr::xSpell = 0;
- LinguMgr::xHyph = 0;
- LinguMgr::xThes = 0;
- LinguMgr::xDicList = 0;
- LinguMgr::xProp = 0;
- LinguMgr::xIgnoreAll = 0;
- LinguMgr::xChangeAll = 0;
+ LinguMgr::xLngSvcMgr = nullptr;
+ LinguMgr::xSpell = nullptr;
+ LinguMgr::xHyph = nullptr;
+ LinguMgr::xThes = nullptr;
+ LinguMgr::xDicList = nullptr;
+ LinguMgr::xProp = nullptr;
+ LinguMgr::xIgnoreAll = nullptr;
+ LinguMgr::xChangeAll = nullptr;
LinguMgr::bExiting = true;
- LinguMgr::pExitLstnr = 0;
+ LinguMgr::pExitLstnr = nullptr;
}
-LinguMgrExitLstnr * LinguMgr::pExitLstnr = 0;
+LinguMgrExitLstnr * LinguMgr::pExitLstnr = nullptr;
bool LinguMgr::bExiting = false;
-uno::Reference< XLinguServiceManager2 > LinguMgr::xLngSvcMgr = 0;
-uno::Reference< XSpellChecker1 > LinguMgr::xSpell = 0;
-uno::Reference< XHyphenator > LinguMgr::xHyph = 0;
-uno::Reference< XThesaurus > LinguMgr::xThes = 0;
-uno::Reference< XSearchableDictionaryList > LinguMgr::xDicList = 0;
-uno::Reference< XLinguProperties > LinguMgr::xProp = 0;
-uno::Reference< XDictionary > LinguMgr::xIgnoreAll = 0;
-uno::Reference< XDictionary > LinguMgr::xChangeAll = 0;
+uno::Reference< XLinguServiceManager2 > LinguMgr::xLngSvcMgr = nullptr;
+uno::Reference< XSpellChecker1 > LinguMgr::xSpell = nullptr;
+uno::Reference< XHyphenator > LinguMgr::xHyph = nullptr;
+uno::Reference< XThesaurus > LinguMgr::xThes = nullptr;
+uno::Reference< XSearchableDictionaryList > LinguMgr::xDicList = nullptr;
+uno::Reference< XLinguProperties > LinguMgr::xProp = nullptr;
+uno::Reference< XDictionary > LinguMgr::xIgnoreAll = nullptr;
+uno::Reference< XDictionary > LinguMgr::xChangeAll = nullptr;
uno::Reference< XLinguServiceManager2 > LinguMgr::GetLngSvcMgr()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -566,7 +566,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAllList()
uno::Reference< XSpellChecker1 > LinguMgr::GetSpell()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -579,7 +579,7 @@ uno::Reference< XSpellChecker1 > LinguMgr::GetSpell()
uno::Reference< XHyphenator > LinguMgr::GetHyph()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -592,7 +592,7 @@ uno::Reference< XHyphenator > LinguMgr::GetHyph()
uno::Reference< XThesaurus > LinguMgr::GetThes()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -608,7 +608,7 @@ uno::Reference< XThesaurus > LinguMgr::GetThes()
uno::Reference< XSearchableDictionaryList > LinguMgr::GetDicList()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -620,7 +620,7 @@ uno::Reference< XSearchableDictionaryList > LinguMgr::GetDicList()
uno::Reference< linguistic2::XLinguProperties > LinguMgr::GetProp()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -632,7 +632,7 @@ uno::Reference< linguistic2::XLinguProperties > LinguMgr::GetProp()
uno::Reference< XDictionary > LinguMgr::GetIgnoreAll()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -648,7 +648,7 @@ uno::Reference< XDictionary > LinguMgr::GetIgnoreAll()
uno::Reference< XDictionary > LinguMgr::GetChangeAll()
{
if (bExiting)
- return 0;
+ return nullptr;
if (!pExitLstnr)
pExitLstnr = new LinguMgrExitLstnr;
@@ -671,11 +671,11 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
// persistent and not read-only.
if (bExiting)
- return 0;
+ return nullptr;
uno::Reference< XSearchableDictionaryList > xTmpDicList( GetDictionaryList() );
if (!xTmpDicList.is())
- return NULL;
+ return nullptr;
const OUString aDicName( "standard.dic" );
uno::Reference< XDictionary > xDic( xTmpDicList->getDictionaryByName( aDicName ),
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index af4f4cdcf728..77e9ca480d97 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -57,7 +57,7 @@ void OutlinerEditEng::PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos
const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( sal_Int32 nPara ) const
{
- const SvxNumberFormat* pFmt = NULL;
+ const SvxNumberFormat* pFmt = nullptr;
if (pOwner)
pFmt = pOwner->GetNumberFormat( nPara );
return pFmt;
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index d52f7556035c..10e7a8f8fabe 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -430,7 +430,7 @@ Point Outliner::GetDocPosTopLeft( sal_Int32 nParagraph )
bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
{
- return IsTextPos( rPaperPos, nBorder, NULL );
+ return IsTextPos( rPaperPos, nBorder, nullptr );
}
bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, bool* pbBullet )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 72c9a4b568df..331c95c23266 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -395,7 +395,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32
nCount = pEditEngine->GetParagraphCount() - nStartPara;
if (nCount <= 0)
- return NULL;
+ return nullptr;
EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount );
const bool bIsEditDoc(OUTLINERMODE_TEXTOBJECT == ImplGetOutlinerMode());
@@ -686,7 +686,7 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
}
delete rpFldColor;
- rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0;
+ rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : nullptr;
return aFldInfo.GetRepresentation();
}
@@ -792,13 +792,13 @@ bool Outliner::Expand( Paragraph* pPara )
{
if ( pParaList->HasHiddenChildren( pPara ) )
{
- OLUndoExpand* pUndo = 0;
+ OLUndoExpand* pUndo = nullptr;
bool bUndo = IsUndoEnabled() && !IsInUndo();
if( bUndo )
{
UndoActionStart( OLUNDO_EXPAND );
pUndo = new OLUndoExpand( this, OLUNDO_EXPAND );
- pUndo->pParas = 0;
+ pUndo->pParas = nullptr;
pUndo->nCount = pParaList->GetAbsPos( pPara );
}
pHdlParagraph = pPara;
@@ -819,7 +819,7 @@ bool Outliner::Collapse( Paragraph* pPara )
{
if ( pParaList->HasVisibleChildren( pPara ) ) // expanded
{
- OLUndoExpand* pUndo = 0;
+ OLUndoExpand* pUndo = nullptr;
bool bUndo = false;
if( !IsInUndo() && IsUndoEnabled() )
@@ -828,7 +828,7 @@ bool Outliner::Collapse( Paragraph* pPara )
{
UndoActionStart( OLUNDO_COLLAPSE );
pUndo = new OLUndoExpand( this, OLUNDO_COLLAPSE );
- pUndo->pParas = 0;
+ pUndo->pParas = nullptr;
pUndo->nCount = pParaList->GetAbsPos( pPara );
}
@@ -864,7 +864,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
}
vcl::Font aBulletFont;
- const vcl::Font *pSourceFont = 0;
+ const vcl::Font *pSourceFont = nullptr;
if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
{
pSourceFont = pFmt->GetBulletFont();
@@ -1010,7 +1010,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
}
DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().getLength(), pBuf.get(),
- aSvxFont, nPara, -1, bRightToLeftPara ? 1 : 0, 0, 0, false, false, true, 0, Color(), Color());
+ aSvxFont, nPara, -1, bRightToLeftPara ? 1 : 0, nullptr, nullptr, false, false, true, nullptr, Color(), Color());
}
else
{
@@ -1164,7 +1164,7 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara )
bool bUpdate = pEditEngine->GetUpdateMode();
pEditEngine->SetUpdateMode( false );
- Paragraph* pLastConverted = NULL;
+ Paragraph* pLastConverted = nullptr;
for( sal_Int32 nPara = nFirstPara; nPara <= nLastPara; nPara++ )
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
@@ -1347,7 +1347,7 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView )
break;
}
}
- return NULL; // return superfluous
+ return nullptr; // return superfluous
}
OutlinerView* Outliner::RemoveView( size_t nIndex )
@@ -1364,13 +1364,13 @@ OutlinerView* Outliner::RemoveView( size_t nIndex )
aViewList.erase( it );
}
- return NULL; // return superfluous
+ return nullptr; // return superfluous
}
OutlinerView* Outliner::GetView( size_t nIndex ) const
{
- return ( nIndex >= aViewList.size() ) ? NULL : aViewList[ nIndex ];
+ return ( nIndex >= aViewList.size() ) ? nullptr : aViewList[ nIndex ];
}
size_t Outliner::GetViewCount() const
@@ -1422,7 +1422,7 @@ bool Outliner::HasChildren( Paragraph* pParagraph ) const
bool Outliner::ImplHasNumberFormat( sal_Int32 nPara ) const
{
- return GetNumberFormat(nPara) != 0;
+ return GetNumberFormat(nPara) != nullptr;
#if 0 // The below code is obviously unreachable
if ( GetNumberFormat(nPara) )
{
@@ -1436,11 +1436,11 @@ bool Outliner::ImplHasNumberFormat( sal_Int32 nPara ) const
const SvxNumberFormat* Outliner::GetNumberFormat( sal_Int32 nPara ) const
{
- const SvxNumberFormat* pFmt = NULL;
+ const SvxNumberFormat* pFmt = nullptr;
Paragraph* pPara = pParaList->GetParagraph( nPara );
if (!pPara)
- return NULL;
+ return nullptr;
sal_Int16 nDepth = pPara->GetDepth();
@@ -1754,8 +1754,8 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString&
{
if(aDrawPortionHdl.IsSet())
{
- DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nIndex, NULL, NULL,
- NULL, NULL, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false);
+ DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nIndex, nullptr, nullptr,
+ nullptr, nullptr, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false);
aDrawPortionHdl.Call( &aInfo );
}
@@ -1771,7 +1771,7 @@ bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFi
nDepthChangedHdlPrevDepth = nPages;
mnFirstSelPage = _nFirstPage;
- pHdlParagraph = 0;
+ pHdlParagraph = nullptr;
return RemovingPagesHdl( pCurView );
}
@@ -1854,7 +1854,7 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_Int32 nPara, const SvxNumberFormat* p
const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
- if( pFmt == 0 )
+ if( pFmt == nullptr )
continue; // ignore paragraphs without bullets
// check if numbering less than or equal to pParaFmt
@@ -1925,11 +1925,11 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec
}
if ( pPara && ( pPara->GetDepth() < nDepth ) )
- pPara = NULL;
+ pPara = nullptr;
}
else
{
- pPara = NULL;
+ pPara = nullptr;
}
}
}
@@ -2074,7 +2074,7 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const
*/
if ( GetParagraphCount() < 1 )
- return NULL;
+ return nullptr;
// last non-overflowing paragraph is before the first overflowing one
sal_Int32 nCount = pEditEngine->GetOverflowingParaNum();
@@ -2085,14 +2085,14 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const
SAL_INFO("editeng.chaining",
"[Overflowing] Ops, trying to retrieve para "
<< nCount << " when max index is " << GetParagraphCount()-1 );
- return NULL;
+ return nullptr;
}
if (nCount < 0)
{
SAL_INFO("editeng.chaining",
"[Overflowing] No Overflowing text but GetNonOverflowinText called?!");
- return NULL;
+ return nullptr;
}
// NOTE: We want the selection of the overflowing text from here
@@ -2184,7 +2184,7 @@ OutlinerParaObject *Outliner::GetEmptyParaObject() const
OverflowingText *Outliner::GetOverflowingText() const
{
if ( pEditEngine->GetOverflowingParaNum() < 0)
- return NULL;
+ return nullptr;
// Defensive check: oveflowing para index beyond actual # of paragraphs?
@@ -2193,7 +2193,7 @@ OverflowingText *Outliner::GetOverflowingText() const
"[Overflowing] Ops, trying to retrieve para "
<< pEditEngine->GetOverflowingParaNum() << " when max index is "
<< GetParagraphCount()-1 );
- return NULL;
+ return nullptr;
}
sal_Int32 nHeadPara = pEditEngine->GetOverflowingParaNum();
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index e07cae282acd..a1475b565735 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -31,7 +31,7 @@
OutlinerUndoBase::OutlinerUndoBase( sal_uInt16 _nId, Outliner* pOutliner )
- : EditUndo( _nId, NULL )
+ : EditUndo( _nId, nullptr )
{
DBG_ASSERT( pOutliner, "Undo: Outliner?!" );
mpOutliner = pOutliner;
@@ -139,12 +139,12 @@ void OutlinerUndoCheckPara::Redo()
}
OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
- : EditUndo( _nId, 0 )
+ : EditUndo( _nId, nullptr )
{
DBG_ASSERT(pOut,"Undo:No Outliner");
pOutliner = pOut;
nCount = 0;
- pParas = 0;
+ pParas = nullptr;
}
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 4da7ccf8eb33..782d0e2d9c14 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -678,7 +678,7 @@ void OutlinerView::Cut()
if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) {
pEditView->Cut();
// Chaining handling
- aEndCutPasteLink.Call(NULL);
+ aEndCutPasteLink.Call(nullptr);
}
}
@@ -711,7 +711,7 @@ void OutlinerView::PasteSpecial()
// Chaining handling
// NOTE: We need to do this last because it pEditView may be deleted if a switch of box occurs
- aEndCutPasteLink.Call(NULL);
+ aEndCutPasteLink.Call(nullptr);
}
}
@@ -824,7 +824,7 @@ sal_Int32 OutlinerView::ImpCalcSelectedPages( bool bIncludeFirstSelected )
if( nPages )
{
pOwner->nDepthChangedHdlPrevDepth = nPages;
- pOwner->pHdlParagraph = 0;
+ pOwner->pHdlParagraph = nullptr;
pOwner->mnFirstSelPage = nFirstPage;
}
@@ -843,7 +843,7 @@ void OutlinerView::ToggleBullets()
pOwner->pEditEngine->SetUpdateMode( false );
sal_Int16 nNewDepth = -2;
- const SvxNumRule* pDefaultBulletNumRule = 0;
+ const SvxNumRule* pDefaultBulletNumRule = nullptr;
for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
@@ -862,7 +862,7 @@ void OutlinerView::ToggleBullets()
const SfxItemSet aTmpSet(pOwner->pEditEngine->GetAttribs(aSelection));
const SfxPoolItem& rPoolItem = aTmpSet.GetPool()->GetDefaultItem( EE_PARA_NUMBULLET );
const SvxNumBulletItem* pNumBulletItem = dynamic_cast< const SvxNumBulletItem* >(&rPoolItem);
- pDefaultBulletNumRule = pNumBulletItem ? pNumBulletItem->GetNumRule() : 0;
+ pDefaultBulletNumRule = pNumBulletItem ? pNumBulletItem->GetNumRule() : nullptr;
}
}
@@ -1067,7 +1067,7 @@ void OutlinerView::ApplyBulletsNumbering(
// Get old bullet space.
{
- const SfxPoolItem* pPoolItem=NULL;
+ const SfxPoolItem* pPoolItem=nullptr;
SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, false, &pPoolItem);
if (eState != SfxItemState::SET)
{
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 2c330c7659dd..ac88a3e4e966 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -187,8 +187,8 @@ ESelection OFlowChainedText::GetOverflowPointSel() const
OutlinerParaObject *OFlowChainedText::InsertOverflowingText(Outliner *pOutliner, OutlinerParaObject *pTextToBeMerged)
{
// Just return the roughly merged paras for now
- if (mpOverflowingTxt == NULL)
- return NULL;
+ if (mpOverflowingTxt == nullptr)
+ return nullptr;
if (mbIsDeepMerge) {
SAL_INFO("editeng.chaining", "[TEXTCHAINFLOW - OF] Deep merging paras" );
@@ -202,8 +202,8 @@ OutlinerParaObject *OFlowChainedText::InsertOverflowingText(Outliner *pOutliner,
OutlinerParaObject *OFlowChainedText::RemoveOverflowingText(Outliner *pOutliner)
{
- if (mpNonOverflowingTxt == NULL)
- return NULL;
+ if (mpNonOverflowingTxt == nullptr)
+ return nullptr;
return mpNonOverflowingTxt->RemoveOverflowingText(pOutliner);
}
@@ -224,7 +224,7 @@ UFlowChainedText::UFlowChainedText(Outliner *pOutl, bool bIsDeepMerge)
OutlinerParaObject *UFlowChainedText::CreateMergedUnderflowParaObject(Outliner *pOutl, OutlinerParaObject *pNextLinkWholeText)
{
- OutlinerParaObject *pNewText = NULL;
+ OutlinerParaObject *pNewText = nullptr;
if (mbIsDeepMerge) {
SAL_INFO("editeng.chaining", "[TEXTCHAINFLOW - UF] Deep merging paras" );
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index 04f9cc4babbc..848dbafc8764 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -47,7 +47,7 @@ public:
Paragraph* GetParagraph( sal_Int32 nPos ) const
{
- return 0 <= nPos && static_cast<size_t>(nPos) < maEntries.size() ? maEntries[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maEntries.size() ? maEntries[nPos] : nullptr;
}
sal_Int32 GetAbsPos( Paragraph* pParent ) const;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index d8a97395817c..01cc8b86c361 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -102,7 +102,7 @@ inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,bo
void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
SfxPoolItem& rItem )
{
- const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0;
+ const sal_uInt16 *pNormal = nullptr, *pCJK = nullptr, *pCTL = nullptr;
switch( rItem.Which() )
{
case SID_ATTR_CHAR_FONT:
@@ -233,7 +233,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( !bChkStkPos )
break;
- SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
if( !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
pAkt->nSttCnt == pInsPos->GetCntIdx() ))
break;
@@ -252,8 +252,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
// "Set" all valid attributes up until this point
AttrGroupEnd();
- pAkt = aAttrStack.empty() ? 0 : aAttrStack.back(); // can be changed after AttrGroupEnd!
- pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
+ pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); // can be changed after AttrGroupEnd!
+ pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : nullptr );
aAttrStack.push_back( pNew );
pAkt = pNew;
@@ -289,7 +289,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
/* setze am akt. auf dem AttrStack stehenden Style die
I sit on akt. which is on the immediate style AttrStack */
// StyleNummer
- SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
if( !pAkt )
break;
@@ -1394,7 +1394,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
if( SfxItemState::SET == rSet.GetItemState( aPardMap.nBox, false, &pItem ) )
aAttr = *static_cast<const SvxBoxItem*>(pItem);
- SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 ); // Simple plain line
+ SvxBorderLine aBrd( nullptr, DEF_LINE_WIDTH_0 ); // Simple plain line
bool bContinue = true;
int nBorderTyp = 0;
@@ -1721,8 +1721,8 @@ void SvxRTFParser::RTFPardPlain( bool const bPard, SfxItemSet** ppSet )
// Set all until here valid attributes
AttrGroupEnd();
- pAkt = aAttrStack.empty() ? 0 : aAttrStack.back(); // can be changed after AttrGroupEnd!
- pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
+ pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); // can be changed after AttrGroupEnd!
+ pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : nullptr );
aAttrStack.push_back( pNew );
pAkt = pNew;
}
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 653c44ced022..be0e37fb381b 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -65,10 +65,10 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
, rStrm(rIn)
, aPlainMap(rPool)
, aPardMap(rPool)
- , pInsPos( 0 )
+ , pInsPos( nullptr )
, pAttrPool( &rPool )
, m_xDocProps( i_xDocProps )
- , pRTFDefaults( 0 )
+ , pRTFDefaults( nullptr )
, nVersionNo( 0 )
, nDfltFont( 0)
, bNewDoc( bReadNewDoc )
@@ -814,7 +814,7 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( bool const bCopyAttr )
{
- SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
SvxRTFItemStackType* pNew;
if( pAkt )
pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, bCopyAttr );
@@ -877,9 +877,9 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
{
if( !aAttrStack.empty() )
{
- SvxRTFItemStackType *pOld = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType *pOld = aAttrStack.empty() ? nullptr : aAttrStack.back();
aAttrStack.pop_back();
- SvxRTFItemStackType *pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType *pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
do { // middle check loop
sal_Int32 nOldSttNdIdx = pOld->pSttNd->GetIdx();
@@ -983,7 +983,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
m_AttrSetList.push_back(std::unique_ptr<SvxRTFItemStackType>(pOld));
m_AttrSetList.push_back(std::move(pNew));
}
- pOld = 0; // Do not delete pOld
+ pOld = nullptr; // Do not delete pOld
break;
}
}
@@ -1023,8 +1023,8 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
// Set all until here valid Attributes
AttrGroupEnd();
- pAkt = aAttrStack.empty() ? 0 : aAttrStack.back(); // can be changed after AttrGroupEnd!
- pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
+ pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); // can be changed after AttrGroupEnd!
+ pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : nullptr );
aAttrStack.push_back( pNew );
}
}
@@ -1033,7 +1033,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
// read. (Span no attributes!)
m_AttrSetList.push_back(std::unique_ptr<SvxRTFItemStackType>(pOld));
- pOld = 0;
+ pOld = nullptr;
}
if( bCrsrBack )
@@ -1083,7 +1083,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
// Has no text been inserted yet? (SttPos from the top Stack entry!)
bool SvxRTFParser::IsAttrSttPos()
{
- SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+ SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();
return !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
pAkt->nSttCnt == pInsPos->GetCntIdx());
}
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index b0f390435131..34c12d7082e3 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -70,7 +70,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale&
const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, false );
- return NULL != pForbidden;
+ return nullptr != pForbidden;
}
void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters )
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index bfee8c9e50ae..ada29d736e07 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -323,7 +323,7 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const
}
}
- return NULL;
+ return nullptr;
}
SvxAccessibleTextAdapter* SvxEditSourceAdapter::GetTextForwarderAdapter()
@@ -340,7 +340,7 @@ SvxAccessibleTextAdapter* SvxEditSourceAdapter::GetTextForwarderAdapter()
}
}
- return NULL;
+ return nullptr;
}
SvxTextForwarder* SvxEditSourceAdapter::GetTextForwarder()
@@ -353,7 +353,7 @@ SvxViewForwarder* SvxEditSourceAdapter::GetViewForwarder()
if( mbEditSourceValid && mpAdaptee.get() )
return mpAdaptee->GetViewForwarder();
- return NULL;
+ return nullptr;
}
SvxAccessibleTextEditViewAdapter* SvxEditSourceAdapter::GetEditViewForwarderAdapter( bool bCreate )
@@ -375,7 +375,7 @@ SvxAccessibleTextEditViewAdapter* SvxEditSourceAdapter::GetEditViewForwarderAdap
}
}
- return NULL;
+ return nullptr;
}
SvxEditViewForwarder* SvxEditSourceAdapter::GetEditViewForwarder( bool bCreate )
@@ -414,7 +414,7 @@ void SvxEditSourceAdapter::SetEditSource( ::std::unique_ptr< SvxEditSource > &&
}
SvxAccessibleTextAdapter::SvxAccessibleTextAdapter()
- : mpTextForwarder(NULL)
+ : mpTextForwarder(nullptr)
{
}
@@ -719,7 +719,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
OutputDevice* pOutDev = GetRefDevice();
- DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetCharBounds: No ref device");
+ DBG_ASSERT(pOutDev!=nullptr, "SvxAccessibleTextAdapter::GetCharBounds: No ref device");
// preset if anything goes wrong below
aRect = aBulletInfo.aBounds; // better than nothing
@@ -738,7 +738,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
{
OutputDevice* pOutDev = GetRefDevice();
- DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetCharBounds: No ref device");
+ DBG_ASSERT(pOutDev!=nullptr, "SvxAccessibleTextAdapter::GetCharBounds: No ref device");
if( pOutDev )
{
@@ -821,7 +821,7 @@ bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32&
{
OutputDevice* pOutDev = GetRefDevice();
- DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
+ DBG_ASSERT(pOutDev!=nullptr, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
if( !pOutDev )
return false;
@@ -844,7 +844,7 @@ bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32&
{
OutputDevice* pOutDev = GetRefDevice();
- DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
+ DBG_ASSERT(pOutDev!=nullptr, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
if( !pOutDev )
return false;
@@ -1111,7 +1111,7 @@ bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
const SfxItemSet * SvxAccessibleTextAdapter::GetEmptyItemSetPtr()
{
OSL_FAIL( "not implemented" );
- return 0;
+ return nullptr;
}
void SvxAccessibleTextAdapter::AppendParagraph()
@@ -1130,8 +1130,8 @@ void SvxAccessibleTextAdapter::CopyText(const SvxTextForwarder&)
}
SvxAccessibleTextEditViewAdapter::SvxAccessibleTextEditViewAdapter()
- : mpViewForwarder(NULL)
- , mpTextForwarder(NULL)
+ : mpViewForwarder(nullptr)
+ , mpTextForwarder(nullptr)
{
}
diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index b20565cb224d..f638ecd23ced 100644
--- a/editeng/source/uno/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -62,12 +62,12 @@ SvxEditSource::~SvxEditSource()
SvxViewForwarder* SvxEditSource::GetViewForwarder()
{
- return NULL;
+ return nullptr;
}
SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( bool )
{
- return NULL;
+ return nullptr;
}
SfxBroadcaster& SvxEditSource::GetBroadcaster() const
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 3a82ced47fac..368513d03ae1 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -130,7 +130,7 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte
void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDescriptor& rDesc )
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
{
const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(&rSet.Get( EE_CHAR_FONTINFO ));
rDesc.Name = pFontItem->GetFamilyName();
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index ee597604f042..2f8f4e2ed0d0 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -240,7 +240,7 @@ sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_
SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
: OComponentHelper( getMutex() )
-, mpPropSet(NULL)
+, mpPropSet(nullptr)
, mnServiceId(nServiceId)
, mpImpl( new SvxUnoFieldData_Impl )
{
@@ -294,7 +294,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, const OUString& rPresentation, const SvxFieldData* pData ) throw()
: OComponentHelper( getMutex() )
, mxAnchor( xAnchor )
-, mpPropSet(NULL)
+, mpPropSet(nullptr)
, mnServiceId(text::textfield::Type::UNSPECIFIED)
, mpImpl( new SvxUnoFieldData_Impl )
{
@@ -382,7 +382,7 @@ SvxUnoTextField::~SvxUnoTextField() throw()
SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
{
- SvxFieldData* pData = NULL;
+ SvxFieldData* pData = nullptr;
switch( mnServiceId )
{
@@ -629,7 +629,7 @@ void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >&
throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xTextRange );
- if(pRange == NULL)
+ if(pRange == nullptr)
throw lang::IllegalArgumentException();
SvxFieldData* pData = CreateFieldData();
@@ -678,7 +678,7 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
{
SolarMutexGuard aGuard;
- if( mpImpl == NULL )
+ if( mpImpl == nullptr )
throw uno::RuntimeException();
if (aPropertyName == UNO_TC_PROP_ANCHOR)
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 59f423b4cf82..b3ab33dcad53 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -169,7 +169,7 @@ SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelectio
{
std::vector<EECharAttrib> aAttribs;
- const SfxPoolItem* pLastItem = NULL;
+ const SfxPoolItem* pLastItem = nullptr;
SfxItemState eState = SfxItemState::DEFAULT;
@@ -195,7 +195,7 @@ SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelectio
bool bGaps = false; // we found items but theire gaps between them
sal_Int32 nLastEnd = nPos;
- const SfxPoolItem* pParaItem = NULL;
+ const SfxPoolItem* pParaItem = nullptr;
for(std::vector<EECharAttrib>::const_iterator i = aAttribs.begin(); i < aAttribs.end(); ++i)
{
@@ -245,7 +245,7 @@ SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelectio
// if we already found an item check if we found the same
if( pLastItem )
{
- if( (pParaItem == NULL) || (*pLastItem != *pParaItem) )
+ if( (pParaItem == nullptr) || (*pLastItem != *pParaItem) )
return SfxItemState::DONTCARE;
}
else
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 9c8db1f88d26..d36cacbdc3d0 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -43,8 +43,8 @@ using namespace ::com::sun::star;
SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText /* = false */ ) :
rOutliner( rOutl ),
bOutlinerText( bOutlText ),
- mpAttribsCache( NULL ),
- mpParaAttribsCache( NULL ),
+ mpAttribsCache( nullptr ),
+ mpParaAttribsCache( nullptr ),
mnParaAttribsCache( 0 )
{
}
@@ -114,7 +114,7 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, EditEngineA
{
// no, we need delete the old cache
delete mpAttribsCache;
- mpAttribsCache = NULL;
+ mpAttribsCache = nullptr;
}
}
@@ -151,7 +151,7 @@ SfxItemSet SvxOutlinerForwarder::GetParaAttribs( sal_Int32 nPara ) const
{
// no, we need delete the old cache
delete mpParaAttribsCache;
- mpParaAttribsCache = NULL;
+ mpParaAttribsCache = nullptr;
}
}
@@ -173,7 +173,7 @@ void SvxOutlinerForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rS
const SfxItemSet* pOldParent = rSet.GetParent();
if( pOldParent )
- const_cast<SfxItemSet*>(&rSet)->SetParent( NULL );
+ const_cast<SfxItemSet*>(&rSet)->SetParent( nullptr );
rOutliner.SetParaAttribs( nPara, rSet );
@@ -261,13 +261,13 @@ void SvxOutlinerForwarder::flushCache()
if( mpAttribsCache )
{
delete mpAttribsCache;
- mpAttribsCache = NULL;
+ mpAttribsCache = nullptr;
}
if( mpParaAttribsCache )
{
delete mpParaAttribsCache;
- mpParaAttribsCache = NULL;
+ mpParaAttribsCache = nullptr;
}
}
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 8c0fc5040949..0034b3ebcb1b 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -61,7 +61,7 @@ uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const
if( pActual->nWID == nWID )
return &pActual->aAny;
}
- return NULL;
+ return nullptr;
}
@@ -101,10 +101,10 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
if(!pMap || !pMap->nWID)
return aVal;
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
SfxItemPool* pPool = rSet.GetPool();
rSet.GetItemState( pMap->nWID, bSearchInParent, &pItem );
- if( NULL == pItem && pPool )
+ if( nullptr == pItem && pPool )
pItem = &(pPool->GetDefaultItem( pMap->nWID ));
const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
@@ -147,14 +147,14 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
return;
// Get item
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
SfxItemState eState = rSet.GetItemState( pMap->nWID, true, &pItem );
SfxItemPool* pPool = rSet.GetPool();
// Put UnoAny in the item value
- if(eState < SfxItemState::DEFAULT || pItem == NULL)
+ if(eState < SfxItemState::DEFAULT || pItem == nullptr)
{
- if( pPool == NULL )
+ if( pPool == nullptr )
{
OSL_FAIL( "No default item and no pool?" );
return;
@@ -217,7 +217,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
if(aSet.Count())
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
SfxItemState eState = aSet.GetItemState( pMap->nWID, true, &pItem );
if(eState >= SfxItemState::DEFAULT && pItem)
{
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 60ceeb09a741..787d575a702c 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -459,7 +459,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert
// check that we always have a brush item for bitmap numbering
if( aFmt.GetNumberingType() == SVX_NUM_BITMAP )
{
- if( NULL == aFmt.GetBrush() )
+ if( nullptr == aFmt.GetBrush() )
{
GraphicObject aGrafObj;
SvxBrushItem aBrushItem( aGrafObj, GPOS_AREA, SID_ATTR_BRUSH );
@@ -472,7 +472,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert
const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > xRule ) throw( IllegalArgumentException )
{
SvxUnoNumberingRules* pRule = SvxUnoNumberingRules::getImplementation( xRule );
- if( pRule == NULL )
+ if( pRule == nullptr )
throw IllegalArgumentException();
return pRule->getNumRule();
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index f7957a30cddb..0f2a5febfd18 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -68,15 +68,15 @@ void SAL_CALL SvxAccessibleTextPropertySet::release()
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() throw ( uno::RuntimeException, std::exception )
{
- static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+ static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
// double-checked locking pattern.
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
// Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == NULL )
+ if ( pTypeCollection == nullptr )
{
// Create a static typecollection ...
static ::cppu::OTypeCollection aTypeCollection(
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 76297e5e1088..73a44640b1b7 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -209,7 +209,7 @@ void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw()
UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase );
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw()
-: mpEditSource(NULL) , mpPropSet(_pSet)
+: mpEditSource(nullptr) , mpPropSet(_pSet)
{
}
@@ -221,7 +221,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const Sv
DBG_ASSERT(pSource,"SvxUnoTextRangeBase: I need a valid SvxEditSource!");
mpEditSource = pSource->Clone();
- if (mpEditSource != NULL)
+ if (mpEditSource != nullptr)
{
ESelection aSelection;
::GetSelection( aSelection, mpEditSource->GetTextForwarder() );
@@ -245,9 +245,9 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) th
{
SolarMutexGuard aGuard;
- mpEditSource = rRange.mpEditSource ? rRange.mpEditSource->Clone() : NULL;
+ mpEditSource = rRange.mpEditSource ? rRange.mpEditSource->Clone() : nullptr;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
maSelection = rRange.maSelection;
@@ -269,7 +269,7 @@ SvxUnoTextRangeBase::~SvxUnoTextRangeBase() throw()
void SvxUnoTextRangeBase::SetEditSource( SvxEditSource* pSource ) throw()
{
DBG_ASSERT(pSource,"SvxUnoTextRangeBase: I need a valid SvxEditSource!");
- DBG_ASSERT(mpEditSource==NULL,"SvxUnoTextRangeBase::SetEditSource called while SvxEditSource already set" );
+ DBG_ASSERT(mpEditSource==nullptr,"SvxUnoTextRangeBase::SetEditSource called while SvxEditSource already set" );
mpEditSource = pSource;
@@ -287,7 +287,7 @@ void SvxUnoTextRangeBase::attachField( const SvxFieldData* pData ) throw()
if( pData )
{
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
SvxFieldItem aField( *pData, EE_FEATURE_FIELD );
@@ -313,14 +313,14 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart()
uno::Reference< text::XTextRange > xRange;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( getText() );
- if(pText == NULL)
+ if(pText == nullptr)
throw uno::RuntimeException();
SvxUnoTextRange* pRange = new SvxUnoTextRange( *pText );
@@ -342,14 +342,14 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd()
uno::Reference< text::XTextRange > xRet;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( getText() );
- if(pText == NULL)
+ if(pText == nullptr)
throw uno::RuntimeException();
SvxUnoTextRange* pNew = new SvxUnoTextRange( *pText );
@@ -368,7 +368,7 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString()
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
@@ -386,7 +386,7 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
@@ -433,7 +433,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
@@ -525,7 +525,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt
case WID_NUMLEVEL:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
{
sal_Int16 nLevel = sal_Int16();
@@ -542,7 +542,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt
break;
case WID_NUMBERINGSTARTVALUE:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
{
sal_Int16 nStartValue = -1;
@@ -556,7 +556,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt
break;
case WID_PARAISNUMBERINGRESTART:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
{
bool bParaIsNumberingRestart = false;
@@ -611,13 +611,13 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert
uno::Any aAny;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName );
if( pMap )
{
- SfxItemSet* pAttribs = NULL;
+ SfxItemSet* pAttribs = nullptr;
if( nPara != -1 )
pAttribs = pForwarder->GetParaAttribs( nPara ).Clone();
else
@@ -649,8 +649,8 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
uno::Reference< text::XTextRange > xAnchor( this );
// get presentation string for field
- Color* pTColor = NULL;
- Color* pFColor = NULL;
+ Color* pTColor = nullptr;
+ Color* pFColor = nullptr;
SvxTextForwarder* pForwarder = mpEditSource->GetTextForwarder();
OUString aPresentation( pForwarder->CalcFieldValue( SvxFieldItem(*pData, EE_FEATURE_FIELD), maSelection.nStartPara, maSelection.nStartPos, pTColor, pFColor ) );
@@ -703,7 +703,7 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxIt
const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>(rSet.GetItem( EE_PARA_NUMBULLET ));
- if( pBulletItem == NULL )
+ if( pBulletItem == nullptr )
throw uno::RuntimeException();
aAny <<= SvxCreateNumRule( pBulletItem->GetNumRule() );
@@ -712,7 +712,7 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxIt
case WID_NUMLEVEL:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
{
sal_Int16 nLevel = pForwarder->GetDepth( pSelection->nStartPara );
@@ -723,14 +723,14 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxIt
break;
case WID_NUMBERINGSTARTVALUE:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
aAny <<= pForwarder->GetNumberingStartValue( pSelection->nStartPara );
}
break;
case WID_PARAISNUMBERINGRESTART:
{
- SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : nullptr;
if(pForwarder && pSelection)
aAny <<= pForwarder->IsParaIsNumberingRestart( pSelection->nStartPara );
}
@@ -773,7 +773,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
@@ -793,11 +793,11 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
nEndPara = aSel.nEndPara;
}
- SfxItemSet* pOldAttrSet = NULL;
- SfxItemSet* pNewAttrSet = NULL;
+ SfxItemSet* pOldAttrSet = nullptr;
+ SfxItemSet* pNewAttrSet = nullptr;
- SfxItemSet* pOldParaSet = NULL;
- SfxItemSet* pNewParaSet = NULL;
+ SfxItemSet* pOldParaSet = nullptr;
+ SfxItemSet* pNewParaSet = nullptr;
for( ; nCount; nCount--, pPropertyNames++, pValues++ )
{
@@ -809,7 +809,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
if( (nPara == -1) && !bParaAttrib )
{
- if( NULL == pNewAttrSet )
+ if( nullptr == pNewAttrSet )
{
const SfxItemSet aSet( pForwarder->GetAttribs( aSel ) );
pOldAttrSet = new SfxItemSet( aSet );
@@ -829,7 +829,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
}
else
{
- if( NULL == pNewParaSet )
+ if( nullptr == pNewParaSet )
{
const SfxItemSet aSet( pForwarder->GetParaAttribs( nTempPara ) );
pOldParaSet = new SfxItemSet( aSet );
@@ -902,10 +902,10 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons
uno::Sequence< uno::Any > aValues( nCount );
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
- SfxItemSet* pAttribs = NULL;
+ SfxItemSet* pAttribs = nullptr;
if( nPara != -1 )
pAttribs = pForwarder->GetParaAttribs( nPara ).Clone();
else
@@ -960,7 +960,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
{
if ( pMap )
{
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
SfxItemState eItemState = SfxItemState::UNKNOWN;
@@ -1070,10 +1070,10 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
uno::Sequence< beans::PropertyState > aRet( nCount );
beans::PropertyState* pState = aRet.getArray();
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
- SfxItemSet* pSet = NULL;
+ SfxItemSet* pSet = nullptr;
if( nPara != -1 )
{
pSet = new SfxItemSet( pForwarder->GetParaAttribs( nPara ) );
@@ -1089,7 +1089,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ )
{
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( *pNames++ );
- if( NULL == pMap )
+ if( nullptr == pMap )
{
bUnknownPropertyFound = true;
break;
@@ -1203,7 +1203,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
@@ -1266,7 +1266,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( aPropertyName );
@@ -1313,7 +1313,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault()
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
@@ -1384,7 +1384,7 @@ bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, bool Expand) throw()
sal_Int32 nNewPar = maSelection.nEndPara;
bool bOk = true;
- SvxTextForwarder* pForwarder = NULL;
+ SvxTextForwarder* pForwarder = nullptr;
while ( nCount > nNewPos && bOk )
{
if ( nNewPar == 0 )
@@ -1415,7 +1415,7 @@ bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, bool Expand) throw()
bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, bool Expand) throw()
{
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
CheckSelection( maSelection, pForwarder );
@@ -1465,7 +1465,7 @@ void SvxUnoTextRangeBase::GotoEnd(bool Expand) throw()
{
CheckSelection( maSelection, mpEditSource );
- SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
if( pForwarder )
{
@@ -1509,7 +1509,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc
SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 );
SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 );
- if( (pR1 == 0) || (pR2 == 0) )
+ if( (pR1 == nullptr) || (pR2 == nullptr) )
throw lang::IllegalArgumentException();
const ESelection& r1 = pR1->maSelection;
@@ -1533,7 +1533,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference<
SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 );
SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 );
- if( (pR1 == 0) || (pR2 == 0) )
+ if( (pR1 == nullptr) || (pR2 == nullptr) )
throw lang::IllegalArgumentException();
const ESelection& r1 = pR1->maSelection;
@@ -1837,7 +1837,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : nullptr;
if( pForwarder )
{
@@ -1924,7 +1924,7 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : nullptr;
if (!pForwarder)
return;
@@ -2062,7 +2062,7 @@ void SvxPropertyValuesToItemSet(
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
// should be PropertyVetoException which is not yet defined for the new import API's functions
- throw uno::RuntimeException("Property is read-only: " + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
+ throw uno::RuntimeException("Property is read-only: " + pProps[i].Name, static_cast < cppu::OWeakObject * > ( nullptr ) );
//throw PropertyVetoException ("Property is read-only: " + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
if (pEntry->nWID == WID_FONTDESC)
@@ -2109,7 +2109,7 @@ void SvxPropertyValuesToItemSet(
pPropSet->setPropertyValue( pProps[i].Name, pProps[i].Value, rItemSet );
}
else
- throw beans::UnknownPropertyException( "Unknown property: " + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
+ throw beans::UnknownPropertyException( "Unknown property: " + pProps[i].Name, static_cast < cppu::OWeakObject * > ( nullptr ) );
}
}
@@ -2130,7 +2130,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph(
uno::Reference< text::XTextRange > xRet;
SvxEditSource *pEditSource = GetEditSource();
- SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
+ SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : nullptr;
if (pTextForwarder)
{
sal_Int32 nParaCount = pTextForwarder->GetParagraphCount();
@@ -2171,7 +2171,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
SolarMutexGuard aGuard;
SvxEditSource *pEditSource = GetEditSource();
- SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
+ SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : nullptr;
uno::Reference< text::XTextRange > xRet;
if (pTextForwarder)
{
@@ -2208,7 +2208,7 @@ void SvxUnoTextBase::copyText(
SolarMutexGuard aGuard;
uno::Reference< lang::XUnoTunnel > xUT( xSource, uno::UNO_QUERY );
SvxEditSource *pEditSource = GetEditSource();
- SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
+ SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : nullptr;
if( !pTextForwarder )
return;
if( xUT.is() )
@@ -2216,7 +2216,7 @@ void SvxUnoTextBase::copyText(
SvxUnoTextBase* pSource = reinterpret_cast<SvxUnoTextBase*>(sal::static_int_cast<sal_uIntPtr>(
xUT->getSomething( SvxUnoTextBase::getUnoTunnelId())));
SvxEditSource *pSourceEditSource = pSource->GetEditSource();
- SvxTextForwarder *pSourceTextForwarder = pSourceEditSource ? pSourceEditSource->GetTextForwarder() : 0;
+ SvxTextForwarder *pSourceTextForwarder = pSourceEditSource ? pSourceEditSource->GetTextForwarder() : nullptr;
if( pSourceTextForwarder )
{
pTextForwarder->CopyText( *pSourceTextForwarder );
@@ -2269,7 +2269,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI
if( xUT.is() )
return reinterpret_cast<SvxUnoTextBase*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxUnoTextBase::getUnoTunnelId())));
else
- return NULL;
+ return nullptr;
}
sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) \
@@ -2437,7 +2437,7 @@ SfxItemState SvxDummyTextSource::GetItemState( sal_Int32, sal_uInt16 ) const
SfxItemPool* SvxDummyTextSource::GetPool() const
{
- return NULL;
+ return nullptr;
}
void SvxDummyTextSource::QuickInsertText( const OUString&, const ESelection& )
@@ -2507,7 +2507,7 @@ MapMode SvxDummyTextSource::GetMapMode() const
OutputDevice* SvxDummyTextSource::GetRefDevice() const
{
- return NULL;
+ return nullptr;
}
bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const
@@ -2572,7 +2572,7 @@ bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
const SfxItemSet * SvxDummyTextSource::GetEmptyItemSetPtr()
{
- return 0;
+ return nullptr;
}
void SvxDummyTextSource::AppendParagraph()
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 165d85d4561e..bf4bf7b5c4b1 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -47,7 +47,7 @@ SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase
if( mrText.GetEditSource() )
mpEditSource = mrText.GetEditSource()->Clone();
else
- mpEditSource = NULL;
+ mpEditSource = nullptr;
mnNextParagraph = 0;
}
@@ -74,18 +74,18 @@ uno::Any SvxUnoTextContentEnumeration::nextElement() throw( container::NoSuchEle
if(!hasMoreElements())
throw container::NoSuchElementException();
- SvxUnoTextContent* pContent = 0;
+ SvxUnoTextContent* pContent = nullptr;
const SvxUnoTextRangeBaseList& rRanges( mpEditSource->getRanges() );
SvxUnoTextRangeBaseList::const_iterator aIter;
- for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pContent == 0); ++aIter )
+ for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pContent == nullptr); ++aIter )
{
SvxUnoTextContent* pIterContent = dynamic_cast< SvxUnoTextContent* >( (*aIter ) );
if( pIterContent && (pIterContent->mnParagraph == mnNextParagraph) )
pContent = pIterContent;
}
- if( pContent == 0 )
+ if( pContent == nullptr )
pContent = new SvxUnoTextContent( mrText, mnNextParagraph );
mnNextParagraph++;
@@ -281,7 +281,7 @@ sal_Bool SAL_CALL SvxUnoTextContent::hasElements()
{
SolarMutexGuard aGuard;
- SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
+ SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : nullptr;
if( pForwarder )
{
std::vector<sal_Int32> aPortions;
@@ -385,7 +385,7 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rT
mnParagraph( nPara ),
mnNextPortion( 0 )
{
- mpEditSource = rText.GetEditSource() ? rText.GetEditSource()->Clone() : NULL;
+ mpEditSource = rText.GetEditSource() ? rText.GetEditSource()->Clone() : nullptr;
if( mpEditSource && mpEditSource->GetTextForwarder() )
{
@@ -394,7 +394,7 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rT
}
else
{
- mpPortions = NULL;
+ mpPortions = nullptr;
}
}
@@ -419,7 +419,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
{
SolarMutexGuard aGuard;
- if( mpPortions == NULL || mnNextPortion >= mpPortions->size() )
+ if( mpPortions == nullptr || mnNextPortion >= mpPortions->size() )
throw container::NoSuchElementException();
sal_uInt16 nStartPos = 0;
@@ -432,17 +432,17 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
const SvxUnoTextRangeBaseList& rRanges( mpEditSource->getRanges() );
- SvxUnoTextRange* pRange = 0;
+ SvxUnoTextRange* pRange = nullptr;
SvxUnoTextRangeBaseList::const_iterator aIter;
- for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pRange == 0); ++aIter )
+ for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pRange == nullptr); ++aIter )
{
SvxUnoTextRange* pIterRange = dynamic_cast< SvxUnoTextRange* >( (*aIter ) );
if( pIterRange && pIterRange->mbPortion && (aSel.IsEqual( pIterRange->maSelection ) ) )
pRange = pIterRange;
}
- if( pRange == 0 )
+ if( pRange == nullptr )
{
pRange = new SvxUnoTextRange( mrParentText, true );
pRange->SetSelection(aSel);
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 6b69e0478466..c9aef52f4294 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -81,7 +81,7 @@ public:
SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine )
: maRefCount(0),
mpEditEngine( pEditEngine ),
- mpTextForwarder(NULL)
+ mpTextForwarder(nullptr)
{
}
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index b3c1042e1f39..53ea51b4d18f 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -81,7 +81,7 @@ SvxXMLTextImportContext::~SvxXMLTextImportContext()
SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
{
- SvXMLImportContext* pContext = NULL;
+ SvXMLImportContext* pContext = nullptr;
if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
{
pContext = new SvxXMLTextImportContext( GetImport(), nPrefix, rLocalName, xAttrList, mxText );
@@ -97,7 +97,7 @@ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPre
pContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList );
}
- if( NULL == pContext )
+ if( nullptr == pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
return pContext;
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 006b693890b0..0d1b8e493129 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -76,7 +76,7 @@ namespace accessibility
// This has to be the instance of <AccessibleParaManager>, which
// created and manages this accessible paragraph.
AccessibleEditableTextPara ( const css::uno::Reference< css::accessibility::XAccessible >& rParent,
- const AccessibleParaManager* _pParaManager = NULL );
+ const AccessibleParaManager* _pParaManager = nullptr );
virtual ~AccessibleEditableTextPara ();
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 6500a0c90bed..d7e46488cbac 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -61,12 +61,12 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual sal_uInt16 GetValueCount() const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index c8851cf48ed7..67830a704d26 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -40,14 +40,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 58818451bffc..8bd272377ded 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -40,13 +40,13 @@ public:
SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 5fbe55f3f60e..3e23250c2a69 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -69,13 +69,13 @@ namespace editeng {
Color (*m_pColorGapFn)( Color );
public:
- SvxBorderLine( const Color *pCol = 0,
+ SvxBorderLine( const Color *pCol = nullptr,
long nWidth = 0,
SvxBorderStyle nStyle = css::table::BorderLineStyle::SOLID,
bool bUseLeftTop = false,
Color (*pColorOutFn)( Color ) = &darkColor,
Color (*pColorInFn)( Color ) = &darkColor,
- Color (*pColorGapFn)( Color ) = NULL );
+ Color (*pColorGapFn)( Color ) = nullptr );
SvxBorderLine( const SvxBorderLine& r );
SvxBorderLine& operator=( const SvxBorderLine& r );
@@ -83,7 +83,7 @@ namespace editeng {
const Color& GetColor() const { return aColor; }
Color GetColorOut( bool bLeftOrTop = true ) const;
Color GetColorIn( bool bLeftOrTop = true ) const;
- bool HasGapColor() const { return m_pColorGapFn != NULL; }
+ bool HasGapColor() const { return m_pColorGapFn != nullptr; }
Color GetColorGap() const;
void SetWidth( long nWidth = 0 );
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index c8533fcdcbe8..763ed0899745 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -77,9 +77,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -186,11 +186,11 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 6d0e1ee26299..a6909f546cc2 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -79,13 +79,13 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 2d9bae5c35c7..79929d402c40 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -63,7 +63,7 @@ public:
SvxBulletItem( const SvxBulletItem& );
virtual ~SvxBulletItem();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override;
virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const override;
@@ -96,7 +96,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
static void StoreFont( SvStream&, const vcl::Font& );
static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer );
diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index 8e008714782f..a735aea3641a 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -36,11 +36,11 @@ public:
SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index 979fe5715085..34f39caa4f65 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -39,7 +39,7 @@ public:
SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -51,7 +51,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index bededa42c4b3..74a90b50dae5 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -43,7 +43,7 @@ public:
bool bFitIntoLine /*= false*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -52,7 +52,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index e8a0738ace40..289d4d63ed4e 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -40,7 +40,7 @@ public:
SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -49,7 +49,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 95372c412158..ebb8994378b4 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -44,9 +44,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 0e20f08202fd..942cb2586c9a 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -44,9 +44,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index b7ae9574d3f1..828c58ea589b 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -51,9 +51,9 @@ public:
virtual bool GetPresentation(SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper* pIntlWrapper = 0) const override;
+ OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override;
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override;
virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override;
@@ -81,7 +81,7 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem
SvxBackgroundColorItem(SvStream& rStrm, const sal_uInt16 nId);
SvxBackgroundColorItem(const SvxBackgroundColorItem& rCopy);
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 2fbf0aaf03da..4837c7023251 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -37,14 +37,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxContourItem& operator=(const SvxContourItem& rCont)
{
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 9f0af96e42cc..fc1737932acf 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -43,9 +43,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 349efd93045e..e92101c86101 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -340,7 +340,7 @@ struct EENotify
sal_Int32 nParam2;
EENotify( EENotifyType eType )
- { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; }
+ { eNotificationType = eType; pEditEngine = nullptr; pEditView = nullptr; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; }
};
#endif // INCLUDED_EDITENG_EDITDATA_HXX
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 5f9779defe11..f60f826a19d5 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -160,7 +160,7 @@ private:
EditEngine( const EditEngine& ) = delete;
EditEngine& operator=( const EditEngine& ) = delete;
- EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL );
+ EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = nullptr );
EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
EDITENG_DLLPRIVATE void CheckIdleFormatter();
@@ -371,7 +371,7 @@ public:
void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
// sal_uInt32: Error code of the stream.
- sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+ sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
sal_uLong Write( SvStream& rOutput, EETextFormat );
void SetStatusEventHdl( const Link<EditStatus&,void>& rLink );
@@ -563,7 +563,7 @@ public:
const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = css::i18n::CharacterIteratorMode::SKIPCELL);
void SeekCursor(
- ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0);
+ ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr, sal_uInt16 nIgnoreWhich = 0);
EditPaM DeleteSelection(const EditSelection& rSel);
@@ -602,7 +602,7 @@ public:
const ViewsType& GetEditViews() const;
void SetUndoMode(bool b);
- void FormatAndUpdate(EditView* pCurView = NULL);
+ void FormatAndUpdate(EditView* pCurView = nullptr);
bool Undo(EditView* pView);
bool Redo(EditView* pView);
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index be36b0173829..6a0eac90b886 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -100,7 +100,7 @@ public:
bool Store( SvStream& rOStream ) const;
static EditTextObject* Create(
- SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = NULL );
+ SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = nullptr );
sal_Int32 GetParagraphCount() const;
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 7a1fcebf16b8..7de96d90dd0d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -106,7 +106,7 @@ public:
void SetWindow( vcl::Window* pWin );
vcl::Window* GetWindow() const;
- void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 );
+ void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr );
void Invalidate();
Pair Scroll( long nHorzScroll, long nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
@@ -149,7 +149,7 @@ public:
void InsertText( const OUString& rNew, bool bSelect = false );
- bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL );
+ bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = nullptr );
bool MouseButtonUp( const MouseEvent& rMouseEvent );
bool MouseButtonDown( const MouseEvent& rMouseEvent );
@@ -177,7 +177,7 @@ public:
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs = false );
- sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+ sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const;
@@ -206,7 +206,7 @@ public:
void SetAnchorMode( EVAnchorMode eMode );
EVAnchorMode GetAnchorMode() const;
- void CompleteAutoCorrect( vcl::Window* pFrameWin = NULL );
+ void CompleteAutoCorrect( vcl::Window* pFrameWin = nullptr );
EESpellState StartSpeller( bool bMultipleDoc = false );
EESpellState StartThesaurus();
@@ -219,12 +219,12 @@ public:
bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false );
bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false );
- void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = 0 );
+ void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = nullptr );
void InsertField( const SvxFieldItem& rFld );
const SvxFieldItem* GetFieldUnderMousePointer() const;
const SvxFieldItem* GetFieldUnderMousePointer( sal_Int32& nPara, sal_Int32& nPos ) const;
- const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = NULL, sal_Int32* pnPos = NULL ) const;
+ const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = nullptr, sal_Int32* pnPos = nullptr ) const;
const SvxFieldItem* GetFieldAtSelection() const;
diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx
index 4a1738e1e83a..da936d7def91 100644
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@@ -45,9 +45,9 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index cfeca83637cd..767af0af05c5 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -56,12 +56,12 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index ac1a6d995125..7325fa02a156 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -55,9 +55,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nItemVersion) const override;
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 3b2523b2a404..25a59321176a 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -80,7 +80,7 @@ public:
virtual ~SvxFieldItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index 4932a691107e..6afb9aaba87c 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -49,14 +49,14 @@ public:
SvxFontListItem( const SvxFontListItem& rItem );
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
const FontList* GetFontList() const { return pFontList; }
};
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 2dc596b434bd..e12c2b3d83ee 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -50,7 +50,7 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==(const SfxPoolItem& rItem) const override;
- virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16) const override;
virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
@@ -58,7 +58,7 @@ public:
virtual bool GetPresentation(SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper* = 0) const override;
+ OUString &rText, const IntlWrapper* = nullptr) const override;
// Access methods:
void SetFamilyName(const OUString& rFamilyName)
diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx
index 9fe72c8a8cd6..9dedc00be0c0 100644
--- a/include/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
@@ -37,7 +37,7 @@ public:
SvxForbiddenRuleItem( bool bOn /*= false*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -45,7 +45,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
inline SvxForbiddenRuleItem& operator=(
const SvxForbiddenRuleItem& rItem )
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index e73cff48c30b..b8ca73d63185 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -51,10 +51,10 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override;
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index f676fe9c95fe..a4917b31d079 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -41,7 +41,7 @@ public:
sal_uInt16 nWhich );
virtual ~SvxFrameDirectionItem();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -51,7 +51,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index 45ac5aad3e78..494662ae55ec 100644
--- a/include/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
@@ -49,9 +49,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index a29d635de2e9..c03a29a4cd5c 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -36,7 +36,7 @@ public:
SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -44,7 +44,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
inline SvxHangingPunctuationItem& operator=(
const SvxHangingPunctuationItem& rItem )
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index d008e278ef97..7f968f72a2e0 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -54,9 +54,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 22e3962fedc6..484df51ca67e 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -39,14 +39,14 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( sal_uInt16 nVal );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
@@ -72,14 +72,14 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( sal_uInt16 nVal );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
@@ -101,14 +101,14 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( sal_uInt16 nVal );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r);
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index ece244cc5ee7..cdba89bc3523 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -40,14 +40,14 @@ public:
inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index fdac1564917c..e11cb7db8ab2 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -42,7 +42,7 @@ public:
SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
@@ -51,7 +51,7 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxKerningItem& operator=(const SvxKerningItem& rKern) {
SetValue( rKern.GetValue() );
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 653621be0f8a..192639be8581 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -44,9 +44,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual sal_uInt16 GetValueCount() const override;
diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx
index a1947c67446f..e331e91ca7c7 100644
--- a/include/editeng/lcolitem.hxx
+++ b/include/editeng/lcolitem.hxx
@@ -40,7 +40,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * pIntlWrapper = 0 )
+ const IntlWrapper * pIntlWrapper = nullptr )
const override;
inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor)
diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index b9f3c904d155..84b32282d436 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -52,9 +52,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 94daed838586..0d39a7ef25ee 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -81,9 +81,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 501946b49827..dc09423254dd 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -58,9 +58,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index a9a04ea2f5cf..5172c65e5b0e 100644
--- a/include/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
@@ -32,14 +32,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
{
diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx
index bd0cc8317446..769df9863803 100644
--- a/include/editeng/nlbkitem.hxx
+++ b/include/editeng/nlbkitem.hxx
@@ -32,14 +32,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB)
{
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 6c4a6500a773..fe39ef257640 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -178,7 +178,7 @@ public:
void SetStart(sal_uInt16 nSet) {nStart = nSet;}
sal_uInt16 GetStart() const {return nStart;}
- virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
+ virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = nullptr, const sal_Int16* pOrient = nullptr);
const SvxBrushItem* GetBrush() const {return pGraphicBrush;}
void SetGraphic( const OUString& rName );
virtual void SetVertOrient(sal_Int16 eSet);
@@ -298,7 +298,7 @@ public:
SvxNumBulletItem(const SvxNumBulletItem& rCopy);
virtual ~SvxNumBulletItem();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const override;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index 84cde229bb3d..a8b2de3ea2a0 100644
--- a/include/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
@@ -41,14 +41,14 @@ public:
inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa )
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 69568e48f612..81a74bea7f8b 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -45,9 +45,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
css::uno::Reference< css::linguistic2::XSpellChecker1 >
@@ -75,9 +75,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override;
virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const override;
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index a3c473b96ada..0642a47722d6 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -39,14 +39,14 @@ public:
SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
{
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 50df0a939a92..632f60d46309 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -225,8 +225,8 @@ public:
void Scroll( long nHorzScroll, long nVertScroll );
- void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 );
- bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL );
+ void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr );
+ bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = nullptr );
bool MouseButtonDown( const MouseEvent& );
bool MouseButtonUp( const MouseEvent& );
void ReleaseMouse();
@@ -263,7 +263,7 @@ public:
bool AdjustHeight( long nDY );
- sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+ sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
void InsertText( const OUString& rNew, bool bSelect = false );
void InsertText( const OutlinerParaObject& rParaObj );
@@ -332,7 +332,7 @@ public:
void ToggleBulletsNumbering(
const bool bToggle,
const bool bHandleBullets,
- const SvxNumRule* pNumRule = NULL );
+ const SvxNumRule* pNumRule = nullptr );
/** apply bullets/numbering for paragraphs
@@ -369,7 +369,7 @@ public:
bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false );
bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false );
- void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = 0 );
+ void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = nullptr );
void SetInvalidateMore( sal_uInt16 nPixel );
sal_uInt16 GetInvalidateMore() const;
@@ -517,8 +517,8 @@ public:
{
pOutliner = pOutl;
nPara = nPa; nPos = nPo;
- pTxtColor = 0; pFldColor = 0; bSimpleClick = false;
- mpSdrPage = 0;
+ pTxtColor = nullptr; pFldColor = nullptr; bSimpleClick = false;
+ mpSdrPage = nullptr;
}
~EditFieldInfo()
{
@@ -538,7 +538,7 @@ public:
void SetFieldColor( const Color& rColor )
{ delete pFldColor; pFldColor = new Color( rColor ); }
void ClearFieldColor()
- { delete pFldColor; pFldColor = 0; }
+ { delete pFldColor; pFldColor = nullptr; }
sal_Int32 GetPara() const { return nPara; }
sal_Int32 GetPos() const { return nPos; }
@@ -641,12 +641,12 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
OUString ImplGetBulletText( sal_Int32 nPara );
void ImplCheckNumBulletItem( sal_Int32 nPara );
void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction = false );
- void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = NULL );
+ void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = nullptr );
void ImplBlockInsertionCallbacks( bool b );
void ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara );
- bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = 0 );
+ bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = nullptr );
void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount );
vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const;
@@ -893,7 +893,7 @@ public:
sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const;
sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine = 0 );
- sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+ sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
::svl::IUndoManager& GetUndoManager();
::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index 56bc33f08994..f66dfeb3a982 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -40,7 +40,7 @@ public:
SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -49,7 +49,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index d13cae123a76..79a4105693fa 100644
--- a/include/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
@@ -43,13 +43,13 @@ public:
inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx
index d32d7e26eefb..34089de2625f 100644
--- a/include/editeng/pgrditem.hxx
+++ b/include/editeng/pgrditem.hxx
@@ -39,14 +39,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
#endif
diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index 8e5c68df7020..458ce78c09db 100644
--- a/include/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
@@ -42,12 +42,12 @@ public:
sal_uInt16 nWh );
inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 3ffc6649132f..758df3b9a949 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -44,9 +44,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx
index bc4c43f66a61..9bd45c0b55c6 100644
--- a/include/editeng/prntitem.hxx
+++ b/include/editeng/prntitem.hxx
@@ -42,14 +42,14 @@ public:
inline SvxPrintItem &operator=( const SvxPrintItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt )
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index d8970407669b..7ce0b1c77aa0 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -50,10 +50,10 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx
index 3952d80e9295..d825d5b40c94 100644
--- a/include/editeng/prszitem.hxx
+++ b/include/editeng/prszitem.hxx
@@ -38,14 +38,14 @@ public:
const sal_uInt16 nID );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize)
{
diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index abe0d1d4a0c6..67f09aceab4b 100644
--- a/include/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
@@ -24,7 +24,7 @@ public:
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {}
SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {}
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index 88e68cd0ca30..21264ec5216d 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -38,7 +38,7 @@ public:
SvxScriptSpaceItem( bool bOn /*= false*/,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -46,7 +46,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
{
diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx
index 4a914d5c9660..5e2bfcf7a0ae 100644
--- a/include/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
@@ -37,7 +37,7 @@ public:
TYPEINFO_OVERRIDE();
explicit SvxScriptTypeItem( SvtScriptType nType = SvtScriptType::LATIN );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
};
@@ -48,7 +48,7 @@ public:
SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override;
static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet,
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 175c000e073d..1fde4bb53f8d 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -42,7 +42,7 @@ public:
TYPEINFO_OVERRIDE();
explicit SvxShadowItem( const sal_uInt16 nId ,
- const Color *pColor = 0, const sal_uInt16 nWidth = 100 /*5pt*/,
+ const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/,
const SvxShadowLocation eLoc = SVX_SHADOW_NONE );
inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow );
@@ -55,9 +55,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 7b6f96074ace..01c649f756b1 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -40,14 +40,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) {
SetValue(rShadow.GetValue());
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index 7540d00e3e87..d4b4a0a17c85 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -51,9 +51,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool ScaleMetrics( long nMult, long nDiv ) override;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index 4143674a766d..8726207bf418 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -42,14 +42,14 @@ public:
inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 801f26c89fc0..1a43725de8e0 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -281,7 +281,7 @@ public:
// to the actual SwTxtNode/EditNode string because it inserts the character
// in rDoc and expects that to side-effect rTxt
sal_uLong DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
- sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = NULL );
+ sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = nullptr );
// Return for the autotext expansion the previous word,
// AutoCorrect - corresponding algorithm
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index c84df967ac0d..869c4ef4c755 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -93,10 +93,10 @@ public:
const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
- const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = NULL ) const;
+ const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = nullptr ) const;
Size QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
- const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = NULL ) const;
+ const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = nullptr ) const;
void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index abe06ea0dac2..d521f1f1499f 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -59,7 +59,7 @@ class ContentNode;
class EditNodeIdx
{
public:
- EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL);
+ EditNodeIdx(EditEngine* pEE, ContentNode* pNd = nullptr);
~EditNodeIdx() {}
sal_Int32 GetIdx() const;
EditNodeIdx* Clone() const; // Cloning itself
@@ -269,7 +269,7 @@ protected:
// Read Document-Info
css::util::DateTime GetDateTimeStamp( );
OUString& GetTextToEndGroup( OUString& rStr );
- void ReadInfo( const sal_Char* pChkForVerNo = 0 );
+ void ReadInfo( const sal_Char* pChkForVerNo = nullptr );
inline SfxItemSet& GetAttrSet();
// no text yet inserted? (SttPos from the top stack entry!)
@@ -395,7 +395,7 @@ inline const Color& SvxRTFParser::GetColor( size_t nId ) const
inline SfxItemSet& SvxRTFParser::GetAttrSet()
{
SvxRTFItemStackType* pTmp;
- if( bNewGroup || 0 == ( pTmp = aAttrStack.empty() ? 0 : aAttrStack.back()) )
+ if( bNewGroup || nullptr == ( pTmp = aAttrStack.empty() ? nullptr : aAttrStack.back()) )
pTmp = _GetAttrSet();
return pTmp->aAttrSet;
}
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index b08d4dc47adf..ad87a3d5eb27 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -147,9 +147,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index 2c94a170a634..a5ebd4b2a823 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -40,14 +40,14 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 3959f9a678d0..87e602517b72 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -43,9 +43,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
@@ -92,7 +92,7 @@ public:
SvxUnderlineItem( const FontUnderline eSt,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
};
@@ -109,7 +109,7 @@ public:
SvxOverlineItem( const FontUnderline eSt,
const sal_uInt16 nId );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
};
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index d71c699fcc61..e3573073cfea 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -55,9 +55,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index f23103c2e41b..ff68e5584c52 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -297,8 +297,8 @@ public:
const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; }
SvxEditSource* GetEditSource() const throw() { return mpEditSource; }
- static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL );
- static bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( css::uno::RuntimeException );
+ static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr );
+ static bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ) throw( css::uno::RuntimeException );
void attachField( const SvxFieldData* pData ) throw();
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 70001f395766..51a347c3bbcb 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -44,9 +44,9 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 243a96b2f6a5..ed1fedcfad9a 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -39,14 +39,14 @@ public:
SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
{
diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx
index c2b0bc516a52..7f5aabc58ede 100644
--- a/include/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
@@ -36,7 +36,7 @@ public:
SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
@@ -46,7 +46,7 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const override;
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index 7f33039fb47f..68e4dac20feb 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -41,14 +41,14 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const override;
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
{
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index c0f104e75ba7..f1c5bac5a275 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -47,14 +47,14 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresentationMetric,
OUString &rText,
- const IntlWrapper *pIntlWrapper = 0 ) const override;
+ const IntlWrapper *pIntlWrapper = nullptr ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- virtual SfxPoolItem *Clone( SfxItemPool * = 0) const override
+ virtual SfxPoolItem *Clone( SfxItemPool * = nullptr) const override
{ return new SvXMLAttrContainerItem( *this ); }
bool AddAttr( const OUString& rLName,