diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
tree | 2adc961b3c83deffcea251c41744f2626e476f38 /scripting/examples | |
parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'scripting/examples')
-rwxr-xr-x | scripting/examples/beanshell/Highlight/ShowDialog.bsh | 2 | ||||
-rw-r--r-- | scripting/examples/java/Highlight/HighlightText.java | 2 | ||||
-rwxr-xr-x | scripting/examples/javascript/Highlight/ShowDialog.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripting/examples/beanshell/Highlight/ShowDialog.bsh b/scripting/examples/beanshell/Highlight/ShowDialog.bsh index e4d335d22a04..95ccc32bbe32 100755 --- a/scripting/examples/beanshell/Highlight/ShowDialog.bsh +++ b/scripting/examples/beanshell/Highlight/ShowDialog.bsh @@ -55,7 +55,7 @@ boolean tryLoadingLibrary( xmcf, context, name ) } libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java index 176b185b5064..99af06f25468 100644 --- a/scripting/examples/java/Highlight/HighlightText.java +++ b/scripting/examples/java/Highlight/HighlightText.java @@ -223,7 +223,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener { } String libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); diff --git a/scripting/examples/javascript/Highlight/ShowDialog.js b/scripting/examples/javascript/Highlight/ShowDialog.js index 7b2012870c15..0f3ccefb836b 100755 --- a/scripting/examples/javascript/Highlight/ShowDialog.js +++ b/scripting/examples/javascript/Highlight/ShowDialog.js @@ -49,7 +49,7 @@ function tryLoadingLibrary( xmcf, context, name ) } libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); |