[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
Zolnai Tamás
tamas.zolnai at collabora.com
Fri Jan 10 10:17:23 PST 2014
sfx2/source/control/recentdocsviewitem.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 7ebac02b35700b7ca96e636d5729b65115c2c708
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date: Fri Jan 10 17:12:46 2014 +0100
fdo#72947 Startcenter: handle file urls and non-file urls on a different way
Thanks Stephan Bergmann for the idea.
Change-Id: Ifdde1b7eaaefd30a176c47385bc9bfec48d5b86c
(cherry picked from commit 340e70e248824a3a4959fa1dee90c5650f257ae8)
Reviewed-on: https://gerrit.libreoffice.org/7377
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index d741675..d1947e9 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,7 +21,12 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR
{
OUString aTitle(rTitle);
INetURLObject aURLObj(rURL);
- m_sHelpText = aURLObj.GetURLPath();
+
+ if( aURLObj.GetProtocol() == INET_PROT_FILE )
+ m_sHelpText = aURLObj.getFSysPath(INetURLObject::FSYS_DETECT);
+ if( m_sHelpText.isEmpty() )
+ m_sHelpText = aURLObj.GetURLNoPass();
+
RecentDocsView& rRecentView = dynamic_cast<RecentDocsView&>(rView);
long nThumbnailSize = rRecentView.GetThumbnailSize();
More information about the Libreoffice-commits
mailing list