basctl/source/basicide/scriptdocument.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a82c783a28b147963486c492184768be6be37da0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 8 19:53:28 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 8 20:11:36 2023 +0000
Adapt to macOS Resources vs. share naming
On macOS, "Tools - Macros - Organize Macros - Basic... - Macro From:"
erroneously listed all the per-application modules ("Access2Base", "Depot",
"Euro", ...) under "My Macros" instead of "Application Macros".
Change-Id: Ic997ab30d9205d8402136ea381745c08ce555623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146673
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/basctl/source/basicide/scriptdocument.cxx
b/basctl/source/basicide/scriptdocument.cxx
index 71a2c765339c..4136ced4c18e 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -52,6 +52,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <comphelper/diagnose_ex.hxx>
+#include <config_folders.h>
#include <tools/debug.hxx>
#include <comphelper/documentinfo.hxx>
@@ -945,9 +946,9 @@ namespace basctl
OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) ==
::osl::FileBase::E_None );
OUString aCanonicalFileURL( aFileStatus.getFileURL() );
- if( aCanonicalFileURL.indexOf( "share/basic" ) >= 0 ||
- aCanonicalFileURL.indexOf( "share/uno_packages" ) >= 0 ||
- aCanonicalFileURL.indexOf( "share/extensions" ) >= 0 )
+ if( aCanonicalFileURL.indexOf( LIBO_SHARE_FOLDER "/basic" ) >=
0 ||
+ aCanonicalFileURL.indexOf( LIBO_SHARE_FOLDER
"/uno_packages" ) >= 0 ||
+ aCanonicalFileURL.indexOf( LIBO_SHARE_FOLDER "/extensions"
) >= 0 )
bIsShared = true;
}
}
