[Libreoffice-commits] .: 5 commits -

Jan Holesovsky kendy at kemper.freedesktop.org
Fri May 27 12:20:13 PDT 2011


 0 files changed

New commits:
commit c0926e66a9bf53b3a08d5f508580c3396ad16748
Merge: 080fbc1... f805b5b...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue May 24 15:03:19 2011 +0200

    Merge remote-tracking branch 'origin/integration/dev300_m106'

commit f805b5bcbbfdf000284622ba2d47c3bd5d5c7b87
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 19 18:58:54 2011 +0200

    Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit 6a3109bc28a9ad304e9739362ecbad31fed50621
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Apr 13 11:06:58 2011 +0200

    Even more OOo -> LO changes (in comments now)

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index c7b1b23..398599d 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -788,22 +788,22 @@ function writeBatFile(fdir, file)
         "REM are necessary for building the examples of the Office Development Kit.\n" +
         "REM The Script was developed for the operating systems Windows.\n" +
         "REM The SDK name\n" +
-        "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+        "REM Example: set OO_SDK_NAME=libreoffice3.4_sdk\n" +
         "set OO_SDK_NAME=" + oo_sdk_name  +
         "\n\n" +
         "REM Installation directory of the Software Development Kit.\n" +
-        "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" +
         "set OO_SDK_HOME=" + oo_sdk_home  +
         "\n\n" +
         "REM Office installation directory.\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org 3\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" +
         "set OFFICE_HOME=" + office_home +
         "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" +
         "set OFFICE_BASE_HOME=" + office_base_home +
         "\n\n" +
         "REM URE installation directory.\n" +
-        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" +
+        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" +
         "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
         "\n\n" +
         "REM Directory of the make command.\n" +
commit ac1c3e5bb04087f60b774354569cc6f77cb1a50a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Apr 13 10:58:52 2011 +0200

    Some more OOo -> LO changes

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index ef4e0b6..c7b1b23 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -2,8 +2,8 @@
 // examples of the Office Development Kit. The script duplicates the template
 // script and inserts the variables into the copied script.
 // The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\LibreOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\LibreOffice\\UNO\\InstallPath\\";
 var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
 var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
 var sDirDotNet1_1 = "v1.1.4322";
commit fd0b24e4d70ee52402bf8b02430bd1d1504ed033
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Apr 11 17:53:05 2011 +0200

    Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)


More information about the Libreoffice-commits mailing list