diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-10-28 17:23:42 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-10-28 17:23:42 +0000 |
| commit | c6ad2a34d38795059888d3c900dbf1047bfd5fdd (patch) | |
| tree | 88de58a63003bd2ea6edda9c895d3c0466a38e6b /src/extension/internal/cdr-input.cpp | |
| parent | text change (diff) | |
| parent | Fix for bug #1156394 (OCAL dialog: Close button in German localization contai... (diff) | |
| download | inkscape-c6ad2a34d38795059888d3c900dbf1047bfd5fdd.tar.gz inkscape-c6ad2a34d38795059888d3c900dbf1047bfd5fdd.zip | |
mrege from trunk
(bzr r12417.1.31)
Diffstat (limited to 'src/extension/internal/cdr-input.cpp')
| -rw-r--r-- | src/extension/internal/cdr-input.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index 517d6fb9c..0111ed626 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -256,9 +256,10 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u } SPDocument * doc = SPDocument::createNewDocFromMem(tmpSVGOutput[page_num-1].cstr(), strlen(tmpSVGOutput[page_num-1].cstr()), TRUE); + // Set viewBox if it doesn't exist - if (!doc->getRoot()->viewBox_set) { - doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().quantity, doc->getHeight().quantity)); + if (doc && !doc->getRoot()->viewBox_set) { + doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDefaultUnit()), doc->getHeight().value(doc->getDefaultUnit()))); } return doc; } |