summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdotxat.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdotxat.cxx')
-rw-r--r--svx/source/svdraw/svdotxat.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 62ea55429018..04c39c959932 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -279,7 +279,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
Rectangle aNeuRect(maRect);
bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
if (bRet) {
- Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
+ Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
maRect = aNeuRect;
SetRectsDirty();
if (HAS_BASE(SdrRectObj,this)) { // this is a hack
@@ -297,12 +297,12 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
void SdrTextObj::ImpSetTextStyleSheetListeners()
{
- SfxStyleSheetBasePool* pStylePool=pModel!=NULL ? pModel->GetStyleSheetPool() : NULL;
- if (pStylePool!=NULL)
+ SfxStyleSheetBasePool* pStylePool=pModel!=nullptr ? pModel->GetStyleSheetPool() : nullptr;
+ if (pStylePool!=nullptr)
{
std::vector<OUString> aStyleNames;
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
- if (pOutlinerParaObject!=NULL)
+ if (pOutlinerParaObject!=nullptr)
{
// First, we collect all stylesheets contained in the ParaObject in
// the container aStyles. The Family is always appended to the name
@@ -348,7 +348,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
SfxStyleFamily eFam = ReadFamilyFromStyleName(aName);
SfxStyleSheetBase* pStyleBase = pStylePool->Find(aName,eFam);
SfxStyleSheet* pStyle = dynamic_cast<SfxStyleSheet*>( pStyleBase );
- if (pStyle!=NULL && pStyle!=GetStyleSheet()) {
+ if (pStyle!=nullptr && pStyle!=GetStyleSheet()) {
aStyleSheets.insert(pStyle);
}
}
@@ -358,7 +358,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
nNum--;
SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum);
SfxStyleSheet* pStyle=dynamic_cast<SfxStyleSheet*>( pBroadcast );
- if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // special case for stylesheet of the object
+ if (pStyle!=nullptr && pStyle!=GetStyleSheet()) { // special case for stylesheet of the object
if (aStyleSheets.find(pStyle)==aStyleSheets.end()) {
EndListening(*pStyle);
}
@@ -384,11 +384,11 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
while( --nText >= 0 )
{
SdrText* pText = getText( nText );
- OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : 0;
+ OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : nullptr;
if(pOutlinerParaObject)
{
- Outliner* pOutliner = 0;
+ Outliner* pOutliner = nullptr;
if( pEdtOutl || (pText == getActiveText()) )
pOutliner = pEdtOutl;