summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-04-28 13:27:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-04-28 21:37:43 +0200
commitc33f08ca36084643e6eed20c18f151cf75045c62 (patch)
tree9f9936e77ae004ced1fc7fde574b8ee4c85a66d1 /sw/source
parent9f46ae1ab572b62af01119dcd473f99184e4760c (diff)
createPixelProcessor2DFromOutputDevice won't return null
nor will createProcessor2DFromOutputDevice Change-Id: I1e0359ef2f94eeaf2da9a89d9e9dfb615587d3da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114814 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/notxtfrm.cxx10
-rw-r--r--sw/source/core/layout/paintfrm.cxx7
2 files changed, 6 insertions, 11 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index dd93b15e9aaf..c0b8984e6cf4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -906,12 +906,10 @@ static bool paintUsingPrimitivesHelper(
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rOutputDevice, aViewInformation2D) );
- if(pProcessor2D)
- {
- // render and cleanup
- pProcessor2D->process(rSequence);
- return true;
- }
+
+ // render and cleanup
+ pProcessor2D->process(rSequence);
+ return true;
}
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index edd2491ad138..01fe03594ba9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1800,11 +1800,8 @@ bool DrawFillAttributes(
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rOut,
aViewInformation2D) );
- if(pProcessor)
- {
- pProcessor->process(*pPrimitives);
- return true;
- }
+ pProcessor->process(*pPrimitives);
+ return true;
}
}
}