diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2019-04-06 18:54:25 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2019-04-06 18:54:25 +0000 |
| commit | 87eb273ceca7e4212a4bfbf2e04b616bac73a701 (patch) | |
| tree | 5974d5938b0a71bf48a5486c5d669c4767aa2341 /src/extension | |
| parent | CMake: Fix module FindDoubleConversion.cmake (diff) | |
| download | inkscape-87eb273ceca7e4212a4bfbf2e04b616bac73a701.tar.gz inkscape-87eb273ceca7e4212a4bfbf2e04b616bac73a701.zip | |
More document.h cleanup.
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/implementation/script.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/emf-print.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/odf.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/svg.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/wmf-print.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index b87b8cb15..53f082955 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -718,7 +718,7 @@ void Script::effect(Inkscape::Extension::Effect *module, if (vd != nullptr) { vd->emitReconstructionStart(); - copy_doc(vd->rroot, mydoc->rroot); + copy_doc(vd->getReprRoot(), mydoc->getReprRoot()); vd->emitReconstructionFinish(); // Getting the named view from the document generated by the extension diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 880cd00d2..6d330f2ea 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -149,7 +149,7 @@ unsigned int PrintEmf::begin(Inkscape::Extension::Print *mod, SPDocument *doc) htextalignment = U_TA_BASELINE | U_TA_LEFT; use_stroke = use_fill = simple_shape = usebk = false; - Inkscape::XML::Node *nv = sp_repr_lookup_name(doc->rroot, "sodipodi:namedview"); + Inkscape::XML::Node *nv = doc->getReprNamedView(); if (nv) { const char *p1 = nv->attribute("pagecolor"); char *p2; diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index f2192b9af..6debd3f28 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -2044,7 +2044,7 @@ void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gcha docBaseUri = Inkscape::URI::from_dirname(doc->getDocumentBase()).str(); ZipFile zf; - preprocess(zf, doc->rroot); + preprocess(zf, doc->getReprRoot()); if (!writeManifest(zf)) { @@ -2052,7 +2052,7 @@ void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gcha return; } - if (!writeContent(zf, doc->rroot)) + if (!writeContent(zf, doc->getReprRoot())) { g_warning("Failed to write content"); return; diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 7247536e9..9b4b55e21 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -83,7 +83,7 @@ SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) _docname = docname; _xref = xref; _xml_doc = _doc->getReprDoc(); - _container = _root = _doc->rroot; + _container = _root = _doc->getReprRoot(); _root->setAttribute("xml:space", "preserve"); _init(); diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 50a045a94..b5acf81a8 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -867,7 +867,7 @@ Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena { g_return_if_fail(doc != nullptr); g_return_if_fail(filename != nullptr); - Inkscape::XML::Document *rdoc = doc->rdoc; + Inkscape::XML::Document *rdoc = doc->getReprDoc(); bool const exportExtensions = ( !mod->get_id() || !strcmp (mod->get_id(), SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE) diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 7c7e2572e..9eba6cae8 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -142,7 +142,7 @@ unsigned int PrintWmf::begin(Inkscape::Extension::Print *mod, SPDocument *doc) htextalignment = U_TA_BASELINE | U_TA_LEFT; use_stroke = use_fill = simple_shape = usebk = false; - Inkscape::XML::Node *nv = sp_repr_lookup_name(doc->rroot, "sodipodi:namedview"); + Inkscape::XML::Node *nv = doc->getReprNamedView(); if (nv) { const char *p1 = nv->attribute("pagecolor"); char *p2; |
