[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                              |    3 +++
 patches/dev300/edit-links-decode-unicode-uri.diff |   13 +++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit c77a3ca96a5fbca8665cf8d7956cd73a425b7641
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Aug 11 13:36:28 2009 -0400

    Decode hex-encoded unicode string in document URI in Edit Links dialog.
    
    * patches/dev300/apply:
    * patches/dev300/edit-links-decode-unicode-uri.diff: fixes i#104166.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4162003..74f2fb8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3282,6 +3282,9 @@ svx-autoshape-cache-purge.diff, n#520104, thorsten
 # expand path placeholders early in template dialog
 normalize-template-paths-fix.diff, n#512146, thorsten
 
+# decode hex-encoded unicode chars in URI in Edit Links dialog.
+edit-links-decode-unicode-uri.diff, i#104166, kohei
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
diff --git a/patches/dev300/edit-links-decode-unicode-uri.diff b/patches/dev300/edit-links-decode-unicode-uri.diff
new file mode 100644
index 0000000..5af6e56
--- /dev/null
+++ b/patches/dev300/edit-links-decode-unicode-uri.diff
@@ -0,0 +1,13 @@
+diff --git svx/source/dialog/linkdlg.cxx svx/source/dialog/linkdlg.cxx
+index cb4fe62..fe67a8d 100644
+--- svx/source/dialog/linkdlg.cxx
++++ svx/source/dialog/linkdlg.cxx
+@@ -224,7 +224,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
+ 
+         String aFileName;
+         pLinkMgr->GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter );
+-
++        aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
+         FileName().SetText( aFileName );
+         SourceName().SetText( sLink );
+         TypeName().SetText( sType );