summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-10-29 10:01:26 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-10-29 10:01:26 +0000
commit3630eed967e5b7020d1c1fc1b14fcf9819103d46 (patch)
tree2ff0fa96e32bb6aec2c208845c81cb9a19c780a9 /src/ui
parentmerge from trunk (r11826) (diff)
parentFix for 165865 : Markers - fix Undo history (diff)
downloadinkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.tar.gz
inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.zip
merge from trunk (r11850)
(bzr r11668.1.36)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/print.cpp2
-rw-r--r--src/ui/dialog/symbols.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index e940a3f55..2ab8cf121 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -138,7 +138,7 @@ static void draw_page(
#endif
bool ret = ctx->setSurfaceTarget (surface, true, &ctm);
if (ret) {
- ret = renderer.setupDocument (ctx, junk->_doc, TRUE, NULL);
+ ret = renderer.setupDocument (ctx, junk->_doc, TRUE, 0., NULL);
if (ret) {
renderer.renderItem(ctx, junk->_base);
ret = ctx->finish();
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 82af60fc2..4e1b82ebe 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -418,6 +418,8 @@ void SymbolsDialog::draw_symbols( SPDocument* symbolDocument ) {
(*row)[columns->symbol_image] = pixbuf;
}
}
+
+ delete columns;
}
/*