diff --git a/source/text/sbasic/guide/sample_code.xhp b/source/text/sbasic/guide/sample_code.xhp index 7ef8b6a450..cdb79e3837 100644 --- a/source/text/sbasic/guide/sample_code.xhp +++ b/source/text/sbasic/guide/sample_code.xhp @@ -59,7 +59,7 @@ LoadDialog() = oRuntimeDialog End Function -LoadDialog function is stored in Tools.ModuleControls available from %PRODUCTNAME Macros and Dialogs. +LoadDialog function is stored in Tools.ModuleControls available from Application Macros and Dialogs. Displaying a Dialog REM global definition of variables diff --git a/source/text/sbasic/python/main0000.xhp b/source/text/sbasic/python/main0000.xhp index 76a4e25890..e84d9b2d37 100644 --- a/source/text/sbasic/python/main0000.xhp +++ b/source/text/sbasic/python/main0000.xhp @@ -30,7 +30,7 @@ You can execute Python scripts choosing Tools - Macros - Run Macro. Editing scripts can be done with your preferred text editor. Python scripts are present in various locations detailed hereafter. You can refer to Programming examples for macros illustrating how to run the Python interactive console from %PRODUCTNAME. - The %PRODUCTNAME scripting framework for Python is optional on some GNU/Linux distributions. If it is installed, selecting Tools - Macros - Run Macro and checking %PRODUCTNAME Macros for the presence of HelloWorld – HelloWorldPython macro is sufficient. If absent, please refer to your distribution documentation in order to install the %PRODUCTNAME scripting framework for Python. + The %PRODUCTNAME scripting framework for Python is optional on some GNU/Linux distributions. If it is installed, selecting Tools - Macros - Run Macro and checking Application Macros for the presence of HelloWorld – HelloWorldPython macro is sufficient. If absent, please refer to your distribution documentation in order to install the %PRODUCTNAME scripting framework for Python. diff --git a/source/text/sbasic/python/python_dialogs.xhp b/source/text/sbasic/python/python_dialogs.xhp index 844e206ad0..ee6c6ee0fc 100644 --- a/source/text/sbasic/python/python_dialogs.xhp +++ b/source/text/sbasic/python/python_dialogs.xhp @@ -23,8 +23,8 @@

Opening a Dialog with Python

- %PRODUCTNAME static dialogs are created with the Dialog editor and are stored in varying places according to their personal (My Macros), shared (%PRODUCTNAME Macros) or document-embedded nature. In reverse, dynamic dialogs are constructed at runtime, from Basic or Python scripts, or using any other %PRODUCTNAME supported language for that matter. Opening static dialogs with Python is illustrated herewith. Exception handling and internationalization are omitted for clarity. -

My Macros or %PRODUCTNAME Macros dialogs

+ %PRODUCTNAME static dialogs are created with the Dialog editor and are stored in varying places according to their personal (My Macros), shared (Application Macros) or document-embedded nature. In reverse, dynamic dialogs are constructed at runtime, from Basic or Python scripts, or using any other %PRODUCTNAME supported language for that matter. Opening static dialogs with Python is illustrated herewith. Exception handling and internationalization are omitted for clarity. +

My Macros or Application Macros dialogs

The examples below open Access2Base Trace console or the imported TutorialsDialog dialog with Tools - Macros - Run Macro menu: # -*- coding: utf-8 -*- diff --git a/source/text/sbasic/python/python_locations.xhp b/source/text/sbasic/python/python_locations.xhp index 6a5faa544b..90f4c2f72b 100644 --- a/source/text/sbasic/python/python_locations.xhp +++ b/source/text/sbasic/python/python_locations.xhp @@ -29,7 +29,7 @@ My Macros: personal macros available for the %PRODUCTNAME user - %PRODUCTNAME Macros: system macros distributed with LibreOffice for every computer user + Application Macros: system macros distributed with LibreOffice for every computer user Document macros: every document can contain macro libraries available in that document for all users @@ -38,7 +38,7 @@

Python Script Locations

Refer to Getting Session Information in order to get programmatic access to Python script locations. -

%PRODUCTNAME Macros

+

Application Macros

Existing macros in this location (container) were copied by the installation program and are available to every computer user, and any open document can access macros stored the container. You need administrative rights to store or edit macros here. The %PRODUCTNAME Macros container location in the file system depends on the operating system: diff --git a/source/text/sbasic/shared/00000003.xhp b/source/text/sbasic/shared/00000003.xhp index 04e6b540c8..05b5794789 100644 --- a/source/text/sbasic/shared/00000003.xhp +++ b/source/text/sbasic/shared/00000003.xhp @@ -175,7 +175,7 @@ Open Tools - Macros - Organize Dialogs and select %PRODUCTNAME Dialogs container.
- Open Tools - Macros - %PRODUCTNAME Basic - Edit and select %PRODUCTNAME Macros container. + Open Tools - Macros - %PRODUCTNAME Basic - Edit and select Application Macros container.
This library must be loaded before execution. Execute the following statement before running any macro that uses this library: @@ -349,4 +349,4 @@ 1006 Unable to determine property
- \ No newline at end of file + diff --git a/source/text/sbasic/shared/01030400.xhp b/source/text/sbasic/shared/01030400.xhp index bdf594ae3c..3861c203a2 100644 --- a/source/text/sbasic/shared/01030400.xhp +++ b/source/text/sbasic/shared/01030400.xhp @@ -43,7 +43,7 @@ %PRODUCTNAME Basic libraries can be stored in 3 different containers: - %PRODUCTNAME Macros: libraries stored in this container are available for all users of the computer and are managed by the computer administrator. The container is located in the %PRODUCTNAME installation directory. + Application Macros: libraries stored in this container are available for all users of the computer and are managed by the computer administrator. The container is located in the %PRODUCTNAME installation directory. My Macros: libraries stored in this container are available to all documents of your user. The container is located in the user profile area and is not accessible by another user. @@ -52,7 +52,7 @@ Document: libraries stored in the document container are only available for the document and are accessible only when the document is open. You cannot access macros of a document from another document. -To access macros stored in libraries of %PRODUCTNAME Macros or My Macros from another container, including the document container, use the GlobalScope specifier. +To access macros stored in libraries of Application Macros or My Macros from another container, including the document container, use the GlobalScope specifier.

Organizing Libraries

Creating a New Library

@@ -63,7 +63,7 @@ Click the Libraries tab. -Select to where you want to attach the library in the Location list. If you select %PRODUCTNAME Macros & Dialogs, the library will belong to the $[officename] application and will be available for all documents. If you select a document the library will be attached to this document and only available from there. +Select to where you want to attach the library in the Location list. If you select Application Macros & Dialogs, the library will belong to the $[officename] application and will be available for all documents. If you select a document the library will be attached to this document and only available from there. Click New and insert a name to create a new library. @@ -78,7 +78,7 @@ Click the Libraries tab. -Select to where you want to import the library in the Location list. If you select %PRODUCTNAME Macros & Dialogs, the library will belong to the $[officename] application and will be available for all documents. If you select a document the library will be imported to this document and only available from there. +Select to where you want to import the library in the Location list. If you select Application Macros & Dialogs, the library will belong to the $[officename] application and will be available for all documents. If you select a document the library will be imported to this document and only available from there. Click Import... and select an external library to import. diff --git a/source/text/sbasic/shared/03131900.xhp b/source/text/sbasic/shared/03131900.xhp index 59a5051ec6..e911050252 100644 --- a/source/text/sbasic/shared/03131900.xhp +++ b/source/text/sbasic/shared/03131900.xhp @@ -40,7 +40,7 @@ DialogLibraries; library container

GlobalScope specifier

-To manage personal or shared library containers (%PRODUCTNAME Macros or My Macros) from within a document, use the GlobalScope specifier. +To manage personal or shared library containers (Application Macros or My Macros) from within a document, use the GlobalScope specifier.
Basic source code and dialogs are organized in library containers. Libraries can contain modules and dialogs. @@ -49,7 +49,7 @@ Basic libraries and modules can be managed with the BasicLibraries object. Libraries can be searched, explored and loaded on request. Monitoring Documents Events illustrates %PRODUCTNAME library loading.

In dialogs:

Dialog libraries and dialogs can be managed with the DialogLibraries object. Opening a Dialog With Basic illustrates how to display %PRODUCTNAME shared dialogs. -BasicLibraries and DialogLibraries containers exist at application level and within every document. Document's library containers do not need the GlobalScope specifier to be managed. If you want to call a global library container (located in %PRODUCTNAME Macros or My Macros) from within a document, you must use the GlobalScope specifier. +BasicLibraries and DialogLibraries containers exist at application level and within every document. Document's library containers do not need the GlobalScope specifier to be managed. If you want to call a global library container (located in Application Macros or My Macros) from within a document, you must use the GlobalScope specifier. GlobalScope specifier diff --git a/source/text/shared/01/06130030.xhp b/source/text/shared/01/06130030.xhp index 32eda867fd..761acae4f4 100644 --- a/source/text/shared/01/06130030.xhp +++ b/source/text/shared/01/06130030.xhp @@ -43,7 +43,7 @@

Macros

-Select a macro or script from My Macros, %PRODUCTNAME Macros, or an open document. To view the available macros or scripts, double-click an entry. +Select a macro or script from My Macros, Application Macros, or an open document. To view the available macros or scripts, double-click an entry.

Run

To run a script, select a script in the list, and then click Run. diff --git a/source/text/shared/guide/scripting.xhp b/source/text/shared/guide/scripting.xhp index 6cbec33e03..ac9b091aec 100644 --- a/source/text/shared/guide/scripting.xhp +++ b/source/text/shared/guide/scripting.xhp @@ -64,10 +64,10 @@ Click Add. - In the Category list box, scroll down and open the "%PRODUCTNAME Macros" entry. + In the Category list box, scroll down and open the "Application Macros" entry. - You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. + You see entries for "Application Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. Open any scripting language entry to see the available scripts. Select a script. @@ -85,10 +85,10 @@ Choose Tools - Customize - Keyboard. - In the Category list box, scroll down and open the "%PRODUCTNAME Macros" entry. + In the Category list box, scroll down and open the "Application Macros" entry. - You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. + You see entries for "Application Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. Open any scripting language entry to see the available scripts. Select any script. @@ -113,10 +113,10 @@ Click Macro button. - In the Library list box, scroll down and open the "%PRODUCTNAME Macros" entry. + In the Library list box, scroll down and open the "Application Macros" entry. - You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. + You see entries for "Application Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages. Open any scripting language entry to see the available scripts. Select any script. diff --git a/source/text/swriter/guide/autotext.xhp b/source/text/swriter/guide/autotext.xhp index 49a9cba391..352daf5bef 100644 --- a/source/text/swriter/guide/autotext.xhp +++ b/source/text/swriter/guide/autotext.xhp @@ -89,7 +89,7 @@ Choose Tools - Macros - Organize Macros - %PRODUCTNAME Basic. - In the Macro from tree control, select %PRODUCTNAME Macros - Gimmicks - AutoText. + In the Macro from tree control, select Application Macros - Gimmicks - AutoText. Select "Main" in the Existing macros in: AutoText list and then click Run. A list of the current AutoText entries is generated in a separate text document.