Resolves tdf#164143 Tooltip with path to macro in new Macro Organizer
dialog contains percent symbols instead Cyrillic Additionally use the same approach to make the expected symbols appear in the description text view. Change-Id: I89adafde4305dbe9a6e56481ed246376bc1d94a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177925 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
This commit is contained in:
parent
a9734683df
commit
ab5b5ad75d
1 changed files with 9 additions and 1 deletions
|
@ -25,6 +25,7 @@
|
|||
#include <comphelper/documentinfo.hxx>
|
||||
#include <comphelper/lok.hxx>
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#include <osl/file.hxx>
|
||||
#include <sfx2/app.hxx>
|
||||
#include <sfx2/dispatch.hxx>
|
||||
#include <sfx2/inputdlg.hxx>
|
||||
|
@ -578,6 +579,7 @@ IMPL_LINK(ScriptContainersListBox, QueryTooltip, const weld::TreeIter&, rEntryIt
|
|||
&& xModLibContainer->isLibraryLink(aLibName))
|
||||
{
|
||||
OUString aLinkURL = xModLibContainer->getLibraryLinkURL(aLibName);
|
||||
osl::File::getSystemPathFromFileURL(aLinkURL, aLinkURL);
|
||||
return aLinkURL;
|
||||
}
|
||||
}
|
||||
|
@ -966,7 +968,13 @@ void MacroManagerDialog::UpdateUI()
|
|||
if (xModLibContainer.is() && xModLibContainer->hasByName(aLibName)
|
||||
&& xModLibContainer->isLibraryLink(aLibName))
|
||||
{
|
||||
sDescriptionText = xModLibContainer->getLibraryLinkURL(aLibName);
|
||||
OUString aLinkURL = xModLibContainer->getLibraryLinkURL(aLibName);
|
||||
OUString aSysPath;
|
||||
if (osl::File::getSystemPathFromFileURL(aLinkURL, aSysPath)
|
||||
== osl::FileBase::E_None)
|
||||
sDescriptionText = aSysPath;
|
||||
else
|
||||
sDescriptionText = aLinkURL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue