From 5835eaa282065fe8f44fb071a467f10c0adcb76a Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Tue, 6 Nov 2018 11:18:22 +0100
Subject: fix clipboard URL rebasing

---
 src/xml/rebase-hrefs.cpp | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

(limited to 'src/xml/rebase-hrefs.cpp')

diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index e484ee7a1..c6276a610 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -103,7 +103,12 @@ Inkscape::XML::rebase_href_attrs(gchar const *const old_abs_base,
         uri = URI::from_native_filename(sp_absref);
     }
 
-    auto new_href = uri.str(URI::from_dirname(new_abs_base).str().c_str());
+    std::string baseuri;
+    if (new_abs_base) {
+        baseuri = URI::from_dirname(new_abs_base).str();
+    }
+
+    auto new_href = uri.str(baseuri.c_str());
 
     ret = cons(AttributeRecord(href_key, share_string(new_href.c_str())), ret); // Check if this is safe/copied or if it is only held.
     if (sp_absref) {
@@ -118,40 +123,6 @@ Inkscape::XML::rebase_href_attrs(gchar const *const old_abs_base,
     return ret;
 }
 
-// std::string Inkscape::XML::rebase_href_attrs( std::string const &oldAbsBase, std::string const &newAbsBase, gchar const * /*href*/, gchar const */*absref*/ )
-// {
-//     std::string ret;
-//     //g_message( "XX  need to flip from [%s] to [%s]", oldAbsBase.c_str(), newAbsBase.c_str() );
-
-//     if ( oldAbsBase != newAbsBase ) {
-//     }
-
-//     return ret;
-// }
-
-std::string Inkscape::XML::calc_abs_doc_base(gchar const *doc_base)
-{
-    /* Note that we don't currently try to handle the case of doc_base containing
-     * `..' or `.' path components.  This non-handling means that sometimes
-     * sp_relative_path_from_path will needlessly give an absolute path.
-     *
-     * It's probably not worth trying to address this until we're using proper
-     * relative URL/IRI href processing (with liburiparser).
-     *
-     * (Note that one possible difficulty with `..' is symlinks.) */
-    std::string ret;
-
-    if (!doc_base) {
-        ret = Glib::get_current_dir();
-    } else if (Glib::path_is_absolute(doc_base)) {
-        ret = doc_base;
-    } else {
-        ret = Glib::build_filename( Glib::get_current_dir(), doc_base );
-    }
-
-    return ret;
-}
-
 void Inkscape::XML::rebase_hrefs(SPDocument *const doc, gchar const *const new_base, bool const spns)
 {
     using Inkscape::URI;
-- 
cgit v1.2.3