diff --git a/src/document.cpp b/src/document.cpp
index a61dffc0b4a1c3fd78d7a9045dc88c51dcc1ab86..252c9b17379070e296bc2cc7b058400b42b841da 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
static gint doc_count = 0;
+static unsigned long next_serial = 0;
+
SPDocument::SPDocument() {
SPDocumentPrivate *p;
p = new SPDocumentPrivate();
+ p->serial = next_serial++;
+
p->iddef = g_hash_table_new(g_direct_hash, g_direct_equal);
p->reprdef = g_hash_table_new(g_direct_hash, g_direct_equal);
//delete this->_whiteboard_session_manager;
}
+unsigned long SPDocument::serial() const {
+ return priv->serial;
+}
+
void SPDocument::queueForOrphanCollection(SPObject *object) {
g_return_if_fail(object != NULL);
g_return_if_fail(SP_OBJECT_DOCUMENT(object) == this);
@@ -397,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)
{
}
/**
- * Given an NRRect that may, for example, correspond to the bbox of an object
+ * Given an NR::Rect that may, for example, correspond to the bbox of an object,
* this function fits the canvas to that rect by resizing the canvas
* and translating the document root into position.
*/
-void SPDocument::fitToRect(NRRect const & rect)
+void SPDocument::fitToRect(NR::Rect const &rect)
{
- g_return_if_fail(!nr_rect_d_test_empty(&rect));
-
- gdouble w = rect.x1 - rect.x0;
- gdouble h = rect.y1 - rect.y0;
- gdouble old_height = sp_document_height(this);
- SPUnit unit = sp_unit_get_by_id(SP_UNIT_PX);
- sp_document_set_width(this, w, &unit);
- sp_document_set_height(this, h, &unit);
-
- NR::translate tr = NR::translate::translate(-rect.x0,-(rect.y0 + (h - old_height)));
- static_cast<SPGroup *>(root)->translateChildItems(tr);
+ g_return_if_fail(!rect.isEmpty());
+
+ using NR::X; using NR::Y;
+ double const w = rect.extent(X);
+ double const h = rect.extent(Y);
+
+ double const old_height = sp_document_height(this);
+ SPUnit const &px(sp_unit_get_by_id(SP_UNIT_PX));
+ sp_document_set_width(this, w, &px);
+ sp_document_set_height(this, h, &px);
+
+ NR::translate const tr(NR::Point(0, (old_height - h))
+ - rect.min());
+ SP_GROUP(root)->translateChildItems(tr);
}
void sp_document_set_uri(SPDocument *document, gchar const *uri)