summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-04-03 12:01:25 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-04-03 12:01:25 +0200
commit966fb2685d954daa3ae1cbc6684a55a7a6204e03 (patch)
treefb47fb82e0695e59d5f99ec6a1cab4cc1367a878
parent063029492a4bae92fcc543d543d7d2bf0b4e1763 (diff)
Renamed OpenOffice.org to LibreOffice in loads of places
-rw-r--r--build/README6
-rw-r--r--core/README8
-rw-r--r--core/doc/README2
-rwxr-xr-xcore/doc/cheatsheets/starting.xml10
-rw-r--r--core/doc/help/html/devdoc/extending/ar01s02.html2
-rw-r--r--core/doc/help/html/devdoc/extending/ar01s03.html8
-rw-r--r--core/doc/help/html/devdoc/extending/index.html2
-rw-r--r--core/doc/help/html/devdoc/starting/ar01s02.html41
-rw-r--r--core/doc/help/html/devdoc/starting/ar01s04.html10
-rw-r--r--core/doc/help/html/devdoc/starting/ar01s05.html6
-rw-r--r--core/doc/help/html/devdoc/starting/index.html5
-rw-r--r--core/doc/help/html/img/OOoLogo.pngbin15773 -> 0 bytes
-rw-r--r--core/doc/help/html/styles.css7
-rw-r--r--core/doc/help/html/userdoc/javatuto/ar01s02.html42
-rw-r--r--core/doc/help/html/userdoc/javatuto/ar01s03.html20
-rw-r--r--core/doc/help/html/userdoc/javatuto/ar01s04.html50
-rw-r--r--core/doc/help/html/userdoc/javatuto/ar01s05.html6
-rw-r--r--core/doc/help/html/userdoc/javatuto/index.html87
-rw-r--r--core/doc/help/html/userdoc/javatuto/toc.xml2
-rw-r--r--core/doc/help/html/userdoc/uretuto/ar01s02.html6
-rw-r--r--core/doc/help/html/userdoc/uretuto/ar01s03.html8
-rw-r--r--core/doc/help/html/userdoc/uretuto/index.html13
-rwxr-xr-xcore/doc/help/toc.xml4
-rwxr-xr-xcore/plugin.properties4
-rw-r--r--core/schema/language.exsd2
-rwxr-xr-xcore/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java2
-rwxr-xr-xcore/source/org/openoffice/ide/eclipse/core/editors/syntax/IUnoidlSyntax.java6
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/gui/OOoTable.java14
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/gui/messages.properties12
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties6
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/model/AbstractOOo.java14
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java34
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/model/SDK.java6
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/model/UnoidlProject.java10
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/model/messages.properties6
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/office/OfficeConnection.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/internal/office/TypesGetter.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/launch/office/LaunchConfigurationTabs.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeLaunchDelegate.java12
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeTab.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/IUnoidlProject.java20
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/OOoContainer.java18
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/config/IExtraOptionsProvider.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/config/IOOo.java34
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/config/ISdk.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/description/DescriptionModel.java4
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/model/language/AbstractLanguage.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/office/OfficeClassLoader.java12
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/office/OfficeHelper.java2
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/office/TypesGetter.java8
-rwxr-xr-xcore/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeProvider.java10
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties6
-rw-r--r--core/source/org/openoffice/ide/eclipse/core/wizards/pages/UnoPackageExportPage.java4
-rw-r--r--java/META-INF/MANIFEST.MF2
-rw-r--r--java/README6
-rw-r--r--java/doc/cheatsheets/unoclient.xml10
-rw-r--r--java/plugin.xml4
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/JavaDebugExtraOptionsProvider.java2
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/Language.java4
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java4
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/build/messages.properties6
-rw-r--r--java/source/org/openoffice/ide/eclipse/java/client/messages.properties2
-rw-r--r--packager/.externalToolBuilders/Sources update.launch2
64 files changed, 292 insertions, 357 deletions
diff --git a/build/README b/build/README
index 3679988..1cb91ed 100644
--- a/build/README
+++ b/build/README
@@ -1,13 +1,13 @@
Building OOoEclipse Integration
in order to build OOoEclipseIntegration to produce an update site,
-you need to have installed OpenOffice.org and Eclipse.You may install
+you need to have installed LibreOffice and Eclipse.You may install
only the necessary jars, but you'll have to hack the ant build.xml
files.
Define the ANT_ARGS variable to the following:
- -Dopenoffice.home=/path/to/you/ooo -Declipse.home=/path/to/your/eclipse
-Then you will just have to cd in the build CVS module and execute:
+ -Dlibreoffice.home=/path/to/you/libreoffice -Declipse.home=/path/to/your/eclipse
+Then you will just have to cd in the build folder and execute:
prompt$ ant
Please run ant help to get the available targets
diff --git a/core/README b/core/README
index c5a219f..1cb91ed 100644
--- a/core/README
+++ b/core/README
@@ -1,13 +1,13 @@
Building OOoEclipse Integration
in order to build OOoEclipseIntegration to produce an update site,
-you need to have installed OpenOffice.org and Eclipse.You may install
-only the necesary jars, but you'll have to hack the ant build.xml
+you need to have installed LibreOffice and Eclipse.You may install
+only the necessary jars, but you'll have to hack the ant build.xml
files.
Define the ANT_ARGS variable to the following:
- -Dopenoffice.home=/path/to/you/ooo -Declipse.home=/path/to/your/eclipse
-Then you will just have to cd in the build CVS module and execute:
+ -Dlibreoffice.home=/path/to/you/libreoffice -Declipse.home=/path/to/your/eclipse
+Then you will just have to cd in the build folder and execute:
prompt$ ant
Please run ant help to get the available targets
diff --git a/core/doc/README b/core/doc/README
index 4e07313..68b26e4 100644
--- a/core/doc/README
+++ b/core/doc/README
@@ -12,7 +12,7 @@ HOWTO Install this plugin
FEATURES
- UNO-IDL syntax highlighting
- - SDK and OpenOffice.org Configuration
+ - SDK and LibreOffice Configuration
- Java code generation
- New UNO project wizard
- New UNO file wizard
diff --git a/core/doc/cheatsheets/starting.xml b/core/doc/cheatsheets/starting.xml
index ffefeb7..bb63db3 100755
--- a/core/doc/cheatsheets/starting.xml
+++ b/core/doc/cheatsheets/starting.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<cheatsheet title="Starting to use OpenOffice.org plugin">
+<cheatsheet title="Starting to use LibreOffice plugin">
<intro>
<description>
- This tutorial will guide you through the OpenOffice.org plugin. This
+ This tutorial will guide you through the LibreOffice plugin. This
way, you will get used to the different features available.
<br/>
@@ -13,10 +13,10 @@
<item title="SDK Configuration">
<description>
- First of all is to configure the available OpenOffice.org SDKs. You can
+ First of all is to configure the available LibreOffice SDKs. You can
add, remove and edit the SDKs that can be used in the plugin in the
preferences. Open the <b>Window-&gt;Preferences</b> menu item to get the preferences.
- Afterwards, select the <b>OpenOffice.org-&gt;SDK Configuration</b> node.
+ Afterwards, select the <b>LibreOffice-&gt;SDK Configuration</b> node.
<br />
Then add, remove and/or edit your SDKs, but remember that you need at least one.
</description>
@@ -42,4 +42,4 @@
</description>
</item>
-</cheatsheet> \ No newline at end of file
+</cheatsheet>
diff --git a/core/doc/help/html/devdoc/extending/ar01s02.html b/core/doc/help/html/devdoc/extending/ar01s02.html
index bf8b346..0e72ba1 100644
--- a/core/doc/help/html/devdoc/extending/ar01s02.html
+++ b/core/doc/help/html/devdoc/extending/ar01s02.html
@@ -17,7 +17,7 @@ a new language support</h2>
</div>
</div>
<p>In order to add a new programming language to the ones supported
-by the OpenOffice.org integration plugin, you will have to develop a
+by the LibreOffice integration plugin, you will have to develop a
small other plugin. Creating a new implementation language support
plugin will require some Java knowledge and the use of other Eclipse
plugins.</p>
diff --git a/core/doc/help/html/devdoc/extending/ar01s03.html b/core/doc/help/html/devdoc/extending/ar01s03.html
index 6dba3a5..7afba0d 100644
--- a/core/doc/help/html/devdoc/extending/ar01s03.html
+++ b/core/doc/help/html/devdoc/extending/ar01s03.html
@@ -24,12 +24,12 @@ the License is available at <a
</p>
<p>The Original Documentation is <span class="emphasis"><em>&#8220;Plugin
Developer's Documentation&#8221;</em></span>. The Initial Writer of the Original
-Documentation is (JCA) Cédric Bosdonnat (C) 2006. All Rights Reserved.
-(Initial Writer contact(s): <a href="mailto:cedricbosdo@openoffice.org"
- target="_top">cedricbosdo@openoffice.org</a>.)</p>
+Documentation is (JCA) C&eacute;dric Bosdonnat (C) 2006. All Rights Reserved.
+(Initial Writer contact(s): <a href="mailto:cedric.bosdonnat.ooo@free.fr"
+ target="_top">cedric.bosdonnat.ooo@free.fr</a>.)</p>
<p>Contributor(s): ______________________________________.</p>
<p>Portions created by ______ are Copyright (C)_________[Insert
-year(s)]. All Rights Reserved.   (Contributor
+year(s)]. All Rights Reserved. (Contributor
contact(s):________________[Insert hyperlink/alias]).</p>
<p><span class="strong"><strong>Note</strong></span>: The text of
this Appendix may differ slightly from the text of the notices in the
diff --git a/core/doc/help/html/devdoc/extending/index.html b/core/doc/help/html/devdoc/extending/index.html
index 161ad8a..d9bf180 100644
--- a/core/doc/help/html/devdoc/extending/index.html
+++ b/core/doc/help/html/devdoc/extending/index.html
@@ -17,7 +17,7 @@
Documentation</h1>
</div>
<div>
-<h3 class="subtitle"><i>Extending the OpenOffice.org
+<h3 class="subtitle"><i>Extending the LibreOffice
integration plugin</i></h3>
</div>
<div>
diff --git a/core/doc/help/html/devdoc/starting/ar01s02.html b/core/doc/help/html/devdoc/starting/ar01s02.html
index 1b4bc76..51fdc72 100644
--- a/core/doc/help/html/devdoc/starting/ar01s02.html
+++ b/core/doc/help/html/devdoc/starting/ar01s02.html
@@ -23,23 +23,20 @@ development environment</h2>
</div>
</div>
<p>The very first step is to install the needed tools to work. The
-OpenOffice.org Eclipse integration development needs:</p>
+LibreOffice Eclipse integration development needs:</p>
<div class="orderedlist">
<ul type="1">
<li>
- <p>Eclipse 3.2</p>
+ <p>Eclipse</p>
</li>
<li>
- <p>OpenOffice.org 2.0</p>
+ <p>LibreOffice</p>
</li>
<li>
- <p>OpenOffice.org SDK 2.0.4</p>
+ <p>LibreOffice SDK</p>
</li>
<li>
- <p>Java JDK 1.5</p>
- </li>
- <li>
- <p>Uno Runtime Environment (optional)</p>
+ <p>Java JDK</p>
</li>
</ul>
</div>
@@ -52,25 +49,22 @@ OpenOffice.org Eclipse integration development needs:</p>
</div>
</div>
<p>The only important thin to recall is to be sure that the
-OpenOffice.org SDK will path will not contain any white space on the
+LibreOffice SDK will path will not contain any white space on the
windows platform. For more details on the different tools installations,
please refer to their official documentation.</p>
-<p>After having installed Eclipse and OpenOffice.org, make sure to
+<p>After having installed Eclipse and LibreOffice, make sure to
define the <code class="literal">OOo Classes</code> user library in the Eclipse
installation. For this, simply select the <span class="strong"><strong>Window &gt; Preferences</strong></span> menu
in Eclipse and open the <span class="strong"><strong>Java &gt; Build path &gt; User Library</strong></span>
configuration page. Then add a new library named <code class="literal">OOo Classes</code> including the following
-jars in the OpenOffice.org installation. This is necessary in order to correctly build the sources.
+jars in the LibreOffice installation. This is necessary in order to correctly build the sources.
<ul>
- <li><tt>/path/to/ooo/install/basis-link/program/classes/unoil.jar</tt></li>
- <li><tt>/path/to/ooo/install/basis-link/ure-link/share/java/juh.jar</tt></li>
- <li><tt>/path/to/ooo/install/basis-link/ure-link/share/java/jurt.jar</tt></li>
- <li><tt>/path/to/ooo/install/basis-link/ure-link/share/java/ridl.jar</tt></li>
- <li><tt>/path/to/ooo/install/basis-link/ure-link/share/java/unoloader.jar</tt></li>
+ <li><tt>/path/to/libreoffice/install/basis-link/program/classes/unoil.jar</tt></li>
+ <li><tt>/path/to/libreoffice/install/basis-link/ure-link/share/java/juh.jar</tt></li>
+ <li><tt>/path/to/libreoffice/install/basis-link/ure-link/share/java/jurt.jar</tt></li>
+ <li><tt>/path/to/libreoffice/install/basis-link/ure-link/share/java/ridl.jar</tt></li>
+ <li><tt>/path/to/libreoffice/install/basis-link/ure-link/share/java/unoloader.jar</tt></li>
</ul></p>
-<p>If several JDKs are installed on the computer, please make sure
-that the 1.5 one is used for the OpenOffice.org Eclipse integration
-projects.</p>
</div>
<div class="sect2" lang="en-GB">
<div class="titlepage">
@@ -81,13 +75,8 @@ projects.</p>
</div>
</div>
<p>The next step is to get the plugins sources as Eclipse projects.
-First check the sources from the OpenOffice.org CVS, module
-<code class="literal">api/ooeclipseintegration</code>. For more informations on how to check out
-sources from OpenOffice.org CVS, please refer to <a
- href="http://api.openoffice.org/servlets/ProjectSource#cmdlinecvs"
- target="_top">this page</a>. Be sure to prune the empty directories to
-have only the needed ones: the others comes from an old project
-organization.</p>
+First check the sources from the Git repository using command
+<code class="literal">git clone git://anongit.freedesktop.org/libreoffice/contrib/ooeclipse</code>.
<p>The second step is to import the sources as Eclipse projects. For
this open the <span class="strong"><strong>File &gt; Import</strong></span> menu and choose
<span class="strong"><strong>General &gt; Existing
diff --git a/core/doc/help/html/devdoc/starting/ar01s04.html b/core/doc/help/html/devdoc/starting/ar01s04.html
index db4e5c5..6e4132b 100644
--- a/core/doc/help/html/devdoc/starting/ar01s04.html
+++ b/core/doc/help/html/devdoc/starting/ar01s04.html
@@ -22,7 +22,7 @@ Eclipse features</h2>
</div>
</div>
</div>
-<p>The OpenOffice.org Eclipse integration development uses some
+<p>The LibreOffice Eclipse integration development uses some
interesting features. The most important are detailed below: running a
new Eclipse instance for debug sessions and update site mechanism for
the plugins installation.</p>
@@ -61,9 +61,9 @@ generation target (see next section).</p>
<p>In order to deliver or test the plugins in a normal Eclipse
installation, it is necessary to generate an update site containing the
plugins to install or update. Eclipse provides update site and features
-projects, but these should not be used for the OpenOffice.org Eclipse
+projects, but these should not be used for the LibreOffice Eclipse
integration. To generate the update site use the build project as
-follow :</p>
+follow:</p>
<div class="orderedlist">
<ul>
<li>
@@ -85,7 +85,7 @@ follow :</p>
<p>Select the build file</p>
</li>
<li>
- <p>Add <code class="literal">-Dopenoffice.home=/path/to/you/ooo
+ <p>Add <code class="literal">-Dlibreoffice.home=/path/to/you/libreoffice
-Declipse.home=/path/to/your/eclipse</code> in the arguments. Do not forget
to place the path inside quotes on windows.</p>
</li>
@@ -100,7 +100,7 @@ follow :</p>
<p>This script generates a site directory and
<code class="literal">ooeclipseintegration_site.zip</code> file which are the update site in an
uncompressed and compressed form. To generate a debug update site, just
-add the <code class="literal">-Ddebug=true</code> argument to the ant launch configuration : this is
+add the <code class="literal">-Ddebug=true</code> argument to the ant launch configuration: this is
useful when testing the plugins on a fresh Eclipse installation.</p>
</div>
</div>
diff --git a/core/doc/help/html/devdoc/starting/ar01s05.html b/core/doc/help/html/devdoc/starting/ar01s05.html
index cc08654..3c46d10 100644
--- a/core/doc/help/html/devdoc/starting/ar01s05.html
+++ b/core/doc/help/html/devdoc/starting/ar01s05.html
@@ -29,10 +29,10 @@
target="_top">http://www.openoffice.org/licenses/PDL.html</a>.</p>
<p>The Original Documentation is <span class="emphasis"><em>"Plugin Developer's
Documentation"</em></span>. The Initial Writer of the
- Original Documentation is (JCA) Cédric Bosdonnat (C) 2006. All
+ Original Documentation is (JCA) C&eacute;dric Bosdonnat (C) 2006. All
Rights Reserved. (Initial Writer contact(s):
- <a href="mailto:cedricbosdo@openoffice.org" target="_top">
- cedricbosdo@openoffice.org</a>.)</p>
+ <a href="mailto:cedric.bosdonnat.ooo@free.fr" target="_top">
+ cedric.bosdonnat.ooo@free.fr</a>.)</p>
<p>Contributor(s): ______________________________________.</p>
<p>Portions created by ______ are Copyright (C)_________
[Insert year(s)]. All Rights Reserved.
diff --git a/core/doc/help/html/devdoc/starting/index.html b/core/doc/help/html/devdoc/starting/index.html
index d551fa5..51ca51e 100644
--- a/core/doc/help/html/devdoc/starting/index.html
+++ b/core/doc/help/html/devdoc/starting/index.html
@@ -40,12 +40,11 @@ for their first build and first hack.</p>
</div>
</div>
<p>Starting to read this document implies some motivation to develop
-and participate in the OpenOffice.org Eclipse integration. The following
+and participate in the LibreOffice Eclipse integration. The following
pages will be helpful for anyone wanting to start hacking on the plugin.
Several key points will be presented like getting the source code,
building or understanding it. Even thought some points are enlightened
-here, many other useful documents should be read too like the Eclipse or
-OpenOffice.org developer's guides.</p>
+here, many other useful documents should be read too.</p>
</div>
</div>
diff --git a/core/doc/help/html/img/OOoLogo.png b/core/doc/help/html/img/OOoLogo.png
deleted file mode 100644
index 4eb39d7..0000000
--- a/core/doc/help/html/img/OOoLogo.png
+++ /dev/null
Binary files differ
diff --git a/core/doc/help/html/styles.css b/core/doc/help/html/styles.css
index bbb2b5b..2d651de 100644
--- a/core/doc/help/html/styles.css
+++ b/core/doc/help/html/styles.css
@@ -1,10 +1,3 @@
-body
-{
- background: white url(img/OOoLogo.png) no-repeat fixed;
- padding-left: 3em;
- padding-right: 1em;
-}
-
img
{
max-width: 90%;
diff --git a/core/doc/help/html/userdoc/javatuto/ar01s02.html b/core/doc/help/html/userdoc/javatuto/ar01s02.html
index c7a3363..e4651d8 100644
--- a/core/doc/help/html/userdoc/javatuto/ar01s02.html
+++ b/core/doc/help/html/userdoc/javatuto/ar01s02.html
@@ -37,7 +37,7 @@ the plugin:</p>
<ul type="disc">
<li>
<div class="figure"><a name="refIllustration5"></a>
- <p class="title"><b>Figure 6. : New UNO-IDL project item</b></p>
+ <p class="title"><b>Figure 6.: New UNO-IDL project item</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="141">
@@ -50,20 +50,20 @@ the plugin:</p>
</div>
<p>the first one is the <span class="strong"><strong>File
&gt; New &gt; Project</strong></span> menu entry and choose the <span class="strong"><strong>UNO
- &gt; UNO-IDL Project</strong></span> item as shown by the illustration <a
+ &gt; UNO-IDL Project</strong></span> item as shown by the illustration <a
href="ar01s02.html#refIllustration5"
- title="Figure 6. : New UNO-IDL project item">6</a>.</p>
+ title="Figure6.: New UNO-IDL project item">6</a>.</p>
</li>
<li>
<p>the second one is the icon in the toolbar representing a blue
- folder with a star as shown by the illustration <a
+ folder with a star as shown by the illustration <a
href="ar01s02.html#refIllustration6"
- title="Figure 7. : New UNO-IDL project icon">7</a>.</p>
+ title="Figure 7.: New UNO-IDL project icon">7</a>.</p>
</li>
</ul>
</div>
<div class="figure"><a name="refIllustration6"></a>
-<p class="title"><b>Figure 7. : New UNO-IDL project icon</b></p>
+<p class="title"><b>Figure 7.: New UNO-IDL project icon</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="22">
@@ -115,7 +115,7 @@ in our component.</p>
<ul type="disc">
<li>
<div class="figure"><a name="refIllustration7"></a>
- <p class="title"><b>Figure 8. : New UNO-IDL project wizard page</b></p>
+ <p class="title"><b>Figure 8.: New UNO-IDL project wizard page</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="332">
@@ -142,21 +142,21 @@ in our component.</p>
<li>
<p><span class="strong"><strong>Root package:</strong></span> is
the name of the first module of your component. It generally composed
- of two parts: the vendor name (here <code class="literal">org.openoffice</code>)
+ of two parts: the vendor name (here <code class="literal">my.company</code>)
and the project name (here <code class="literal">helloworld</code>).</p>
</li>
<li>
<p><span class="strong"><strong>Used SDK:</strong></span> selects
- the OpenOffice.org SDK which will be used to develop the component. You
+ the LibreOffice SDK which will be used to develop the component. You
generally will have only one SDK in the list, but you can add others in
the preferences or by clicking on the <span class="strong"><strong>Configure
SDKs</strong></span> button.</p>
</li>
<li>
- <p><span class="strong"><strong>Used OOo:</strong></span> selects
- the version of OpenOffice.org to use to develop the component. As for
+ <p><span class="strong"><strong>Used LibreOffice:</strong></span> selects
+ the version of LibreOffice to use to develop the component. As for
the SDK, you will generally have only one entry in the list, but you
- can add others in the preferences or by clicking on the OOo
+ can add others in the preferences or by clicking on the LibreOffice
Installations button.</p>
</li>
<li>
@@ -192,7 +192,7 @@ page</h3>
</div>
</div>
<div class="figure"><a name="refIllustration8"></a>
-<p class="title"><b>Figure 9. : Service configuration page</b></p>
+<p class="title"><b>Figure 9.: Service configuration page</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="333">
@@ -239,7 +239,7 @@ configuration page</h3>
</div>
</div>
<div class="figure"><a name="refIllustration9"></a>
-<p class="title"><b>Figure 10. : Interface configuration page</b></p>
+<p class="title"><b>Figure 10.: Interface configuration page</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="436">
@@ -268,9 +268,7 @@ configuration page</h3>
<li>
<p><span class="strong"><strong>Inherited
interfaces:</strong></span> is a list of all the interfaces from which the one that is
- about to be created will inherit. This is one of the changes in UNO-IDL
- between OpenOffice.org 1.1.x and 2.0: that is why the plugin does not
- support OpenOffice.org version prior to 2.0. All the UNO-IDL interfaces
+ about to be created will inherit. All the UNO-IDL interfaces
are inheriting more or less directly from the <code class="literal">com::sun::star::uno::XInterface</code>
type. As the <code class="literal">XHelloworld</code> interface is very
easy, no super interface will be added: that will implicitly define <code
@@ -323,7 +321,7 @@ different for a method and a property.</p>
<ul type="disc">
<li>
<div class="figure"><a name="refIllustration10"></a>
- <p class="title"><b>Figure 11. : Interface member creation
+ <p class="title"><b>Figure 11.: Interface member creation
dialog</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
@@ -392,8 +390,8 @@ know:</p>
<li>
<p><span class="strong"><strong>JRE and the jars:</strong></span>
are describing the classpath of the component. They are visible only in
- the Java package explorer. The OpenOffice.org jars are changed if the
- OpenOffice.org version associated to the project is changed. <span
+ the Java package explorer. The LibreOffice jars are changed if the
+ LibreOffice version associated to the project is changed. <span
class="emphasis"><em>In a future version, they will be
packed in a user library to take less space in the tree.</em></span></p>
</li>
@@ -420,9 +418,9 @@ Apache website, and import the <code class="literal">common-math-1.1.jar</code>
file into your component project: for example in a <code class="literal">lib</code>
directory. Add the jar to the project build path in the same way than in
any other Eclipse Java project and use it:</p>
-<pre class="programlisting">// org.openoffice.helloworld.XHelloworld:
+<pre class="programlisting">// my.company.helloworld.XHelloworld:
private String mLadyName = "";
-      
+
public String getLadyName()
{
return mLadyName;
diff --git a/core/doc/help/html/userdoc/javatuto/ar01s03.html b/core/doc/help/html/userdoc/javatuto/ar01s03.html
index 79b3cc0..42a2994 100644
--- a/core/doc/help/html/userdoc/javatuto/ar01s03.html
+++ b/core/doc/help/html/userdoc/javatuto/ar01s03.html
@@ -22,21 +22,21 @@ and testing the component</h2>
</div>
</div>
</div>
-<p>The next lines will show you how to export your component into an
-OpenOffice.org package. There is quite nothing to do apart from
+<p>The next lines will show you how to export your component into a LibreOffice
+ package. There is quite nothing to do apart from
following these small steps:</p>
<div class="itemizedlist">
<ul type="disc">
<li>
<p>Select the <span class="strong"><strong>File
&gt; Export</strong></span> menu. Then choose the <span class="strong"><strong>UNO
- &gt; OpenOffice.org</strong></span> package export type.</p>
+ &gt; LibreOffice</strong></span> package export type.</p>
</li>
<li>
<p>The next page of the wizard, asks for the UNO project to export
(already selected), the directory where to export the package and the
- OpenOffice.org minimum compatibility version for the package. Depending
- of the selected OpenOffice.org version, the package will get a
+ LibreOffice minimum compatibility version for the package. Depending
+ of the selected LibreOffice version, the package will get a
different name and a different structure.</p>
</li>
<li>
@@ -47,13 +47,13 @@ following these small steps:</p>
</ul>
</div>
<p>Then we will suppose that the package is deployed on the
-OpenOffice.org installation and we will test it using the following <code
+LibreOffice installation and we will test it using the following <code
class="literal">OooBasic</code> macro.</p>
<pre class="programlisting">Sub testHelloworld
-    oHelloworld = createUnoService( "org.openoffice.helloworld.Helloworld" )
-    oHelloworld.LadyName = "Robinson"
-    print oHelloworld.sayHello( false )
-    print oHelloworld.sayHello( True )
+ oHelloworld = createUnoService( "my.company.helloworld.Helloworld" )
+ oHelloworld.LadyName = "Robinson"
+ print oHelloworld.sayHello( false )
+ print oHelloworld.sayHello( True )
End Sub</pre>
<p>This macro should open two message windows with <span
class="emphasis"><em>&#8220;Hello Mrs. Robinson&#8221;</em></span> and
diff --git a/core/doc/help/html/userdoc/javatuto/ar01s04.html b/core/doc/help/html/userdoc/javatuto/ar01s04.html
index 8ac4249..1da3ba6 100644
--- a/core/doc/help/html/userdoc/javatuto/ar01s04.html
+++ b/core/doc/help/html/userdoc/javatuto/ar01s04.html
@@ -32,54 +32,20 @@ the next line.</p>
<ul type="disc">
<li>
<p><a
- href="http://api.openoffice.org/docs/DevelopersGuide/DevelopersGuide.xhtml"
- target="_top">OpenOffice.org developer's guide</a> is a huge source of
- documentation for any OpenOffice.org developer. You should probably
- have a look at the chapters 3 and 4 for UNO components informations.</p>
+ href="http://wiki.openoffice.org/wiki/Documentation/DevGuide"
+ target="_top">OpenOffice.org developer's guide</a> is still a huge source of
+ documentation for LibreOffice extensions developers. You should probably
+ have a look at the chapters 3, 4 and 5 for UNO components informations.</p>
</li>
<li>
<p><a
- href="http://api.openoffice.org/docs/java/ref/overview-summary.html"
- target="_top">OOo Java reference</a> is the UNO binding for Java
+ href="http://api.libreoffice.org/docs/java/ref/index.html"
+ target="_top">LibreOffice Java reference</a> is the UNO binding for Java
reference.</p>
</li>
<li>
- <p><a
- href="http://api.openoffice.org/docs/cpp/ref/names/index.html"
- target="_top">OOo C++ reference</a> is the UNO binding for C++
- reference.</p>
- </li>
- <li>
- <p><a href="http://wiki.services.openoffice.org/" target="_top">OOo
- Developer's Wiki</a> is the wiki for all the OpenOffice.org developers. It
- contains very useful informations even for people who just begin with
- UNO.</p>
- </li>
- <li>
- <p><a
- href="http://udk.openoffice.org/common/man/draft/multinherit.html"
- target="_top">http://udk.openoffice.org/common/man/draft/multinherit.html</a>
- for further informations on what changes in UNO-IDL between
- OpenOffice.org 1.1.x and 2.0</p>
- </li>
- <li>
- <p><a
- href="http://tools.openoffice.org/autodoc/HowToWriteDocumentation-Cpp.html"
- target="_top">Autodoc Java reference</a> is the reference for <code
- class="literal">javadoc</code> like comments in UNO-IDL files.</p>
- </li>
- <li>
- <p><a
- href="http://tools.openoffice.org/autodoc/HowToWriteDocumentation-Cpp.html"
- target="_top">Autodoc C++ documentation</a> is the reference for <code
- class="literal">javadoc</code> like comments in C++ components.</p>
- </li>
- <li>
- <p><a
- href="http://blogs.nuxeo.com/sections/blogs/cedric_bosdonnat/2005_12_07_creating-an-ure"
- target="_top">URE C++ application tutorial</a> explains how to create
- a C++ application based on the URE, that is a UNO C++ component that
- does not need OpenOffice.org.</p>
+ <p><a href="http://api.libreoffice.org/docs/common/ref/com/sun/star/module-ix.html" target="_top">
+ UNO API reference</a> will provide you the documentation for the LibreOffice UNO API.</p>
</li>
</ul>
</div>
diff --git a/core/doc/help/html/userdoc/javatuto/ar01s05.html b/core/doc/help/html/userdoc/javatuto/ar01s05.html
index 0032762..fe52b1d 100644
--- a/core/doc/help/html/userdoc/javatuto/ar01s05.html
+++ b/core/doc/help/html/userdoc/javatuto/ar01s05.html
@@ -29,12 +29,12 @@ the License is available at <a
</p>
<p>The Original Documentation is <span class="emphasis"><em>&#8220;UNO
Java component creation explained&#8221;</em></span>. The Initial Writer of the
-Original Documentation is (JCA) Cédric Bosdonnat (C) 2006 - 2007. All
+Original Documentation is (JCA) C&eacute;dric Bosdonnat (C) 2006-2007. All
Rights Reserved. (Initial Writer contact(s): <a
- href="mailto:cedricbosdo@openoffice.org" target="_top">cedricbosdo@openoffice.org</a>.)</p>
+ href="mailto:cedric.bosdonnat.ooo@free.fr" target="_top">cedric.bosdonnat.ooo@free.fr</a>.)</p>
<p>Contributor(s): ______________________________________.</p>
<p>Portions created by ______ are Copyright (C)_________[Insert
-year(s)]. All Rights Reserved.   (Contributor
+year(s)]. All Rights Reserved. (Contributor
contact(s):________________[Insert hyperlink/alias]).</p>
<p>Note: The text of this Appendix may differ slightly from the text
of the notices in the files of the Original Documentation. You should
diff --git a/core/doc/help/html/userdoc/javatuto/index.html b/core/doc/help/html/userdoc/javatuto/index.html
index 03f4c19..8624057 100644
--- a/core/doc/help/html/userdoc/javatuto/index.html
+++ b/core/doc/help/html/userdoc/javatuto/index.html
@@ -32,7 +32,7 @@ Eclipse</i></h3>
</div>
<p>This paper is a tutorial to guide UNO newcomers to create their
first Java component. This tutorial will use Eclipse and it's plugin for
-the OpenOffice.org development. Of course, every step will be detailed,
+the LibreOffice development. Of course, every step will be detailed,
but if your are still an experienced UNO programmer, you can have a look
at the next pages to have a better view of how to use the Eclipse
plugin.</p>
@@ -103,14 +103,14 @@ process</h4>
</div>
</div>
<div class="figure"><a name="refIllustration0"></a>
-<p class="title"><b>Figure 1. : UNO component build chain</b></p>
+<p class="title"><b>Figure 1.: UNO component build chain</b></p>
<div class="mediaobject"><img src="img/img000.png"
alt=": UNO component build chain"></div>
</div>
<p>To help you better understand what should be done to get a
component from it's specification and sources, you should have a look at
-the illustration <a href="index.html#refIllustration0"
- title="Figure 1. : UNO component build chain">1</a>. As shown by the
+the illustration <a href="index.html#refIllustration0"
+ title="Figure 1.: UNO component build chain">1</a>. As shown by the
diagram, the specifications are compiled and merged into one <code
class="literal">types.rdb</code> registry. <code class="literal">Class</code>
files are generated from that file to translate the specifications into
@@ -118,7 +118,7 @@ a Java class definition file which is build with the implementation into
class using the <code class="literal">java</code> compiler. All the
classes are delivered as a <code class="literal">jar</code> file with a
specific manifest as we will see further in this tutorial. This doesn't
-make a usable OpenOffice.org: the <code class="literal">types.rdb</code>
+make a usable LibreOffice: the <code class="literal">types.rdb</code>
and <code class="literal">jar</code> file will have to be zipped into a
<code class="literal">.uno.pkg</code> file described with another
manifest.</p>
@@ -140,22 +140,21 @@ development platform</h3>
configure the development tools. This is quite simple but you might be
trapped into some problems if you don't read the next lines carefully. I
will now assume that you have none of the development tools. The
-OpenOffice.org Eclipse integration minimal requirements are the
+LibreOffice Eclipse integration minimal requirements are the
following one:</p>
<div class="itemizedlist">
<ul type="disc">
<li>
- <p>OpenOffice.org 2.0</p>
+ <p>LibreOffice</p>
</li>
<li>
- <p>OpenOffice.org SDK 2.0.4</p>
+ <p>LibreOffice</p>
</li>
<li>
- <p>Eclipse 3.2</p>
+ <p>Eclipse</p>
</li>
<li>
- <p>Java 1.5 (the GNU Java doesn't work with the Eclipse
- integration)</p>
+ <p>Java</p>
</li>
</ul>
</div>
@@ -163,21 +162,14 @@ following one:</p>
<div class="titlepage">
<div>
<div>
-<h4 class="title"><a name="id2473592"></a>OpenOffice.org</h4>
+<h4 class="title"><a name="id2473592"></a>LibreOffice</h4>
</div>
</div>
</div>
-<p>First of all, you will need to have a working OpenOffice.org 2.0
+<p>First of all, you will need to have a working LibreOffice
and it's Software Development Kit (SDK). The last version are available
-on the <a href="http://download.openoffice.org/" target="_top">OpenOffice.org
-download pages</a> for the most current platforms. The OpenOffice.org SDK
-version 2.0.4 is mandatory to use the plugin correctly. It includes a
-new tool used by the plugin: the <code class="literal">uno-skeletonmaker</code>.
-This tool will generate the implementation skeleton to help you to
-concentrate only on your code.</p>
-<p>This tutorial assumes that you used the &#8220;Official&#8221;
-OpenOffice.org distribution from the project's website. Other
-distributions may not work with the Eclipse integration.</p>
+on the <a href="http://www.libreoffice.org/download" target="_top">LibreOffice
+download pages</a> for the most current platforms. </p>
</div>
<div class="section" lang="en-GB">
<div class="titlepage">
@@ -192,17 +184,17 @@ last Eclipse SDK. You will have Eclipse and it's SDK. Of course, you
might want to download only the binary runtime, but you will have to
follow more links. Once you have Eclipse, unzip it on your computer and
that's it: eclipse has a Java plugin to help you program in Java.</p>
-<p>Now we will install the OpenOffice.org development plugin for
+<p>Now we will install the LibreOffice development plugin for
Eclipse using the Eclipse software update system. <span class="strong"><strong>Do
not try to download an archive somewhere: Eclipse will do it for you
during the next steps.</strong></span> Select the <span class="strong"><strong>Help
&gt; Software updates &gt; Find and install</strong></span> menu to get the window of
-the illustration <a href="index.html#refIllustration1"
- title='Figure 2. : "Find &amp; Install" window'>2</a>. Check the second
+the illustration <a href="index.html#refIllustration1"
+ title='Figure 2.: "Find &amp; Install" window'>2</a>. Check the second
option on this window and click on the <span class="strong"><strong>Next</strong></span>
button.</p>
<div class="figure"><a name="refIllustration1"></a>
-<p class="title"><b>Figure 2. : "Find &amp; Install" window</b></p>
+<p class="title"><b>Figure 2.: "Find &amp; Install" window</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="384">
@@ -218,45 +210,45 @@ button.</p>
pointing to directories containing plugins informations and archives.
Now click on the <span class="strong"><strong>Add remote
site</strong></span> button to get a small window asking for a name that will be
-displayed in the list and an URL. The URL of OpenOffice.org plugin
+displayed in the list and an URL. The URL of LibreOffice plugin
update site is <a
href="http://cedric.bosdonnat.free.fr/ooeclipseintegration"
target="_top">http://cedric.bosdonnat.free.fr/ooeclipseintegration</a>.
<span class="strong"><strong>Do not hope to get an
archive to download here: it's the update site for Eclipse.</strong></span></p>
<p>Then validate the new update site parameters and be sure that the
-OpenOffice.org site is checked before clicking on the <span
+LibreOffice site is checked before clicking on the <span
class="strong"><strong>Finish</strong></span> button. You should now
-see a window like the one of the illustration <a
+see a window like the one of the illustration <a
href="index.html#refIllustration2"
- title="Figure 3. : OpenOffice.org update site contents">3</a>. <span
- class="strong"><strong>Select the OpenOffice.org plugin
+ title="Figure 3.: LibreOffice update site contents">3</a>. <span
+ class="strong"><strong>Select the LibreOffice plugin
Core and Java plugins</strong></span>, click next and let the wizard guide you through
the end of the process. You will be asked to accept the plugin licence
and validate the installation archives which are not signed.</p>
<div class="figure"><a name="refIllustration2"></a>
-<p class="title"><b>Figure 3. : OpenOffice.org update site
+<p class="title"><b>Figure 3.: LibreOffice update site
contents</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="355">
<tr style="height: 243px">
<td><img src="img/img002.png" width="355"
- alt=": OpenOffice.org update site contents"></td>
+ alt=": LibreOffice update site contents"></td>
</tr>
</table>
</div>
</div>
-<p>Congratulations, you have installed the OpenOffice.org plugin
+<p>Congratulations, you have installed the LibreOffice plugin
successfully, there is now to configure it. The following steps will
guide you through this task. Go to the Eclipse options via the <span
class="strong"><strong>Window &gt; Preferences...</strong></span> menu.
-In the list on the left, select the <span class="strong"><strong>OpenOffice.org
+In the list on the left, select the <span class="strong"><strong>LibreOffice
plugin &gt; SDK configuration</strong></span> item to get a window like the one shown by
-the illustration <a href="index.html#refIllustration3"
- title="Figure 4. : SDK configuration window">4</a>.</p>
+the illustration <a href="index.html#refIllustration3"
+ title="Figure 4.: SDK configuration window">4</a>.</p>
<div class="figure"><a name="refIllustration3"></a>
-<p class="title"><b>Figure 4. : SDK configuration window</b></p>
+<p class="title"><b>Figure 4.: SDK configuration window</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="371">
@@ -268,22 +260,22 @@ the illustration <a href="index.html#refIllustration3"
</div>
</div>
<p>In this window you will have to configure the path to your
-OpenOffice.org and to it's SDK. So let us begin with the SDK path: click
+LibreOffice and to it's SDK. So let us begin with the SDK path: click
on the <span class="strong"><strong>Add</strong></span> button next to
-the SDKs list. You will have a window like the illustration <a
+the SDKs list. You will have a window like the illustration <a
href="index.html#refIllustration4"
- title="Figure 5. : New SDK path window">5</a>, browse to your
-OpenOffice.org 2.0 SDK and validate. Then you will have to do the same
-for the OpenOffice.org path using the other <span class="strong"><strong>Add</strong></span>
+ title="Figure 5.: New SDK path window">5</a>, browse to your
+LibreOffice SDK and validate. Then you will have to do the same
+for the LibreOffice path using the other <span class="strong"><strong>Add</strong></span>
button.</p>
<p>Note that a URE installation can be selected instead of a
-complete OpenOffice.org installation. Please report to the Java URE
+complete LibreOffice installation. Please report to the Java URE
application tutorial for more details on the plugin's URE support.</p>
<p><span class="strong"><strong>Please make sure
that the path to the SDK doesn't contains any space on Windows: it could
cause some problems when building your UNO projects afterwards.</strong></span></p>
<div class="figure"><a name="refIllustration4"></a>
-<p class="title"><b>Figure 5. : New SDK path window</b></p>
+<p class="title"><b>Figure 5.: New SDK path window</b></p>
<div class="mediaobject">
<table border="0" summary="manufactured viewport for HTML img"
cellspacing="0" cellpadding="0" width="244">
@@ -294,11 +286,10 @@ cause some problems when building your UNO projects afterwards.</strong></span><
</table>
</div>
</div>
-<p>Now your OpenOffice.org plugin is ready to work: you can begin to
+<p>Now your LibreOffice plugin is ready to work: you can begin to
create your new component. If there was any problem during the plugin
installation, do not hesitate to report it to the <a
- href="mailto:dev@api.openoffice.org" target="_top">dev@api.openoffice.org</a>
-mailing-list.</p>
+ href="mailto:cedric.bosdonnat.ooo@free.fr" target="_top">author</a>.</p>
</div>
</div>
</div>
diff --git a/core/doc/help/html/userdoc/javatuto/toc.xml b/core/doc/help/html/userdoc/javatuto/toc.xml
index 09a6276..8e3d814 100644
--- a/core/doc/help/html/userdoc/javatuto/toc.xml
+++ b/core/doc/help/html/userdoc/javatuto/toc.xml
@@ -7,7 +7,7 @@
<topic label="Components creation process" href="doc/help/html/userdoc/javatuto/index.html#id2516729"/>
</topic>
<topic label="Installing the development platform" href="doc/help/html/userdoc/javatuto/index.html#id2473547">
- <topic label="OpenOffice.org" href="doc/help/html/userdoc/javatuto/index.html#id2473592"/>
+ <topic label="LibreOffice" href="doc/help/html/userdoc/javatuto/index.html#id2473592"/>
<topic label="Eclipse and the plugin" href="doc/help/html/userdoc/javatuto/index.html#id2473631"/>
</topic>
</topic>
diff --git a/core/doc/help/html/userdoc/uretuto/ar01s02.html b/core/doc/help/html/userdoc/uretuto/ar01s02.html
index 0ac5b84..32bd419 100644
--- a/core/doc/help/html/userdoc/uretuto/ar01s02.html
+++ b/core/doc/help/html/userdoc/uretuto/ar01s02.html
@@ -27,7 +27,7 @@ comparison, this interface is to UNO what the static main method is to
C/C++ or Java. Running an URE application is telling UNO which <code
class="literal">Xmain:run()</code> method to run, then your application
is started and you can do your job.</p>
-<p>The OpenOffice.org Eclipse integration provides a simple wizard
+<p>The LibreOffice Eclipse integration provides a simple wizard
to create a URE application: this helps you to remember which interface
has to be implemented and how to register it to the URE. It provides an
easy way to run your URE applications in the Eclipse fashion.</p>
@@ -55,8 +55,8 @@ example, you could change the opened file into the following:</p>
<pre class="programlisting">// com.sun.star.lang.XMain:
public int run(String[] aArguments)
{
-     System.out.println( "Here is a postcard from the URE world !" );
-     return 0;
+ System.out.println( "Here is a postcard from the URE world !" );
+ return 0;
}</pre></div>
<div class="section" lang="en-GB">
<div class="titlepage">
diff --git a/core/doc/help/html/userdoc/uretuto/ar01s03.html b/core/doc/help/html/userdoc/uretuto/ar01s03.html
index a752e11..71d4f97 100644
--- a/core/doc/help/html/userdoc/uretuto/ar01s03.html
+++ b/core/doc/help/html/userdoc/uretuto/ar01s03.html
@@ -27,12 +27,12 @@ the License is available at <a
</p>
<p>The Original Documentation is <span class="emphasis"><em>&#8220;Creating
a URE application&#8221;</em></span>. The Initial Writer of the Original
-Documentation is (JCA) Cédric Bosdonnat (C) 2007. All Rights Reserved.
-(Initial Writer contact(s): <a href="mailto:cedricbosdo@openoffice.org"
- target="_top">cedricbosdo@openoffice.org</a>.)</p>
+Documentation is (JCA) C&eacute;dric Bosdonnat (C) 2007. All Rights Reserved.
+(Initial Writer contact(s): <a href="mailto:cedric.bosdonnat.ooo@free.fr"
+ target="_top">cedric.bosdonnat.ooo@free.fr</a>.)</p>
<p>Contributor(s): ______________________________________.</p>
<p>Portions created by ______ are Copyright (C)_________[Insert
-year(s)]. All Rights Reserved.   (Contributor
+year(s)]. All Rights Reserved. (Contributor
contact(s):________________[Insert hyperlink/alias]).</p>
<p>Note: The text of this Appendix may differ slightly from the text
of the notices in the files of the Original Documentation. You should
diff --git a/core/doc/help/html/userdoc/uretuto/index.html b/core/doc/help/html/userdoc/uretuto/index.html
index 7f5e15f..ca282ee 100644
--- a/core/doc/help/html/userdoc/uretuto/index.html
+++ b/core/doc/help/html/userdoc/uretuto/index.html
@@ -4,7 +4,7 @@
<title>Creating a URE application</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
<meta name="description"
- content="OpenOffice.org component model named UNO can be used to create new applications. This is possible because a subset of OpenOffice.org managing the UNO environment has been extracted to allow standalone components. To use this subset, named URE, some UNO knowledge are required. This document will show how every Java developer could create its own URE application without too much effort thanks to the OpenOffice.org Eclipse integration.">
+ content="LibreOffice component model named UNO can be used to create new applications.">
<link rel="start" href="index.html" title="Creating a URE application">
<link rel="next" href="ar01s02.html" title="Creating the application">
<link href="../../styles.css" rel="stylesheet" type="text/css" />
@@ -25,13 +25,13 @@ applications creation</i></h3>
<div>
<div class="abstract">
<p class="title"><b>Abstract</b></p>
-<p>OpenOffice.org component model named UNO can be used to create
-new applications. This is possible because a subset of OpenOffice.org
+<p>LibreOffice component model named UNO can be used to create
+new applications. This is possible because a subset of LibreOffice
managing the UNO environment has been extracted to allow standalone
components. To use this subset, named URE, some UNO knowledge are
required. This document will show how every Java developer could create
its own URE application without too much effort thanks to the
-OpenOffice.org Eclipse integration.</p>
+LibreOffice Eclipse integration.</p>
</div>
</div>
</div>
@@ -49,7 +49,7 @@ OpenOffice.org Eclipse integration.</p>
application. It supposes that you have already read the general Java
component tutorial. The <a href="../javatuto/index.html"><span class="emphasis"><em>&#8220;See
Java Component Tutorial&#8221;</em></span></a> mention in this document will ask you to
-have a look at the Java component tutorial first. For the OpenOffice.org
+have a look at the Java component tutorial first. For the LibreOffice
Eclipse integration installation or explanations on the component,
please refer to the corresponding section in the Java component
tutorial.</p>
@@ -58,11 +58,10 @@ this tutorial:</p>
<div class="itemizedlist">
<ul type="disc">
<li>
- <p><span class="strong"><strong>URE</strong></span> UNO Runtime Environment, a subset of OpenOffice.org hosting
+ <p><span class="strong"><strong>URE</strong></span> UNO Runtime Environment, a subset of LibreOffice hosting
and managing UNO components.</p>
</li>
<li>
- <p><span class="strong"><strong>UNO</strong> Universal Network Objects, OpenOffice.org component model.</p>
</li>
</ul>
</div>
diff --git a/core/doc/help/toc.xml b/core/doc/help/toc.xml
index ec8f69d..5cf8b95 100755
--- a/core/doc/help/toc.xml
+++ b/core/doc/help/toc.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="OpenOffice.org plugin help">
+<toc label="LibreOffice plugin help">
<topic label="User documentation" href="doc/help/html/userdoc/index.html">
<link toc="doc/help/html/userdoc/javatuto/toc.xml"/>
@@ -25,4 +25,4 @@
<topic label="wizards" href="doc/help/html/api/org/openoffice/ide/eclipse/wizards/package-summary.html" />
</topic>
-</toc> \ No newline at end of file
+</toc>
diff --git a/core/plugin.properties b/core/plugin.properties
index ea13d76..2d2e68d 100755
--- a/core/plugin.properties
+++ b/core/plugin.properties
@@ -3,7 +3,7 @@ regeditor.name = UNO registry database viewer
package.editor.name = Extension properties editor
description.editor.name = Extension description editor
-preferences.oooplugin = OpenOffice.org plugin
+preferences.oooplugin = LibreOffice plugin
preferences.unoidleditor = UNO-IDL Editor
preferences.sdkconfig = SDK Configuration
@@ -26,7 +26,7 @@ newactions.newproject.tooltip = Launch the new UNO-IDL project wizard
idlcerrormarker.name = Marker for idlc errors
-cheatsheets.name = OpenOffice.org extensions
+cheatsheets.name = LibreOffice extensions
project.propertypage.name = UNO properties
diff --git a/core/schema/language.exsd b/core/schema/language.exsd
index 366424c..cc0c9c1 100644
--- a/core/schema/language.exsd
+++ b/core/schema/language.exsd
@@ -6,7 +6,7 @@
<meta.schema plugin="org.openoffice.ide.eclipse.core" id="language" name="Uno-idl project language binding Extension point"/>
</appInfo>
<documentation>
- This extension point has to be used for the definition of a new language supported by the OpenOffice.org development plugin.
+ This extension point has to be used for the definition of a new language supported by the LibreOffice development plugin.
</documentation>
</annotation>
diff --git a/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java b/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java
index e9435cf..568ba8e 100755
--- a/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java
+++ b/core/source/org/openoffice/ide/eclipse/core/builders/RegmergeBuilder.java
@@ -69,7 +69,7 @@ public class RegmergeBuilder {
/**
* Root of the generated types, used by regmerge and javamaker. UCR
- * is chosen for OpenOffice.org compatibility
+ * is chosen for LibreOffice compatibility
*/
public static final String TYPE_ROOT_KEY = "/UCR"; //$NON-NLS-1$
diff --git a/core/source/org/openoffice/ide/eclipse/core/editors/syntax/IUnoidlSyntax.java b/core/source/org/openoffice/ide/eclipse/core/editors/syntax/IUnoidlSyntax.java
index a20d264..1157453 100755
--- a/core/source/org/openoffice/ide/eclipse/core/editors/syntax/IUnoidlSyntax.java
+++ b/core/source/org/openoffice/ide/eclipse/core/editors/syntax/IUnoidlSyntax.java
@@ -63,9 +63,9 @@ public interface IUnoidlSyntax {
* The UNO-IDL reserved words: they will be rendered as keywords.
*/
public static final String[] RESERVED_WORDS = {
- "published", // new with the OpenOffice.org 2.0 SDK //$NON-NLS-1$
- "get", // new with the OpenOffice.org 2.0 SDK //$NON-NLS-1$
- "set", // new with the OpenOffice.org 2.0 SDK //$NON-NLS-1$
+ "published", //$NON-NLS-1$
+ "get", //$NON-NLS-1$
+ "set", //$NON-NLS-1$
"service", //$NON-NLS-1$
"singleton", //$NON-NLS-1$
"type", //$NON-NLS-1$
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
index a3299cc..32d2339 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java
@@ -39,7 +39,7 @@ import org.openoffice.ide.eclipse.core.gui.rows.OOoRow;
import org.openoffice.ide.eclipse.core.gui.rows.SdkRow;
/**
- * Class providing the OOo and SDK configuration rows.
+ * Class providing the LibreOffice and SDK configuration rows.
*
* @author cbosdonnat
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/OOoTable.java b/core/source/org/openoffice/ide/eclipse/core/gui/OOoTable.java
index ff2c593..30f2936 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoTable.java
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoTable.java
@@ -172,14 +172,14 @@ public class OOoTable extends AbstractTable {
}
/**
- * This method create and calls the dialog box to be launched on OOo edition
- * or OOo creation. The parameter <code>pOoo</code> could be null: in this
+ * This method create and calls the dialog box to be launched on LibreOffice edition
+ * or LibreOffice creation. The parameter <code>pOoo</code> could be null: in this
* case, a new one will be created. Otherwise the fields of the old one will
* be changed. This is useful for OOo editing: the object reference is the
* same.
*
- * @param pOoo the OpenOffice.org instance to show in the dialog
- * @return the modified or created OpenOffice.org instance
+ * @param pOoo the LibreOffice instance to show in the dialog
+ * @return the modified or created LibreOffice instance
*/
protected AbstractOOo openDialog(AbstractOOo pOoo) {
@@ -296,7 +296,7 @@ public class OOoTable extends AbstractTable {
}
/**
- * Class for the OOo add/edit dialog.
+ * Class for the LibreOffice add/edit dialog.
*
* @author cedricbosdo
*/
@@ -315,7 +315,7 @@ public class OOoTable extends AbstractTable {
private AbstractOOo mOOo;
/**
- * Create the OOo dialog without any OOo instance.
+ * Create the LibreOffice dialog without any Ooo instance.
*
* @param pParentShell the shell where to put the dialog
*/
@@ -324,7 +324,7 @@ public class OOoTable extends AbstractTable {
}
/**
- * Create the OOo dialog with an OOo instance to edit.
+ * Create the LibreOffice dialog with an OOo instance to edit.
*
* @param pParentShell the shell where to put the dialog
* @param pOoo the OOo instance to edit
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
index dadaab9..ad2871f 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties
@@ -8,18 +8,18 @@ ConnectionConfigPanel.Pipe=Pipe
ConnectionConfigPanel.Port=Port
ConnectionConfigPanel.Socket=Socket
LocaleDialog.Title=Locale
-OOoConfigPanel.GroupTitle=OpenOffice.org instance and SDK
-OOoTable.Title=Available OpenOffice.org installations
+OOoConfigPanel.GroupTitle=LibreOffice instance and SDK
+OOoTable.Title=Available LibreOffice installations
OOoTable.NameTitle=Name
-OOoTable.PathTitle=Path to OOo installation
-OOoTable.DialogTitle=OpenOffice.org configuration
+OOoTable.PathTitle=Path to LibreOffice installation
+OOoTable.DialogTitle=LibreOffice configuration
OOoTable.MissingFieldError=All the fields have to be filled
OOoTable.NameExistsError=The name already exists, a new one \nwill be generated from this one.
-OOoTable.InvalidPathError=Invalid OOo path
+OOoTable.InvalidPathError=Invalid LibreOffice path
SDKTable.Title=Available SDKs
SDKTable.NameTitle=Name
SDKTable.PathTitle=Path to SDK
-SDKTable.DialogTitle=OpenOffice.org SDK configuration
+SDKTable.DialogTitle=LibreOffice SDK configuration
SDKTable.MissingFieldError=All the fields have to be filled
SDKTable.SpacesSdkPathWarning=The path of the SDK contains white spaces, the build might not work
ProjectSelectionDialog.Title=Project content chooser \ No newline at end of file
diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
index 4783344..180e6c1 100644
--- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties
@@ -6,7 +6,7 @@ DialogRow.BrowseLabel=Browse
SdkRow.Browse=Configure SDK...
SdkRow.Label=SDK
SdkRow.DialogTitle=Configure SDKs
-OOoRow.Browse=Configure OpenOffice.org...
-OOoRow.Label=OpenOffice.org
-OOoRow.DialogTitle=Configure OOos
+OOoRow.Browse=Configure LibreOffice...
+OOoRow.Label=LibreOffice
+OOoRow.DialogTitle=Configure LibreOffice installations
AbstractConfigRow.Label=configuration
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/AbstractOOo.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/AbstractOOo.java
index 5305b49..6b5b046 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/model/AbstractOOo.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/AbstractOOo.java
@@ -92,7 +92,7 @@ public abstract class AbstractOOo implements IOOo, ITableElement {
* Creating a new OOo or URE instance specifying its home directory.
*
* @param pOooHome
- * the OpenOffice.org or URE home directory
+ * the LibreOffice or URE home directory
* @throws InvalidConfigException
* is thrown if the home directory doesn't contains the required files and directories
*/
@@ -104,9 +104,9 @@ public abstract class AbstractOOo implements IOOo, ITableElement {
* Creating a new OOo or URE instance specifying its home directory and name.
*
* @param pOooHome
- * the OpenOffice.org or URE installation directory
+ * the LibreOffice or URE installation directory
* @param pName
- * the OpenOffice.org or URE instance name
+ * the LibreOffice or URE instance name
*
* @throws InvalidConfigException
* if the home directory doesn't contains the required files and directories
@@ -362,7 +362,7 @@ public abstract class AbstractOOo implements IOOo, ITableElement {
/**
* {@inheritDoc}
*/
- public void runOpenOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
+ public void runOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
IExtraOptionsProvider pExtraOptionsProvider, IProgressMonitor pMonitor) {
try {
IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(pPrj.getName());
@@ -383,12 +383,12 @@ public abstract class AbstractOOo implements IOOo, ITableElement {
env = addUserProfile(pUserInstallation, env);
env = pExtraOptionsProvider.addEnv(env);
- PluginLogger.debug("Launching OpenOffice from commandline: " + command);
+ PluginLogger.debug("Launching LibreOffice from commandline: " + command);
Process p = pPrj.getSdk().runToolWithEnv(prj, pPrj.getOOo(), command, env, pMonitor);
- DebugPlugin.newProcess(pLaunch, p, Messages.getString("AbstractOOo.OpenOfficeProcessName")); //$NON-NLS-1$
+ DebugPlugin.newProcess(pLaunch, p, Messages.getString("AbstractOOo.LibreOfficeProcessName")); //$NON-NLS-1$
} catch (Exception e) {
e.printStackTrace();
- PluginLogger.error("Error running OpenOffice", e);
+ PluginLogger.error("Error running LibreOffice", e);
}
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java
index 89a7fbd..2f957e6 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/OOo.java
@@ -64,10 +64,10 @@ import org.openoffice.ide.eclipse.core.model.config.InvalidConfigException;
import org.openoffice.ide.eclipse.core.model.utils.SystemHelper;
/**
- * Representing an OpenOffice.org instance for use in the UNO-IDL projects.
+ * Representing an LibreOffice instance for use in the UNO-IDL projects.
*
* <p>
- * An OpenOffice.org instance is recognized to the following files:
+ * A LibreOffice instance is recognized to the following files:
* <ul>
* <li><code>program/classes</code> directory</li>
* <li><code>program/types.rdb</code> registry</li>
@@ -76,8 +76,8 @@ import org.openoffice.ide.eclipse.core.model.utils.SystemHelper;
* </p>
*
* <p>
- * A MacOS installation of OpenOffice.org will have some different paths, and of course the windows installation too.
- * This class is used to abstract the platform OOo is installed on.
+ * A MacOS installation of LibreOffice will have some different paths, and of course the windows installation too.
+ * This class is used to abstract the platform LibreOffice is installed on.
* </p>
*
* @author cedricbosdo
@@ -86,7 +86,7 @@ import org.openoffice.ide.eclipse.core.model.utils.SystemHelper;
public class OOo extends AbstractOOo {
/**
- * private constant that holds the ooo name key in the bootstrap properties file.
+ * private constant that holds the LibreOffice name key in the bootstrap properties file.
*/
private static final String K_PRODUCTKEY = "ProductKey"; //$NON-NLS-1$
@@ -95,10 +95,10 @@ public class OOo extends AbstractOOo {
private OOo3PathMapper mMapper;
/**
- * Creating a new OOo instance specifying its home directory.
+ * Creating a new LibreOffice instance specifying its home directory.
*
* @param pOooHome
- * the OpenOffice.org home directory
+ * the LibreOffice home directory
*
* @throws InvalidConfigException
* is thrown if the home directory doesn't contains the required files and directories
@@ -108,12 +108,12 @@ public class OOo extends AbstractOOo {
}
/**
- * Creating a new OOo instance specifying its home directory and name.
+ * Creating a new LibreOffice instance specifying its home directory and name.
*
* @param pOooHome
- * the OpenOffice.org installation path
+ * the LibreOffice installation path
* @param pOooName
- * the OpenOffice.org instance name
+ * the LibreOffice instance name
*
* @throws InvalidConfigException
* is thrown if the home directory doesn't contains the required files and directories
@@ -128,10 +128,10 @@ public class OOo extends AbstractOOo {
* Overridden to initialize the path mapper for 00o3 installations.
*
* @param pHome
- * the OOo installation path to set.
+ * the LibreOffice installation path to set.
*
* @throws InvalidConfigException
- * if the path doesn't point to a valid OOo installation.
+ * if the path doesn't point to a valid LibreOffice installation.
*/
@Override
public void setHome(String pHome) throws InvalidConfigException {
@@ -228,7 +228,7 @@ public class OOo extends AbstractOOo {
}
/**
- * @return The OOo name as defined in Bootstraprc or <code>null</code>.
+ * @return The LibreOffice name as defined in Bootstraprc or <code>null</code>.
*/
private String getOOoName() {
@@ -372,7 +372,7 @@ public class OOo extends AbstractOOo {
}
/**
- * Add a Uno package to the OOo user packages.
+ * Add a Uno package to the LibreOffice user packages.
*
* FIXME This method has to handle license approval
*
@@ -419,7 +419,7 @@ public class OOo extends AbstractOOo {
}
/**
- * Remove the named package from the OOo packages.
+ * Remove the named package from the LibreOffice packages.
*
* @param pName
* the name of the package to remove
@@ -441,7 +441,7 @@ public class OOo extends AbstractOOo {
}
/**
- * Check if the named package is already installed on OOo.
+ * Check if the named package is already installed on LibreOffice.
*
* @param pName
* the package name to look for
@@ -509,7 +509,7 @@ public class OOo extends AbstractOOo {
* Create a new mapper object to get the OOo3 layers paths.
*
* @param pHome
- * the OOo install home
+ * the LibreOffice install home
* @throws InvalidConfigException
*/
public OOo3PathMapper(String pHome) throws InvalidConfigException {
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/SDK.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/SDK.java
index ce8b219..cfe6c31 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/model/SDK.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/SDK.java
@@ -108,7 +108,7 @@ public class SDK implements ISdk, ITableElement {
* @param pSdkHome absolute path of the SDK root
*
* @throws InvalidConfigException if the path doesn't points to a valid
- * OpenOffice.org SDK installation directory.
+ * LibreOffice SDK installation directory.
*/
public SDK (String pSdkHome) throws InvalidConfigException {
@@ -410,12 +410,12 @@ public class SDK implements ISdk, ITableElement {
* <code>DYLD_LIBRARY_PATH</code> depending on the platform.</p>
*
* @param pVars the environment variables to update
- * @param pOoo the OpenOffice.org instance to use along with the SDK
+ * @param pOoo the LibreOffice instance to use along with the SDK
*
* @return the update environment variables.
*
* @throws Exception if the platform isn't among the platforms for which the
- * OpenOffice.org SDK is available.
+ * LibreOffice SDK is available.
*/
private String[] updateEnvironment(String[] pVars, IOOo pOoo) throws Exception {
String[] oooBinPaths = pOoo.getBinPath();
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/UnoidlProject.java b/core/source/org/openoffice/ide/eclipse/core/internal/model/UnoidlProject.java
index 4e45a3c..6f301ef 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/model/UnoidlProject.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/UnoidlProject.java
@@ -103,7 +103,7 @@ public class UnoidlProject implements IUnoidlProject, IProjectNature {
public static final String SDK_NAME = "project.sdk"; //$NON-NLS-1$
/**
- * Project property that stores the name of the OpenOffice.org instance used to run / deploy the project.
+ * Project property that stores the name of the LibreOffice instance used to run / deploy the project.
*/
public static final String OOO_NAME = "project.ooo"; //$NON-NLS-1$
@@ -485,15 +485,15 @@ public class UnoidlProject implements IUnoidlProject, IProjectNature {
/**
* {@inheritDoc}
*/
- public IPath getOpenOfficeUserProfilePath() {
+ public IPath getOfficeUserProfilePath() {
return getFolder(getDistPath().append(UnoidlProjectHelper.OO_PROFILE_BASIS)).getProjectRelativePath();
}
/**
* {@inheritDoc}
*/
- public IFolder getOpenOfficeUserProfileFolder() throws CoreException {
- IFolder folder = getFolder(getOpenOfficeUserProfilePath());
+ public IFolder getOfficeUserProfileFolder() throws CoreException {
+ IFolder folder = getFolder(getOfficeUserProfilePath());
if (!folder.exists()) {
folder.getLocation().toFile().mkdirs();
}
@@ -800,7 +800,7 @@ public class UnoidlProject implements IUnoidlProject, IProjectNature {
}
/**
- * Toggle an error marker on the project indicating that the there is either no OpenOffice.org nor SDK set.
+ * Toggle an error marker on the project indicating that the there is either no LibreOffice nor SDK set.
*
* @param pSet
* <code>true</code> if the error marker should be set, <code>false</code> otherwise.
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/model/messages.properties b/core/source/org/openoffice/ide/eclipse/core/internal/model/messages.properties
index 658878c..6bf4638 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/model/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/model/messages.properties
@@ -1,6 +1,6 @@
AbstractOOo.NoDirectoryError=Not an existing directory:
AbstractOOo.UreProcessName=URE process :
-AbstractOOo.OpenOfficeProcessName=OpenOffice
+AbstractOOo.LibreOfficeProcessName=LibreOffice
AbstractOOo.NoFileError=Not an existing file:
UnoidlProject.RemoveMarkerError=Failed to remove marker
UnoidlProject.NoOOoSdkError=No SDK or OOo set: won't build
@@ -19,11 +19,11 @@ SDK.NoFileError=Not an existing file:
SDK.NoIdlDirError=No idl directory found
SDK.NoReadableFileError=Not a readable file:
SDK.InvalidSdkError=SDK doesn't fit to the OS
-SDK.PluginError=OpenOffice.org plugin error
+SDK.PluginError=LibreOffice plugin error
SDK.ProcessError=Process execution failed
SDK.Ok=OK
UnoFactory.SkeletonGeneratedMessage=Skeleton generated:
OOo.PackageExportTitle=Uno package export
OOo.PackageAlreadyInstalled=The package is already installed, should it be removed ?
-OOo.DeploymentError=Error when deploying the OpenOffice.org package
+OOo.DeploymentError=Error when deploying the LibreOffice package
OOo.PackageAddError=Failed to add package
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/office/OfficeConnection.java b/core/source/org/openoffice/ide/eclipse/core/internal/office/OfficeConnection.java
index 9dca04f..e889f4d 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/office/OfficeConnection.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/office/OfficeConnection.java
@@ -128,7 +128,7 @@ public class OfficeConnection {
*
* @param pPath the OS dependent path to convert
*
- * @return the resulting OpenOffice.org URL
+ * @return the resulting LibreOffice URL
*/
public String convertToUrl(String pPath) {
String internalUrl = null;
diff --git a/core/source/org/openoffice/ide/eclipse/core/internal/office/TypesGetter.java b/core/source/org/openoffice/ide/eclipse/core/internal/office/TypesGetter.java
index a48e3cd..c3974a7 100644
--- a/core/source/org/openoffice/ide/eclipse/core/internal/office/TypesGetter.java
+++ b/core/source/org/openoffice/ide/eclipse/core/internal/office/TypesGetter.java
@@ -184,7 +184,7 @@ public class TypesGetter {
* Query the types and return them in a map..
*
* <p>The types are mapped to an identifier indicating where they have been
- * extracted from. For an OpenOffice.org instance, the key in the map will be the
+ * extracted from. For a LibreOffice instance, the key in the map will be the
* OOo name. For any external registry, the key in the map will be the OS
* specific path to the registry.</p>
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/office/LaunchConfigurationTabs.java b/core/source/org/openoffice/ide/eclipse/core/launch/office/LaunchConfigurationTabs.java
index a241495..3aa9ec3 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/office/LaunchConfigurationTabs.java
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/office/LaunchConfigurationTabs.java
@@ -38,7 +38,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab;
import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
/**
- * Creates tabs in the OpenOffice launcher.
+ * Creates tabs in the LibreOffice launcher.
*
* @author cdan
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeLaunchDelegate.java b/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeLaunchDelegate.java
index b7147c3..a2ac97b 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeLaunchDelegate.java
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeLaunchDelegate.java
@@ -58,7 +58,7 @@ import org.openoffice.ide.eclipse.core.model.config.NullExtraOptionsProvider;
import org.openoffice.plugin.core.model.UnoPackage;
/**
- * OpenOffice launcher implementation.
+ * LibreOffice launcher implementation.
*
* @author cdan
*
@@ -66,7 +66,7 @@ import org.openoffice.plugin.core.model.UnoPackage;
public class OfficeLaunchDelegate extends LaunchConfigurationDelegate {
/**
- * Export the .oxt file, deploy it in openoffice, run openoffice.
+ * Export the .oxt file, deploy it in LibreOffice, run LibreOffice.
*/
private static final int TASK_UNITS = 3;
@@ -97,7 +97,7 @@ public class OfficeLaunchDelegate extends LaunchConfigurationDelegate {
try {
IPath userInstallation = null;
if (useCleanUserInstalation) {
- IFolder userInstallationFolder = unoprj.getOpenOfficeUserProfileFolder();
+ IFolder userInstallationFolder = unoprj.getOfficeUserProfileFolder();
userInstallation = userInstallationFolder.getLocation();
}
@@ -119,11 +119,11 @@ public class OfficeLaunchDelegate extends LaunchConfigurationDelegate {
}
pMonitor.worked(1);
- // Run an OpenOffice instance
+ // Run an LibreOffice instance
if (ILaunchManager.DEBUG_MODE.equals(pMode)) {
- unoprj.getLanguage().connectDebuggerToOpenOffice(unoprj, pLaunch, userInstallation, pMonitor);
+ unoprj.getLanguage().connectDebuggerToOffice(unoprj, pLaunch, userInstallation, pMonitor);
} else {
- unoprj.getOOo().runOpenOffice(unoprj, pLaunch, userInstallation, new NullExtraOptionsProvider(),
+ unoprj.getOOo().runOffice(unoprj, pLaunch, userInstallation, new NullExtraOptionsProvider(),
pMonitor);
}
pMonitor.worked(1);
diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeTab.java b/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeTab.java
index 7c88d70..bcdb311 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeTab.java
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/office/OfficeTab.java
@@ -57,7 +57,7 @@ import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
import org.openoffice.ide.eclipse.core.model.ProjectsManager;
/**
- * Tab for configuring the OpenOffice launch properties.
+ * Tab for configuring the LibreOffice launch properties.
*
* @author cdan
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/IUnoidlProject.java b/core/source/org/openoffice/ide/eclipse/core/model/IUnoidlProject.java
index 76b200f..ec3afad 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/IUnoidlProject.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/IUnoidlProject.java
@@ -90,7 +90,7 @@ public interface IUnoidlProject {
public String getName();
/**
- * @return the selected OOo
+ * @return the selected LibreOffice
*/
public IOOo getOOo();
@@ -108,9 +108,9 @@ public interface IUnoidlProject {
public void setLanguage(AbstractLanguage pLanguage);
/**
- * Sets the selected OOo.
+ * Sets the selected LibreOffice.
*
- * @param pOOo the selected OpenOffice.org
+ * @param pOOo the selected LibreOffice
*/
public void setOOo(IOOo pOOo);
@@ -176,7 +176,7 @@ public interface IUnoidlProject {
/**
* Returns the company prefix used in the idl modules and implementation
* trees. For example, it could be <code>org.openoffice</code> for any code
- * created by the OpenOffice.org community.
+ * created by the LibreOffice community.
*
* @return the company prefix
*/
@@ -264,20 +264,20 @@ public interface IUnoidlProject {
/**
* @return the path to the project's folder used to store the user profile
- * when running/debugging OpenOffice in a clean environment. This
- * way we do not mangle with the system wide installed, OpenOffice
+ * when running/debugging LibreOffice in a clean environment. This
+ * way we do not mangle with the system wide installed, LibreOffice
* settings.
*/
- public IPath getOpenOfficeUserProfilePath();
+ public IPath getOfficeUserProfilePath();
/**
* @return the folder used to store the user profile
- * when running/debugging OpenOffice in a clean environment. This
- * way we do not mangle with the system wide installed, OpenOffice
+ * when running/debugging LibreOffice in a clean environment. This
+ * way we do not mangle with the system wide installed, LibreOffice
* settings. If the folder does not exist then it is created.
* @throws CoreException if we were unable to create the folder.
*/
- public IFolder getOpenOfficeUserProfileFolder() throws CoreException;
+ public IFolder getOfficeUserProfileFolder() throws CoreException;
//----------------------------------------------- Project resources getters
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/OOoContainer.java b/core/source/org/openoffice/ide/eclipse/core/model/OOoContainer.java
index b1647ef..19df387 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/OOoContainer.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/OOoContainer.java
@@ -60,7 +60,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.core.model.config.InvalidConfigException;
/**
- * Singleton object containing the OOo configurations.
+ * Singleton object containing the LibreOffice configurations.
*
* @author cedricbosdo
*
@@ -153,7 +153,7 @@ public class OOoContainer {
}
/**
- * Notify every listener that an OpenOffice.org instance configuration
+ * Notify every listener that a LibreOffice instance configuration
* has been added.
*
* @param pOoo the added OOo
@@ -199,7 +199,7 @@ public class OOoContainer {
}
/**
- * Checks whether the corresponding OOo name already exists.
+ * Checks whether the corresponding LibreOffice name already exists.
*
* @param pName the OOo Name to check
* @return <code>true</code> if the name is already present,
@@ -240,10 +240,10 @@ public class OOoContainer {
}
/**
- * Notify all the listeners that an OpenOffice.org instance configuration
+ * Notify all the listeners that a LibreOffice instance configuration
* has been removed.
*
- * @param pOoo the removed OpenOffice.org
+ * @param pOoo the removed LibreOffice
*/
private void fireOOoRemoved(IOOo pOoo) {
for (int i = 0, length = mListeners.size(); i < length; i++) {
@@ -277,10 +277,10 @@ public class OOoContainer {
}
/**
- * Notify every listener that an OpenOffice.org instance configuration
+ * Notify every listener that a LibreOffice instance configuration
* has been updated.
*
- * @param pOoo the updated OOo
+ * @param pOoo the updated LibreOffice
*/
private void fireOOoUpdated(IOOo pOoo) {
for (int i = 0, length = mListeners.size(); i < length; i++) {
@@ -383,7 +383,7 @@ public class OOoContainer {
}
/**
- * Loads the OpenOffice.org already configured instances from the
+ * Loads the LibreOffice already configured instances from the
* preferences.
*/
public static void load() {
@@ -395,7 +395,7 @@ public class OOoContainer {
}
/**
- * Saves the OpenOffice.org already configured instances to the
+ * Saves the LibreOffice already configured instances to the
* preferences.
*/
public static void saveOOos() {
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/config/IExtraOptionsProvider.java b/core/source/org/openoffice/ide/eclipse/core/model/config/IExtraOptionsProvider.java
index 6126069..674d453 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/config/IExtraOptionsProvider.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/config/IExtraOptionsProvider.java
@@ -1,7 +1,7 @@
package org.openoffice.ide.eclipse.core.model.config;
/**
- * Gets a chance to add some more env variables just before starting an OpenOffice process.
+ * Gets a chance to add some more env variables just before starting an LibreOffice process.
*
* @author cdan
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/config/IOOo.java b/core/source/org/openoffice/ide/eclipse/core/model/config/IOOo.java
index b4eefec..cdf474e 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/config/IOOo.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/config/IOOo.java
@@ -51,7 +51,7 @@ import org.eclipse.debug.core.ILaunch;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
/**
- * Interface for an OpenOffice.org configuration instance. This can even be implemented as an URE instance.
+ * Interface for a LibreOffice configuration instance. This can even be implemented as an URE instance.
*
* @author cedricbosdo
*/
@@ -63,29 +63,29 @@ public interface IOOo {
* @param pHome
* the absolute path to the home directory
* @throws InvalidConfigException
- * is thrown if the path doesn't match the implementation requirement for an OOo instance. The error
+ * is thrown if the path doesn't match the implementation requirement for a LibreOffice instance. The error
* code will be {@link InvalidConfigException#INVALID_OOO_HOME}
*/
public void setHome(String pHome) throws InvalidConfigException;
/**
- * Returns the path to the OpenOffice.org home directory. This string could be passed to the Path constructor to get
+ * Returns the path to the LibreOffice home directory. This string could be passed to the Path constructor to get
* the folder object.
*
- * @return path to the OpenOffice.org home directory.
+ * @return path to the LibreOffice home directory.
*/
public String getHome();
/**
- * Returns the OOo name. It should be a unique identifier
+ * Returns the LibreOffice name. It should be a unique identifier
*
- * @return ooo name
+ * @return LibreOffice name
*/
public String getName();
/**
* <p>
- * Returns the path to the OpenOffice.org classes directory. These strings could be passed to the Path constructor
+ * Returns the path to the LibreOffice classes directory. These strings could be passed to the Path constructor
* to get the folder object.
* </p>
*
@@ -94,37 +94,37 @@ public interface IOOo {
* URE applications</em>
* </p>
*
- * @return path to the OpenOffice.org classes directory
+ * @return path to the LibreOffice classes directory
*/
public String[] getClassesPath();
/**
* <p>
- * Returns the path to the OpenOffice.org shared libraries. This string could be passed to the Path constructor to
+ * Returns the path to the LibreOffice shared libraries. This string could be passed to the Path constructor to
* get the folder object.
* </p>
*
- * @return path to the OpenOffice.org libraries directory
+ * @return path to the LibreOffice libraries directory
*/
public String[] getLibsPath();
/**
* <p>
- * Returns the path to any folder containing binaries in the OOo installation. This string could be passed to the
+ * Returns the path to any folder containing binaries in the LibreOffice installation. This string could be passed to the
* Path constructor to get the folder object.
* </p>
*
- * @return paths to the OpenOffice.org binary directories
+ * @return paths to the LibreOffice binary directories
*/
public String[] getBinPath();
/**
- * @return the path to the <code>types.rdb</code> file of the OOo or URE instance.
+ * @return the path to the <code>types.rdb</code> file of the LibreOffice or URE instance.
*/
public String[] getTypesPath();
/**
- * @return the path to the <code>services.rdb</code> file of the OOo or URE instance.
+ * @return the path to the <code>services.rdb</code> file of the LibreOffice or URE instance.
*/
public String[] getServicesPath();
@@ -190,16 +190,16 @@ public interface IOOo {
* @param pMonitor
* a monitor to follow the progress
*/
- public void runOpenOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
+ public void runOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
IExtraOptionsProvider pExtraOptionsProvider, IProgressMonitor pMonitor);
/**
- * @return <code>true</code> if the OOo instance has a package manager.
+ * @return <code>true</code> if the LibreOffice instance has a package manager.
*/
public boolean canManagePackages();
/**
- * Update a package in the OOo instance if it can manages packages.
+ * Update a package in the LibreOffice instance if it can manages packages.
*
* @param pPackageFile
* the package to add or update
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/config/ISdk.java b/core/source/org/openoffice/ide/eclipse/core/model/config/ISdk.java
index 7d1b2ff..eb0e572 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/config/ISdk.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/config/ISdk.java
@@ -49,7 +49,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.openoffice.ide.eclipse.core.model.IUnoidlProject;
/**
- * Interface defining an OpenOffice.org SDK.
+ * Interface defining a LibreOffice SDK.
*
* @author cedricbosdo
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/description/DescriptionModel.java b/core/source/org/openoffice/ide/eclipse/core/model/description/DescriptionModel.java
index 8fb3107..0edeb28 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/description/DescriptionModel.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/description/DescriptionModel.java
@@ -584,7 +584,7 @@ public class DescriptionModel implements IModel {
HashMap<String, String> attrs = new HashMap<String, String>( );
attrs.put( XMLTokens.ATTR_VALUE, mMinOOo.trim() );
attrs.put( XMLTokens.createQName(XMLTokens.PREFIX_DESCRIPTION, XMLTokens.ELEMENT_NAME ),
- "OpenOffice.org " + mMinOOo.trim() ); //$NON-NLS-1$
+ mMinOOo.trim() );
pWriter.printSingleTag( XMLTokens.ELEMENT_OOO_MIN, attrs );
}
@@ -592,7 +592,7 @@ public class DescriptionModel implements IModel {
HashMap<String, String> attrs = new HashMap<String, String>( );
attrs.put( XMLTokens.ATTR_VALUE, mMaxOOo.trim() );
attrs.put( XMLTokens.createQName(XMLTokens.PREFIX_DESCRIPTION, XMLTokens.ELEMENT_NAME ),
- "OpenOffice.org " + mMaxOOo.trim( ) ); //$NON-NLS-1$
+ mMaxOOo.trim( ) );
pWriter.printSingleTag( XMLTokens.ELEMENT_OOO_MAX, attrs );
}
diff --git a/core/source/org/openoffice/ide/eclipse/core/model/language/AbstractLanguage.java b/core/source/org/openoffice/ide/eclipse/core/model/language/AbstractLanguage.java
index 1cbc5fd..8d0ad2d 100644
--- a/core/source/org/openoffice/ide/eclipse/core/model/language/AbstractLanguage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/model/language/AbstractLanguage.java
@@ -121,7 +121,7 @@ public abstract class AbstractLanguage {
* @param pUserInstallation user profile.
* @param pMonitor monitor to report progress to.
*/
- public abstract void connectDebuggerToOpenOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
+ public abstract void connectDebuggerToOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
IProgressMonitor pMonitor);
/**
diff --git a/core/source/org/openoffice/ide/eclipse/core/office/OfficeClassLoader.java b/core/source/org/openoffice/ide/eclipse/core/office/OfficeClassLoader.java
index 05cad65..775e7cb 100644
--- a/core/source/org/openoffice/ide/eclipse/core/office/OfficeClassLoader.java
+++ b/core/source/org/openoffice/ide/eclipse/core/office/OfficeClassLoader.java
@@ -58,7 +58,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
/**
* Special class loader to use to load OOo related classes.
*
- * This class loader is important to bootstrap OpenOffice.org.
+ * This class loader is important to bootstrap LibreOffice.
*
* @author cedricbosdo
*
@@ -70,7 +70,7 @@ public class OfficeClassLoader extends URLClassLoader {
/**
* Creates and initializes an {@link OfficeClassLoader} for a given office instance.
*
- * @param pOOo the OpenOffice.org instance to use for the class loader
+ * @param pOOo the LibreOffice instance to use for the class loader
* @param pParent the parent class loader to set
*/
private OfficeClassLoader(IOOo pOOo, ClassLoader pParent) {
@@ -78,12 +78,12 @@ public class OfficeClassLoader extends URLClassLoader {
}
/**
- * Create or load the classloader for the given OpenOffice instance.
+ * Create or load the classloader for the given LibreOffice instance.
*
- * @param pOOo the OpenOffice instance to load
+ * @param pOOo the LibreOffice instance to load
* @param pParent the parent classloader to use if the classloader has to be created.
*
- * @return the classloader corresponding to the OpenOffice.org instance
+ * @return the classloader corresponding to the LibreOffice instance
*/
public static OfficeClassLoader getClassLoader(IOOo pOOo, ClassLoader pParent) {
// First try the class loaders cache
@@ -135,7 +135,7 @@ public class OfficeClassLoader extends URLClassLoader {
/**
* Get the URLs to add to the class loader from an office instance.
*
- * @param pOOo the OpenOffice.org instance
+ * @param pOOo the LibreOffice instance
*
* @return the URL to set to the class loader
*/
diff --git a/core/source/org/openoffice/ide/eclipse/core/office/OfficeHelper.java b/core/source/org/openoffice/ide/eclipse/core/office/OfficeHelper.java
index 36466d1..4f028a3 100644
--- a/core/source/org/openoffice/ide/eclipse/core/office/OfficeHelper.java
+++ b/core/source/org/openoffice/ide/eclipse/core/office/OfficeHelper.java
@@ -50,7 +50,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
/**
* Provides a set of utility methods to use to handle OOo. All the code handling
- * OpenOffice.org has to be in the {@value #OOO_PACKAGE} package. These classes have
+ * LibreOffice has to be in the {@value #OOO_PACKAGE} package. These classes have
* to be loaded by the {@link OfficeClassLoader}. All the classes facade classes have
* to be in the same package than this class.
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/office/TypesGetter.java b/core/source/org/openoffice/ide/eclipse/core/office/TypesGetter.java
index cd2bd2a..9484697 100644
--- a/core/source/org/openoffice/ide/eclipse/core/office/TypesGetter.java
+++ b/core/source/org/openoffice/ide/eclipse/core/office/TypesGetter.java
@@ -55,7 +55,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.core.unotypebrowser.InternalUnoType;
/**
- * Facade class loading all the methods using an OpenOffice.org instance.
+ * Facade class loading all the methods using a LibreOffice instance.
*
* @author cedricbosdo
*
@@ -69,16 +69,16 @@ public class TypesGetter {
private List<String> mLocalRegs;
/**
- * Set the OOo instance to use for the different operations.
+ * Set the LibreOffice instance to use for the different operations.
*
- * @param pOOo the OpenOffice.org instance to set.
+ * @param pOOo the LibreOffice instance to set.
*/
public void setOOo(IOOo pOOo) {
mOOo = pOOo;
}
/**
- * @return the OpenOffice.org to use for the different operations.
+ * @return the LibreOffice to use for the different operations.
*/
public IOOo getOOo() {
return mOOo;
diff --git a/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeProvider.java b/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeProvider.java
index ecc976c..a99b141 100755
--- a/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeProvider.java
+++ b/core/source/org/openoffice/ide/eclipse/core/unotypebrowser/UnoTypeProvider.java
@@ -57,7 +57,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.core.office.TypesGetter;
/**
- * Class providing UNO types from an OpenOffice.org instance and optionally
+ * Class providing UNO types from a LibreOffice instance and optionally
* from a UNO project.
*
* @author cedricbosdo
@@ -130,7 +130,7 @@ public class UnoTypeProvider {
*
* @param pScopedName the type name to match
* @param pContainers the UNO types containers to look in. These have to be either
- * the path to a project RDB file or an OpenOffice.org name
+ * the path to a project RDB file or a LibreOffice name
*
* @return <code>true</code> if the list contains a type with this name
*/
@@ -156,7 +156,7 @@ public class UnoTypeProvider {
return result;
}
- //------------------------------------------------------- Project managment
+ //------------------------------------------------------- Project management
/**
* Set the UNO project for which to get the UNO types. This project's
@@ -180,7 +180,7 @@ public class UnoTypeProvider {
/**
* Sets the OOo if the new one is different from the old one.
*
- * @param pOOoInstance OpenOffice.org instance to bootstrap
+ * @param pOOoInstance LibreOffice instance to bootstrap
*/
public void setOOoInstance(IOOo pOOoInstance) {
@@ -281,7 +281,7 @@ public class UnoTypeProvider {
}
/**
- * The job extracting the types from OpenOffice.org.
+ * The job extracting the types from LibreOffice.
*
* @author cedricbosdo
*
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
index a866e83..63b1df3 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties
@@ -18,7 +18,7 @@ NewUnoProjectPage.Title=New UNO-IDL project configuration
NewUreAppWizard.Title=New URE Application wizard
NewUnoProjectPage.Message=This wizard will create the basis of a UNO component project
NewUnoProjectPage.RootPackage=Root package
-NewUnoProjectPage.RootPackageTooltip=Defines the vendor package name for the project,\neg: org.openoffice. Do not change it manually in the files.
+NewUnoProjectPage.RootPackageTooltip=Defines the vendor package name for the project,\neg: my.company. Do not change it manually in the files.
NewUnoProjectPage.CompExtension=Implementation package extension
NewUnoProjectPage.CustomIdlLabel=IDL files
NewUnoProjectPage.CompExtensionTooltip=Defines the extension package name, usually comp.\nIt means that the implementation classes should\nbe in the <root.package>.comp package
@@ -75,7 +75,7 @@ InterfaceMemberDialog.EditAttributeDescription=Change the attribute definition.
InterfaceMemberDialog.ArgumentDirectionColumnTitle=In/Out
PackageExportWizard2.DialogTitle=OXT Export
-ServiceWizardSet.WrongInitDataWarning=Wrong data for service page set initizalization
+ServiceWizardSet.WrongInitDataWarning=Wrong data for service page set initialization
ServiceWizardSet.ServiceCreationError=Error happened during service creation
ServiceWizardSet.IsIdlTypeExistingWarning=Error determining if the idl file exists: {0}
BaseUnoConnectionPage.Description=Set some important informations for the UNO development
@@ -95,7 +95,7 @@ ManifestExportPage.SaveRowLabel=Manifest file
ManifestExportPage.Title=Build scripts options
ManifestExportPage.UserManifestText=Use existing manifest file from the workspace
-UnoPackageExportPage.AutoDeploy=Automatically deploy on associated OpenOffice.org installation
+UnoPackageExportPage.AutoDeploy=Automatically deploy on associated LibreOffice installation
UnoPackageExportPage.Browse=Browse
UnoPackageExportPage.Description=Define which resources should be exported in the OXT
UnoPackageExportPage.LibraryCreationError=Couldn't create the library to export
diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/UnoPackageExportPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/UnoPackageExportPage.java
index 74d2d13..6766cb0 100644
--- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/UnoPackageExportPage.java
+++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/UnoPackageExportPage.java
@@ -374,7 +374,7 @@ public class UnoPackageExportPage extends WizardPage {
}
/**
- * Thread performing the package deployment into OpenOffice.org.
+ * Thread performing the package deployment into LibreOffice.
*
* @author Cédric Bosdonnat
*
@@ -387,7 +387,7 @@ public class UnoPackageExportPage extends WizardPage {
/**
* Constructor.
*
- * @param pOoo the OpenOffice.org where to deploy
+ * @param pOoo the LibreOffice where to deploy
* @param pDest the package to deploy
*/
DeployerJob(IOOo pOoo, File pDest) {
diff --git a/java/META-INF/MANIFEST.MF b/java/META-INF/MANIFEST.MF
index 5f4f25b..2242aa5 100644
--- a/java/META-INF/MANIFEST.MF
+++ b/java/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Java Plug-in for OOo eclipse integration
+Bundle-Name: Java Plug-in for LibreOffice eclipse integration
Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
Bundle-Version: 1.0.3
Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
diff --git a/java/README b/java/README
index 3fa7a9f..b327ab9 100644
--- a/java/README
+++ b/java/README
@@ -1,13 +1,13 @@
Building OOoEclipse Integration
in order to build OOoEclipseIntegration to produce an update site,
-you need to have installed OpenOffice.org and Eclipse.You may install
+you need to have installed LibreOffice and Eclipse.You may install
only the necesary jars, but you'll have to hack the ant build.xml
files.
Define the ANT_ARGS variable to the following:
- -Dhome.openoffice=/path/to/you/ooo -Dhome.eclipse=/path/to/your/eclipse
-Then you will just have to cd in the build CVS module and execute:
+ -Dhome.libreoffice=/path/to/you/libreoffice -Dhome.eclipse=/path/to/your/eclipse
+Then you will just have to cd in the build folder and execute:
prompt$ ant
Please run ant help to get the available targets
diff --git a/java/doc/cheatsheets/unoclient.xml b/java/doc/cheatsheets/unoclient.xml
index d14510c..5c77365 100644
--- a/java/doc/cheatsheets/unoclient.xml
+++ b/java/doc/cheatsheets/unoclient.xml
@@ -3,7 +3,7 @@
title="Create a Java UNO client">
<intro>
<description>
- OpenOffice.org can be used as well as a server. Creating clients connecting to it is not an easy task for beginners and the informations are split all over the web.
+ LibreOffice can be used as well as a server. Creating clients connecting to it is not an easy task for beginners and the informations are split all over the web.
<br/><br/>
<b>Follow the next steps to create a new Java UNO Client really quickly.</b>
</description>
@@ -13,7 +13,7 @@
<description>
Create a new project of type <b>Java UNO Client application</b> .
<br/><br/>
-Configure the OpenOffice.org instance and SDK used to build to program and configure the OpenOffice.org connection.
+Configure the LibreOffice instance and SDK used to build to program and configure the LibreOffice connection.
</description>
<command
required="true"
@@ -22,13 +22,13 @@ Configure the OpenOffice.org instance and SDK used to build to program and confi
<item
title="Write the client code">
<description>
- <b>Replace the TODO comment</b> by the code using the UNO connection to OpenOffice.org.
+ <b>Replace the TODO comment</b> by the code using the UNO connection to LibreOffice.
</description>
</item>
<item
- title="Start OpenOffice.org">
+ title="Start LibreOffice">
<description>
- OpenOffice.org needs to be started with the following parameter depending on your connection configuration:
+ LibreOffice needs to be started with the following parameter depending on your connection configuration:
<br/><br/>
<b>Pipe connection: </b><br/> -accept=&quot;pipe,name=<b>pipename</b>;urp;StarOffice.ServiceManager&quot;
<br/><br/>
diff --git a/java/plugin.xml b/java/plugin.xml
index 2c5df7b..d50406b 100644
--- a/java/plugin.xml
+++ b/java/plugin.xml
@@ -43,12 +43,12 @@
<classpathContainerPage
class="org.openoffice.ide.eclipse.java.build.OOoContainerPage"
id="org.openoffice.ide.eclipse.java.OOO_CONTAINER"
- name="OpenOffice.org Libraries">
+ name="LibreOffice Libraries">
</classpathContainerPage>
<classpathContainerPage
class="org.openoffice.ide.eclipse.java.client.JODContainerPage"
id="org.openoffice.ide.eclipse.java.JOD_CONTAINER"
- name="OpenOffice.org UNO connector">
+ name="LibreOffice UNO connector">
</classpathContainerPage>
</extension>
<extension
diff --git a/java/source/org/openoffice/ide/eclipse/java/JavaDebugExtraOptionsProvider.java b/java/source/org/openoffice/ide/eclipse/java/JavaDebugExtraOptionsProvider.java
index 39f18cf..6bc9dc8 100644
--- a/java/source/org/openoffice/ide/eclipse/java/JavaDebugExtraOptionsProvider.java
+++ b/java/source/org/openoffice/ide/eclipse/java/JavaDebugExtraOptionsProvider.java
@@ -4,7 +4,7 @@ import org.openoffice.ide.eclipse.core.model.config.IExtraOptionsProvider;
import org.openoffice.ide.eclipse.core.model.utils.SystemHelper;
/**
- * Adds extra env variables to start OpenOffice with Java setup to run in debug mode.
+ * Adds extra env variables to start LibreOffice with Java setup to run in debug mode.
*
* @author cdan
*
diff --git a/java/source/org/openoffice/ide/eclipse/java/Language.java b/java/source/org/openoffice/ide/eclipse/java/Language.java
index c8b9352..150456d 100644
--- a/java/source/org/openoffice/ide/eclipse/java/Language.java
+++ b/java/source/org/openoffice/ide/eclipse/java/Language.java
@@ -96,7 +96,7 @@ public class Language extends AbstractLanguage {
/**
* {@inheritDoc}
*/
- public void connectDebuggerToOpenOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
+ public void connectDebuggerToOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation,
IProgressMonitor pMonitor) {
try {
@@ -111,7 +111,7 @@ public class Language extends AbstractLanguage {
connector.connect(argMap, pMonitor, pLaunch);
- pPrj.getOOo().runOpenOffice(pPrj, pLaunch, pUserInstallation,
+ pPrj.getOOo().runOffice(pPrj, pLaunch, pUserInstallation,
new JavaDebugExtraOptionsProvider(DEFAULT_JAVA_DEBUG_PORT), pMonitor);
} catch (Exception e) {
PluginLogger.error("Could not start remote debugger.", e);
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
index 6539ebd..5fb423c 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
+++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java
@@ -67,7 +67,7 @@ import org.openoffice.ide.eclipse.core.model.config.IOOo;
import org.openoffice.ide.eclipse.java.OOoJavaPlugin;
/**
- * Edition and creation page for the OpenOffice.org libraries container.
+ * Edition and creation page for the LibreOffice libraries container.
*
* @author cedricbosdo
*
@@ -206,7 +206,7 @@ public class OOoContainerPage extends WizardPage implements
}
/**
- * Add the OpenOffice.org common JARs to a projects build path.
+ * Add the LibreOffice common JARs to a projects build path.
*
* @param pOoo the ooo to use for the classpath
* @param pProject the project to change
diff --git a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
index 1cfc986..883ea22 100644
--- a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties
@@ -1,8 +1,8 @@
JODContainerPage.SLF4JLabel=Add the SLF4J JDK14 implementation
-JODContainerPage.Title=OpenOffice.org UNO Connector
+JODContainerPage.Title=LibreOffice UNO Connector
OOoClasspathContainer.LibrariesName={0} libraries
-OOoContainerPage.DialogDescription=OpenOffice.org Library edition page
+OOoContainerPage.DialogDescription=LibreOffice Library edition page
OOoContainerPage.DialogImage=/icons/library_wiz.png
-OOoContainerPage.DialogTitle=OpenOffice.org Libraries
+OOoContainerPage.DialogTitle=LibreOffice Libraries
OOoContainerPage.ClasspathSetFailed=Error while setting the project classpath
diff --git a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
index e2ee782..0444d12 100644
--- a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
+++ b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties
@@ -2,5 +2,5 @@ ClientWizard.CreationJobTitle=Java UNO client creation
ClientWizard.ProjectCreated=Project created
ClientWizard.ProjectCreationError=Error creating UNO client application
ClientWizard.Title=Java UNO Client wizard
-JODContainer.Description=OpenOffice.org UNO connector
+JODContainer.Description=LibreOffice UNO connector
JODContainer.GetLibraryError=Failed to get library:
diff --git a/packager/.externalToolBuilders/Sources update.launch b/packager/.externalToolBuilders/Sources update.launch
index 465b0d9..4ee5668 100644
--- a/packager/.externalToolBuilders/Sources update.launch
+++ b/packager/.externalToolBuilders/Sources update.launch
@@ -13,7 +13,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openoffice.ide.packager.core"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.openoffice.ide.packager.core/build/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.openoffice.ide.packager.core/build.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.openoffice.ide.packager.core}"/>