summaryrefslogtreecommitdiffstats
path: root/src/resource-manager.cpp
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-11-10 18:57:54 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-11-10 18:57:54 +0000
commitdc6c4dc337aa2ad766cada2eb06fe4c186a89d14 (patch)
tree3fc8d3fd109b7c89751183b8be880e856be5ff34 /src/resource-manager.cpp
parentMerge branch 'master' into powerpencil (diff)
parentRemoving regects (diff)
downloadinkscape-dc6c4dc337aa2ad766cada2eb06fe4c186a89d14.tar.gz
inkscape-dc6c4dc337aa2ad766cada2eb06fe4c186a89d14.zip
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/resource-manager.cpp')
-rw-r--r--src/resource-manager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index 4901cf424..af81298e3 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -130,7 +130,7 @@ public:
/**
* Try to parse href into a local filename using standard methods.
*
- * @return true if successfull.
+ * @return true if successful.
*/
bool extractFilepath( Glib::ustring const &href, std::string &uri );
@@ -138,7 +138,7 @@ public:
* Try to parse href into a local filename using some non-standard methods.
* This means the href is likely invalid and should be rewritten.
*
- * @return true if successfull.
+ * @return true if successful.
*/
bool reconstructFilepath( Glib::ustring const &href, std::string &uri );
@@ -362,7 +362,7 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc)
SPObject *updated = doc->getObjectByRepr(ir);
if (updated) {
- // force immediate update of dependant attributes
+ // force immediate update of dependent attributes
updated->updateRepr();
}