On 01/10/2014 02:13 PM, Zolnai Tamás wrote:
commit 60c7ed80643a6c397feebdd1492d6c3ef4d810be
Author: Zolnai Tamás <[email protected]>
Date: Fri Jan 10 03:31:46 2014 +0100
fdo#72947 Startcenter: display more userfriendly file urls in tooltips
Use INetURLObject to get a readable url (it displayes special characters
too). It is a side effect that 'file:///' prefix disappear
which seems a good thing.
Plus some cleanup: remove second INetURLObject.
Change-Id: I4aab5e2546ae70e5a3d85b12e26e021bfa244999
diff --git a/include/sfx2/recentdocsviewitem.hxx
b/include/sfx2/recentdocsviewitem.hxx
index be94b78..410e74b 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -23,6 +23,9 @@ public:
virtual OUString getHelpText() const;
OUString maURL;
+
+private:
+ OUString m_sHelpText;
};
#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index c35c16b..d741675 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,6 +21,7 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView,
const OUString &rUR
{
OUString aTitle(rTitle);
INetURLObject aURLObj(rURL);
+ m_sHelpText = aURLObj.GetURLPath();
If m_sHelpText is what gets displayed in the "bubble help" when hovering
over a document in start center, I'd suggest against unconditionally
displaying merely the URL's path component (which can be rather
meaningless). How about first trying
INetURLObject::getFSysPath(INetURLObject::FSYS_DETECT) to get a pathname
for file URLs and if that fails (i.e., returns an empty string) use
INetURLObject::GetURLNoPass() to get the full (non-file) URL (where
"NoPass" strips any password from the authority component, just in case).
Stephan
RecentDocsView& rRecentView = dynamic_cast<RecentDocsView&>(rView);
long nThumbnailSize = rRecentView.GetThumbnailSize();
@@ -38,10 +39,9 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView,
const OUString &rUR
Size aExtSize(aExt.GetSizePixel());
// attempt to make it appear as if it is on a piece of paper
- INetURLObject aUrl(rURL);
long nPaperHeight;
long nPaperWidth;
- if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS,
aUrl.getExtension()) )
+ if( RecentDocsView::typeMatchesExtension(TYPE_IMPRESS,
aURLObj.getExtension()) )
{
// Swap width and height (PAPER_SCREEN_4_3 definition make it
needed)
PaperInfo aInfo(PAPER_SCREEN_4_3);
@@ -86,7 +86,7 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool
bChangeFocus)
OUString RecentDocsViewItem::getHelpText() const
{
- return maURL;
+ return m_sHelpText;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
