diff options
| author | mathog <> | 2016-01-17 02:25:53 +0000 |
|---|---|---|
| committer | mathog <> | 2016-01-17 02:25:53 +0000 |
| commit | f05f886e8bd15df056f2318f99eae920d9cd20d4 (patch) | |
| tree | ae6791b675945a6343a16e6467984cb32001ba86 /src/extension/internal/wmf-print.cpp | |
| parent | Coalesce g_object_new/g_object_set calls; change guide origin pickable to fal... (diff) | |
| download | inkscape-f05f886e8bd15df056f2318f99eae920d9cd20d4.tar.gz inkscape-f05f886e8bd15df056f2318f99eae920d9cd20d4.zip | |
patch probably fixes bug 1534833
(bzr r14594)
Diffstat (limited to 'src/extension/internal/wmf-print.cpp')
| -rw-r--r-- | src/extension/internal/wmf-print.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 431053085..3d913bf1e 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -1325,7 +1325,7 @@ unsigned int PrintWmf::print_pathv(Geom::PathVector const &pathv, const Geom::Af unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *text, Geom::Point const &p, SPStyle const *const style) { - if (!wt) { + if (!wt || !text) { return 0; } @@ -1369,6 +1369,9 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te char *latin1_text = U_Utf16leToLatin1(unicode_text, 0, NULL); free(unicode_text); + // in some cases a UTF string may reduce to NO latin1 characters, which returns NULL + if(!latin1_text){ return 0; } + //PPT gets funky with text within +-1 degree of a multiple of 90, but only for SOME fonts.Snap those to the central value //Some funky ones: Arial, Times New Roman //Some not funky ones: Symbol and Verdana. |