cppuhelper/source/paths.cxx | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 229c312834f8931994ed1147a0cc136ce4b2de69
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 12 14:30:56 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 13 08:17:11 2022 +0100
Adapt comment
...to 76e04aef4b4adea8179d564b158e58f495ed43a4 "Rename LO-specific uno
ini-file
(Linux: program/unorc) to 'louno'". (And yes, the original comment guessed
right: it is the URE uno ini-file that we look for here.)
Change-Id: I3006a5169ae066b984e415d17841f69db338b68b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128325
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 0f59fb1272da..480dcde48fe7 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -64,13 +64,8 @@ OUString cppu::getUnoIniUri() {
#else
OUString uri(get_this_libpath());
#ifdef MACOSX
- // We keep both the LO and URE dylibs directly in "Frameworks"
- // (that is, LIBO_LIB_FOLDER) and rc files in "Resources"
- // (LIBO_ETC_FOLDER). Except for unorc, of which there are two,
- // the "LO" one (which is in "Resources") and the "URE" one (which
- // is in "Resources/ure/etc" (LIBO_URE_ETC_FOLDER)). As this code
- // goes into the cppuhelper library which is part of URE, we are
- // looking for the latter one here. I think...
+ // We keep the URE dylibs directly in "Frameworks" (that is,
LIBO_LIB_FOLDER) and unorc in
+ // "Resources/ure/etc" (LIBO_URE_ETC_FOLDER).
if (uri.endsWith( "/" LIBO_LIB_FOLDER ) )
{
uri = OUString::Concat(uri.subView( 0, uri.getLength() -
(sizeof(LIBO_LIB_FOLDER)-1) )) + LIBO_URE_ETC_FOLDER;
