summaryrefslogtreecommitdiffstats
path: root/src/resource-manager.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
commit51639504fbee801b07900b8ffeef069157d298cb (patch)
tree6aec1edd9cfaf33d18e8f2cb61e90bcfaf99b9e1 /src/resource-manager.cpp
parentFixes to CPU (diff)
parentMerge branch 'luzpaz/inkscape-typos' (!119) (diff)
downloadinkscape-51639504fbee801b07900b8ffeef069157d298cb.tar.gz
inkscape-51639504fbee801b07900b8ffeef069157d298cb.zip
Merge branch 'master' into fixSymbolsCpuProblems
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();
}