Fixed a possible NULL-dereference found by cppcheck in svx

1248e2af · Josh Heidenreich · 30869cdc · 1248e2af
Kaydet (Commit) 1248e2af authored Şub 20, 2012 tarafından Josh Heidenreich
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

svdotextpathdecomposition.cxx svx/source/svdraw/svdotextpathdecomposition.cxx +7 -6

No files found.
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -361,15 +361,16 @@ namespace
            {
                const impPathTextPortion* pCandidate = rTextPortions[a];
                basegfx::B2DVector aFontScaling;
-                const drawinglayer::attribute::FontAttribute aCandidateFontAttribute(
-                    drawinglayer::primitive2d::getFontAttributeFromVclFont(
-                        aFontScaling,
-                        pCandidate->getFont(),
-                        pCandidate->isRTL(),
-                        false));

                if(pCandidate && pCandidate->getTextLength())
                {
+                    const drawinglayer::attribute::FontAttribute aCandidateFontAttribute(
+                        drawinglayer::primitive2d::getFontAttributeFromVclFont(
+                            aFontScaling,
+                            pCandidate->getFont(),
+                            pCandidate->isRTL(),
+                            false));
+
                    drawinglayer::primitive2d::TextLayouterDevice aTextLayouter;
                    aTextLayouter.setFont(pCandidate->getFont());
                    xub_StrLen nUsedTextLength(0);