summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/source/outdev/font.cxx3
-rw-r--r--vcl/source/outdev/text.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 8cdaebb612df..09e7bdcd2987 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -974,7 +974,8 @@ bool OutputDevice::InitFont() const
const LogicalFontInstance* OutputDevice::GetFontInstance() const
{
- InitFont();
+ if (!InitFont())
+ return nullptr;
return mpFontInstance.get();
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index e2e135812ff8..5ebd16294fa2 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -227,7 +227,8 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout )
pVDev->SetTextColor( COL_BLACK );
pVDev->SetTextFillColor();
pVDev->ImplNewFont();
- pVDev->InitFont();
+ if (!pVDev->InitFont())
+ return false;
pVDev->ImplInitTextColor();
// draw text into upper left corner