summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/textchainflow.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:50 +0100
commit6cd7bf2043146a630925a2e49336f02c802f707a (patch)
tree786cecd8ab993e25cda497d45b68007050c30d61 /svx/source/svdraw/textchainflow.cxx
parent28f4bee7bd7378141d8569186162e1a3166eb012 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/svdraw/textchainflow.cxx')
-rw-r--r--svx/source/svdraw/textchainflow.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 7ef3c006afb4..7d58612b60e8 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -38,8 +38,8 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget)
mbOFisUFinduced = false;
- mpOverflChText = NULL;
- mpUnderflChText = NULL;
+ mpOverflChText = nullptr;
+ mpUnderflChText = nullptr;
maCursorEvent = CursorChainingEvent::NULL_EVENT;
mbPossiblyCursorOut = false;
@@ -72,7 +72,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p
bool bOldUpdateMode = pFlowOutl->GetUpdateMode();
// XXX: This could be reorganized moving most of this stuff inside EditingTextChainFlow
- if (pParamOutl != NULL)
+ if (pParamOutl != nullptr)
{
// We need this since it's required to check overflow
pFlowOutl->SetUpdateMode(true);
@@ -101,12 +101,12 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p
mpOverflChText = bOverflow ?
new OFlowChainedText(pFlowOutl, bMustMergeParaOF) :
- NULL;
+ nullptr;
// Set current underflowing text (if any)
mpUnderflChText = bUnderflow ?
new UFlowChainedText(pFlowOutl, bMustMergeParaAmongLinks) :
- NULL;
+ nullptr;
// Reset update mode // Reset it here because we use WriteRTF (needing updatemode = true) in the two constructors above
if (!bOldUpdateMode) // Reset only if the old value was false
@@ -140,7 +140,7 @@ void TextChainFlow::impUpdateCursorInfo()
void TextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
{
- impCheckForFlowEvents(pFlowOutl, NULL);
+ impCheckForFlowEvents(pFlowOutl, nullptr);
}
@@ -275,7 +275,7 @@ void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
{
// if this is editing outliner no need to set parameters
if (pFlowOutl == GetLinkTarget()->pEdtOutl)
- impCheckForFlowEvents(pFlowOutl, NULL);
+ impCheckForFlowEvents(pFlowOutl, nullptr);
else
impCheckForFlowEvents(pFlowOutl, GetLinkTarget()->pEdtOutl);