diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-10 03:31:46 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-10 14:11:39 +0100 |
| commit | 60c7ed80643a6c397feebdd1492d6c3ef4d810be (patch) | |
| tree | 826a027cabc0c7330a58b5103aa021ef81467ac1 | |
| parent | adf932c6569fe9b50883b54f8b959968188476d3 (diff) | |
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
| -rw-r--r-- | include/sfx2/recentdocsviewitem.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/recentdocsviewitem.cxx | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index be94b78c5a45..410e74bea254 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 c35c16b31ee1..d7416750a0d4 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(); 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: */ |