From: joncruz <joncruz@users.sourceforge.net>
Date: Sat, 12 May 2007 19:15:27 +0000 (+0000)
Subject: Cleaned up test doc creation
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad48be5cb0871489b5a940f1686c18ed2ffd809c;p=inkscape.git

Cleaned up test doc creation
---

diff --git a/src/document.cpp b/src/document.cpp
index 6ab08ffb6..f4ebfb7cb 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -405,11 +405,6 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv
     return doc;
 }
 
-SPDocument *sp_document_new_dummy() {
-    SPDocument *document = new SPDocument();
-    return document;
-}
-
 SPDocument *
 sp_document_ref(SPDocument *doc)
 {
diff --git a/src/document.h b/src/document.h
index d9acc93fc..94b976314 100644
--- a/src/document.h
+++ b/src/document.h
@@ -141,7 +141,6 @@ public:
 
 SPDocument *sp_document_new (const gchar *uri, unsigned int keepalive, bool make_new = false);
 SPDocument *sp_document_new_from_mem (const gchar *buffer, gint length, unsigned int keepalive);
-SPDocument *sp_document_new_dummy(); 
 
 SPDocument *sp_document_ref (SPDocument *doc);
 SPDocument *sp_document_unref (SPDocument *doc);
diff --git a/src/sp-style-elem.cpp b/src/sp-style-elem.cpp
index 63a9bae38..fa756242c 100644
--- a/src/sp-style-elem.cpp
+++ b/src/sp-style-elem.cpp
@@ -367,7 +367,9 @@ sp_style_elem_read_content(SPObject *const object)
     // that uses a style from it. It just forces the parent of <style> to reread its style as soon as the stylesheet
     // is fully loaded. Naturally, this won't work if the user of the stylesheet is its grandparent or precedent.
     SPObject *parent = SP_OBJECT_PARENT (object);
-    sp_style_read_from_object(parent->style, parent);
+    if ( parent ) {
+        sp_style_read_from_object(parent->style, parent);
+    }
 }
 
 /**
diff --git a/src/test-helpers.h b/src/test-helpers.h
index 594f4b7ae..8dba0c942 100644
--- a/src/test-helpers.h
+++ b/src/test-helpers.h
@@ -32,7 +32,7 @@ T* createSuiteAndDocument( void (*fun)(T*&) )
         static_cast<void>(g_object_new(inkscape_get_type(), NULL));
     }
 
-    SPDocument* tmp = sp_document_new_dummy();
+    SPDocument* tmp = sp_document_new( NULL, TRUE, true );
     if ( tmp ) {
         fun( suite );
         if ( suite )