summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-05-15 10:16:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-16 10:18:02 +0000
commitbd55f05b332c1573bd410fd9e21ea7fcf977e1b0 (patch)
tree08f503f79525d95d88b36a9546b1e41cc00b1cfb /svgio
parent409ba4cc0b55e3dc1d3a08c2fb543bc59c4c0da9 (diff)
Resolves: #i118780# Moved ObjectInfoPrimitive2D extractor to drawinglayer...
changed name to be the filename only, added code to SW to set Title and Desc Conflicts: drawinglayer/Library_drawinglayer.mk drawinglayer/Package_inc.mk svx/source/svdraw/svdograf.cxx sw/inc/ndgrf.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/docnode/swbaslnk.cxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/rtf/rtffly.cxx Change-Id: Id433031958529498441574dafe2fbd5261371efc
Notes
Notes: merged as: 977a0eff5415a2a4716e02bfab8e69ffb64ad7ce
Diffstat (limited to 'svgio')
-rw-r--r--svgio/source/svgreader/svgnode.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index acab42aeadee..639aa0cafadb 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -22,6 +22,7 @@
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
+#include <tools/urlobj.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -204,6 +205,16 @@ namespace svgio
if(SVGTokenSvg == getType())
{
aObjectName = getDocument().getAbsolutePath();
+
+ if(aObjectName.getLength())
+ {
+ INetURLObject aURL(aObjectName);
+
+ aObjectName = aURL.getName(
+ INetURLObject::LAST_SEGMENT,
+ true,
+ INetURLObject::DECODE_WITH_CHARSET);
+ }
}
// pack in ObjectInfoPrimitive2D group